Update numbers, Fediverse, Mastodon pages

source/_data/common.json

@@ -90,7 +90,7 @@
     [
       {
         "name": "PHP",
-        "networks": "FediBlog, Friendica, GNU Social, Hubzilla, Osada, PixelFed, postActiv, Social (Nextcloud)"
+        "networks": "Friendica, GNU Social, Hubzilla, PixelFed, Social-NextCloud"
       },
       {
         "name": "Ruby",
@@ -98,23 +98,23 @@
       },
       {
         "name": "Python",
-        "networks": "Anfora, Funkwhale, microblog.pub, Reel2Bits, Socialhome"
+        "networks": "Funkwhale, microblog.pub, Reel2Bits, Socialhome"
       },
       {
         "name": "Elixir",
-        "networks": "CommonsPub, Mobilizon, Pleroma"
+        "networks": "Mobilizon, Pleroma"
       },
       {
         "name": "Rust",
-        "networks": "Aardwolf, Kroeg, Plume, Rustodon"
+        "networks": "Aardwolf, Kibou, Kroeg, Plume, Rustodon"
       },
       {
         "name": "(Node)JS",
-        "networks": "Misskey, PeerTube,  pump.io, WriteFreely"
+        "networks": "Dolphin, Misskey, PeerTube, WriteFreely"
       },
       {
         "name": "Go",
-        "networks": "GangGo, Littr.go, read.as, WriteFreely"
+        "networks": "read.as, WriteFreely"
       }
     ]
 }

source/_data/fediverse.json

@@ -3,14 +3,10 @@
   "article":
     {
       "definition": "is a portmanteau of two words “federation” and “universe”",
-      "preamble": "It is a common name for federated social networks running on free open software on a myriad of servers across the world. Historically, this term has included only microblogging platforms supporting a set of protocols called OStatus. This didn't do justice to a large number of projects that federate, share same values and are reasonably popular. With the appearance and wide adoption of a new standard protocol called ActivityPub it makes no sense to further divide the federated world into “OStatus” and “non-OStatus” projects. This guide unites all interoperable federated networks under one term “Fediverse”.",
+      "preamble": "It is a common name for federated social networks running on free open software on a myriad of servers across the world. Historically, this term has included only microblogging platforms supporting a set of protocols called OStatus. This didn't do justice to a large number of projects that federate, share same values and are reasonably popular. With the appearance and wide adoption of a new standard protocol called ActivityPub it makes no sense to further divide the federated world into “OStatus” and “non-OStatus” projects. This guide unites all interconnected federated networks under one term “Fediverse”.",
-      "info": "Fediverse social networks have many differences from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). For one, all of the federated networks are developed by the community of people all around the globe, independent from any corporation or official institution. This means that you can take part in the development and growth of the Fediverse. All skills are valuable: spreading the word, inviting friends are most welcome activities. Another difference of these social networks from corporate silos is the principle of federation. Mainstream networks concentrate millions of users on their servers. That gives them dangerous powers of controlling information and hoarding users' private data, using it for commercial profit (and who knows what other causes). Fediverse networks are designed to be run by anybody: you are free to choose and register on any server you like, you can choose the person who will be in charge of your data - the administrator of your server. If you have some technical knowledge, you can administrate your own server for your friends and family, at your will connecting with thousands of other independent servers across the web. In a sense, Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands, while mainstream corporate websites each made themselves a king (or a tyrant?) of their own huge land, surrounded with high fences, and reserve all the decision-making, data control and censorship to themselves. Fediverse has much more to it than it looks at first sight. You will meet many good friends here. But don't trust our word - check for yourself.",
+      "info": "Fediverse social networks differ from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). Federated networks are developed by a community of people all around the globe, independent from any corporation or official institution. You personally can take part in the development and growth of the Fediverse. Another difference from corporate silos is the principle of federation. Each mainstream network concentrates millions of users in one place. Their corporate team controlls all information on that one big platform and hoards users' private data for commercial profit and spying. Federating networks can be run by anybody: you are free to register on any Fediverse server you like. You can choose the person who will be in charge of your data - the administrator of your server. If you have technical knowledge, you can administrate your own server for your friends and family, connecting with thousands of other independent servers across the web. Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands, while mainstream corporate websites each made themselves an emperor of their huge land, surrounded it with high fences, and enforce all the decision-making, data control and censorship. You'll learn a lot in Fediverse. Don't trust our word - explore Fediverse yourself.",
       "history":
         [
-          {
-            "title": "Privacy and Tracking on the Fediverse",
-            "url": "https://blog.soykaf.com/post/privacy-and-tracking-on-the-fediverse"
-          },
           {
             "title": "A People's History of the Fediverse",
             "url": "https://wiki.freedombone.net/view/welcome-visitors/view/a-peoples-history-of-the-fediverse/view/introduction"
@@ -19,6 +15,14 @@
             "title": "A brief history of the GNU Social Fediverse and the Federation",
             "url": "https://www.coactivate.org/projects/disintermedia/blog/2017/04/01/a-brief-history-of-the-gnu-social-fediverse-and-the-federation"
           },
+          {
+            "title": "From GNU Social to Mastodon",
+            "url": "https://thomask.sdf.org/blog/2018/08/19/from-gnu-social-to-mastodon.html"
+          },
+          {
+            "title": "Privacy and Tracking on the Fediverse",
+            "url": "https://blog.soykaf.com/post/privacy-and-tracking-on-the-fediverse"
+          },
           {
             "title": "Distributed Social Networks and Public History",
             "url": "http://publichistory.media/2016/02/21/distributed-social-networks-and-public-history"},

source/_data/mastodon.json

@@ -96,6 +96,10 @@
       "translating": "https://crowdin.com/project/mastodon",
       "reading":
         [
+          {
+            "title": "Mastodon & Fediverse explained (video)",
+            "url": "https://peertube.social/videos/watch/d9bd2ee9-b7a4-44e3-8d65-61badd15c6e6"
+          },
           {
             "title": "One Mammoth of a Job: An Interview with Eugen Rochko of Mastodon",
             "url": "https://medium.com/we-distribute/one-mammoth-of-a-job-an-interview-with-eugen-rochko-of-mastodon-23b159d6796a"

source/_data/numbers.json

@@ -2,66 +2,72 @@
 {
   "list":
     {
-      "lastUpdate": "30/10/19",
+      "lastUpdate": "17/11/19",
       "diaspora":
         {
-          "population": "728.980",
+          "population": "759.816",
-          "activeUsers": "75.007",
+          "activeUsers": "72.418",
-          "podsNum": "259"
+          "podsNum": "257"
         },
       "friendica":
         {
-          "population": "14.705",
+          "population": "14.276",
-          "activeUsers": "2.291",
+          "activeUsers": "2.167",
-          "podsNum": "344"
+          "podsNum": "338"
         },
       "hubzilla":
         {
-          "population": "8.611",
+          "population": "9.405",
-          "activeUsers": "3.287",
+          "activeUsers": "3.443",
-          "podsNum": "263"
+          "podsNum": "260"
         },
       "socialhome":
         {
-          "population": "1.255",
+          "population": "1.240",
-          "activeUsers": "296",
+          "activeUsers": "298",
           "podsNum": "5"
         },
       "mastodon":
         {
-          "population": "3.722.454",
+          "population": "3.598.416",
-          "activeUsers": "1.218.798",
+          "activeUsers": "1.304.417",
-          "podsNum": "2.674"
+          "podsNum": "2.689"
         },
       "gnusocial":
         {
-          "population": "9.800",
+          "population": "4.785",
           "activeUsers": "",
           "podsNum": "105"
         },
       "pleroma":
         {
-          "population": "28.367",
+          "population": "28.881",
           "activeUsers": "",
-          "podsNum": "568"
+          "podsNum": "597"
         },
       "misskey":
         {
           "population": "500",
           "activeUsers": "",
-          "podsNum": "67"
+          "podsNum": "66"
         },
       "peertube":
         {
-          "population": "21.635",
+          "population": "22.746",
           "activeUsers": "",
-          "podsNum": "325"
+          "podsNum": "327"
         },
       "pixelfed":
         {
-          "population": "14.418",
+          "population": "15.100",
           "activeUsers": "",
-          "podsNum": "99"
+          "podsNum": "97"
+        },
+      "fediverse":
+      {
+        "population": "4.455.165",
+        "activeUsers": "",
+        "podsNum": "4.741"
         }
     }
 }

themes/starter/layout/fediverse.ejs

@@ -9,6 +9,8 @@ layout: layout
   const networks = site.data.common.list;
   const protocols = site.data.common.protocols;
   const langs = site.data.common.langs;
+  const numbers = site.data.numbers.list.fediverse;
+  const update = site.data.numbers.list.lastUpdate;
 %>
 
 <%- partial('_partial/heroheader') %>
@@ -20,6 +22,24 @@ layout: layout
 
   <p><%= fv.preamble %></p>
 
+  <section class="section-hero">
+  <h3>
+    <span><%- __('total') %></span>
+    <span><% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %></span>
+    <span><%- __('accounts') %></span><% if (numbers) { %><sup><a href="#fn-1">[1]</a></sup><% } %>
+  </h3>
+  <% if (numbers.activeUsers) { %>
+    <h3>
+      <span><%- __('active') %></span><span> ~ <%= numbers.activeUsers %></span><span><%- __('people') %></span><sup><a href="#fn-2">[2]</a></sup>
+    </h3>
+  <% } %>
+  <h3>
+    <span><%- __('servers') %></span>
+    <span><% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %></span>
+    <span><%- __('instances') %></span><% if (numbers) { %><sup><a href="#fn-3">[3]</a></sup><% } %>
+  </h3>
+</section>
+
   <div class="section">
     <h4><%- __('networks') %></h4>
     <ul class="section-list">
@@ -94,5 +114,14 @@ layout: layout
     </ul>
   </div>
 
+  <% if (numbers) { %>
+    <div class="section u-block footnotes">
+      <h4><%- __('note') %></h4>
+      <p class="footnote-item">
+        <span id="fn-1" class="u-emphasize">[1]</span>, <span id="fn-2" class="u-emphasize">[2]</span>, <span id="fn-3" class="u-emphasize">[3]</span> - updated regularly, latest update - <%= update %>
+      </p>
+    </div>
+  <% } %>
+
   <%- partial('_partial/buttons') %>
 </main>