From a99b17ab6bf576b18f25c0ec243c0326d853d38b Mon Sep 17 00:00:00 2001
From: lostinlight <hello@libenter.win>
Date: Sat, 9 Jun 2018 21:55:48 +0300
Subject: [PATCH] Add Mastodon links

---
 source/_data/mastodon.json         | 14 ++++++++++----
 themes/starter/languages/en.yml    |  4 +++-
 themes/starter/layout/mastodon.ejs | 21 ++++++++++++++++-----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index c7cc914..9ec916a 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -21,7 +21,11 @@
           {"num": "2", "url": "https://mnm.social/instances"}
         ],
       "mobile": "https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md#mobile-clients",
-      "twFriends": "https://bridge.joinmastodon.org",
+      "forUsers":
+        [
+          {"id": "0", "url": "https://bridge.joinmastodon.org"},
+          {"id": "1", "url": "https://elenq.gitlab.io/artodon"}
+        ],
       "tutorials":
         [
           {"id": "0", "url": "https://medium.com/@GinnyMcQueen/toot-how-to-intro-to-mastodon-e5655bfa87d2"},
@@ -47,15 +51,17 @@
         ],
       "forks":
         [
-          {"id": "0", "url": "https://github.com/glitch-soc/mastodon"}
+          {"id": "0", "url": "https://github.com/glitch-soc/mastodon"},
+          {"id": "1", "url": "https://github.com/beatrix-bitrot/ephemeral.glitch.social"}
         ],
       "utilities":
         [
           {"id": "0", "url": "https://www.mastofeed.com"},
           {"id": "1", "url": "https://crossposter.masto.donte.com.br"},
           {"id": "2", "url": "http://www.unmung.com/mastoview"},
-          {"id": "3", "url": "https://elenq.gitlab.io/artodon"},
-          {"id": "4", "url": "https://fed.brid.gy"}
+
+          {"id": "4", "url": "https://fed.brid.gy"},
+          {"id": "5", "url": "https://gitlab.com/chaica/feed2toot"}
         ],
       "notable":
         [
diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index c261bcc..db5c7cc 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -64,7 +64,7 @@ mobapp: mobile app
 mobapps: mobile apps
 tuts: tutorials
 utilities: utilities
-forks: forks
+forks: forks / modifications
 cheatsheets: cheat sheets
 total: population
 servers: servers
@@ -103,7 +103,9 @@ mastofeed: Mastofeed
 crossposting: Mastodon-Twitter crossposting
 mastoGallery: Artodon gallery
 feedPreview: Instance timeline preview
+feed2toot: RSS to Mastodon bot
 glitchSoc: glitch-soc - fork with experimental features
+mastoEphemeral: ephemeral Mastodon with disappearing toots
 
 #GNU Social page
 timeline: Timeline for website
diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs
index 9666594..3e7ddb0 100644
--- a/themes/starter/layout/mastodon.ejs
+++ b/themes/starter/layout/mastodon.ejs
@@ -12,10 +12,12 @@ layout: layout
   const utilities = data.utilities;
   const forks = data.forks;
   const tuts = [__('intro'), __('howto'), __('guide')];
+  const ux = data.forUsers;
+  const uxList = [__('twFriends'), __('mastoGallery')];
   const stats = [__('dashboards'), __('stats'), __('graphs')];
   const tools = [__('mastoPreinstalled'), __('mastoHosting')];
-  const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('mastoGallery'), __('webmentions')];
-  const forkTitles = [__('glitchSoc')];
+  const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot')];
+  const forkTitles = [__('glitchSoc'), __('mastoEphemeral')];
 %>
 
 <%- partial('_partial/heroheader') %>
@@ -42,7 +44,14 @@ layout: layout
       </div>
       <div class="section u-block">
         <h4><%- __('users') %></h4>
-        <span><a href="<%= data.twFriends %>"><%- __('twFriends') %></a></span>
+        <ul class="section-list">
+          <% for (item in ux) { %>
+            <% let n = ux[item].id %>
+            <li>
+              <a href="<%= ux[item].url %>"><%= uxList[n] %></a>
+            </li>
+          <% } %>
+        </ul>
       </div>
       <div class="section u-block">
         <h4><%- __('tuts') %></h4>
@@ -96,12 +105,14 @@ layout: layout
             </li>
           <% } %>
         </ul>
-
+      </div>
+      <div class="section u-block">
         <ul class="section-list">
+          <h4><%- __('forks') %></h4>
           <% for (item in forks) { %>
             <% let b = forks[item].id %>
             <li class="u-inline">
-              <a href="<%= forks[item].url %>"><%= forkTitles[b] %></a><span>&nbsp;/&nbsp;</span>
+              <a href="<%= forks[item].url %>"><%= forkTitles[b] %></a>
             </li>
           <% } %>
         </ul>