From 55c4ec5ee188bd137e8ac85931d3ea9687b46475 Mon Sep 17 00:00:00 2001
From: Bastard Operator <bofh@nogafam.es>
Date: Sun, 10 Jan 2021 23:48:50 +0100
Subject: [PATCH] Change /federated path to a more suited path /meet

---
 src/intl/en-US.js                             |  2 +-
 src/routes/_components/NavShortcuts.html      |  2 +-
 .../_pages/{federated.html => meet.html}      |  0
 src/routes/_pages/search.html                 |  2 +-
 .../_store/computations/navComputations.js    | 47 +------------------
 .../_store/observers/timelineObservers.js     |  2 +-
 src/routes/{federated.html => meet.html}      |  2 +-
 static/fedilove-no-react.js                   |  8 ++--
 8 files changed, 10 insertions(+), 55 deletions(-)
 rename src/routes/_pages/{federated.html => meet.html} (100%)
 rename src/routes/{federated.html => meet.html} (85%)

diff --git a/src/intl/en-US.js b/src/intl/en-US.js
index 47ec4800..fa62047d 100644
--- a/src/intl/en-US.js
+++ b/src/intl/en-US.js
@@ -10,7 +10,7 @@ export default {
     <p>
       Start your journey to <b>meet your crush</b> !!
     </p>`,
-  logIn: 'Log in <img id="btn-masto" src="/mastoicon.png"/>',
+  logIn: 'Log in <img alt="mastodon login" id="btn-masto" src="/mastoicon.png"/>',
   logInText: 'Log In',
   footer: `
     <p>
diff --git a/src/routes/_components/NavShortcuts.html b/src/routes/_components/NavShortcuts.html
index b2192f72..940d34a6 100644
--- a/src/routes/_components/NavShortcuts.html
+++ b/src/routes/_components/NavShortcuts.html
@@ -1,4 +1,4 @@
-<Shortcut key="g t" on:pressed="goto('/federated')"/>
+<Shortcut key="g t" on:pressed="goto('/meet')"/>
 <Shortcut key="g f" on:pressed="goto('/favorites')"/>
 <Shortcut key="g l" on:pressed="goto('/local')"/>
 <Shortcut key="g h" on:pressed="goto('/')"/>
diff --git a/src/routes/_pages/federated.html b/src/routes/_pages/meet.html
similarity index 100%
rename from src/routes/_pages/federated.html
rename to src/routes/_pages/meet.html
diff --git a/src/routes/_pages/search.html b/src/routes/_pages/search.html
index cbce0cda..74f0a8b2 100644
--- a/src/routes/_pages/search.html
+++ b/src/routes/_pages/search.html
@@ -14,7 +14,7 @@
   <!-- TODO: this is just a hack so that `sapper export` knows to crawl these files -->
   <!-- Note that these links have to be spread out or else they result in ECONNRESET errors during crawling -->
   <!-- See also community/index.html -->
-  <a href="/federated">{intl.federated}</a>
+  <a href="/meet">{intl.federated}</a>
   <a href="/favorites">{intl.favorites}</a>
   <a href="/direct">{intl.directMessages}</a>
   <a href="/bookmarks">{intl.bookmarks}</a>
diff --git a/src/routes/_store/computations/navComputations.js b/src/routes/_store/computations/navComputations.js
index ca230ec3..2ced5ab3 100644
--- a/src/routes/_store/computations/navComputations.js
+++ b/src/routes/_store/computations/navComputations.js
@@ -20,55 +20,10 @@ export function navComputations (store) {
     'navPages',
     ['pinnedPage', 'pinnedListTitle'],
     (pinnedPage, pinnedListTitle) => {
-      let pinnedPageObject
-      if (pinnedPage === '/federated') {
-        pinnedPageObject = {
-          name: 'federated',
-          href: '/federated',
-          svg: '#fa-globe',
-          label: 'intl.federated'
-        }
-      } else if (pinnedPage === '/direct') {
-        pinnedPageObject = {
-          name: 'direct',
-          href: '/direct',
-          svg: '#fa-envelope',
-          label: 'intl.directMessages'
-        }
-      } else if (pinnedPage === '/favorites') {
-        pinnedPageObject = {
-          name: 'favorites',
-          href: '/favorites',
-          svg: '#fa-star',
-          label: 'intl.favorites'
-        }
-      } else if (pinnedPage === '/bookmarks') {
-        pinnedPageObject = {
-          name: 'bookmarks',
-          href: '/bookmarks',
-          svg: '#fa-bookmark',
-          label: 'intl.bookmarks'
-        }
-      } else if (pinnedPage.startsWith('/lists/')) {
-        pinnedPageObject = {
-          name: `lists/${pinnedPage.split('/').slice(-1)[0]}`,
-          href: pinnedPage,
-          svg: '#fa-bars',
-          label: pinnedListTitle
-        }
-      } else { // local
-        pinnedPageObject = {
-          name: 'federated',
-          href: '/federated',
-          svg: '#fa-users',
-          label: 'intl.meet'
-        }
-      }
-
       return [
         {
           name: 'federated',
-          href: '/federated',
+          href: '/meet',
           svg: '#pinafore-logo',
           label: 'intl.meet'
         },
diff --git a/src/routes/_store/observers/timelineObservers.js b/src/routes/_store/observers/timelineObservers.js
index 21ca9f92..92a90a7f 100644
--- a/src/routes/_store/observers/timelineObservers.js
+++ b/src/routes/_store/observers/timelineObservers.js
@@ -3,7 +3,7 @@ import { createStream } from '../../_actions/stream/streaming'
 import { store } from '../store'
 
 export function timelineObservers () {
-  // stream to watch for local/federated/etc. updates. home and notification
+  // stream to watch for local/meet/etc. updates. home and notification
   // updates are handled in timelineObservers.js
   let currentTimelineStream
 
diff --git a/src/routes/federated.html b/src/routes/meet.html
similarity index 85%
rename from src/routes/federated.html
rename to src/routes/meet.html
index b9fe2d57..6ba5b0e1 100644
--- a/src/routes/federated.html
+++ b/src/routes/meet.html
@@ -5,7 +5,7 @@
 <script>
   import Title from './_components/Title.html'
   import LazyPage from './_components/LazyPage.html'
-  import pageComponent from './_pages/federated.html'
+  import pageComponent from './_pages/meet.html'
 
   export default {
     components: {
diff --git a/static/fedilove-no-react.js b/static/fedilove-no-react.js
index 5d488e49..461a81e9 100644
--- a/static/fedilove-no-react.js
+++ b/static/fedilove-no-react.js
@@ -266,7 +266,7 @@ var fediloveApi = {
         if (document.getElementById(window.fediloveData.currentIDMeetTimeline) === undefined)
             return undefined;
         var accId;
-        if (window.location.pathname == '/federated')
+        if (window.location.pathname == '/meet')
             accId = $(document.getElementById(window.fediloveData.currentIDMeetTimeline)).data('account');
         else if (window.location.pathname.startsWith('/accounts/'))
             accId = window.location.pathname.match(/^\/accounts\/(\d+)/)[1];
@@ -634,7 +634,7 @@ function fedilove_customization() {
 
         }, 200);
     }
-    else if (window.location.pathname == '/federated')
+    else if (window.location.pathname == '/meet')
     {
         $('div.main-content').addClass('meet');
         $('body').addClass('meet');
@@ -659,14 +659,14 @@ function fedilove_customization() {
         var itemsDrawnOnce = false;
         const _this = setInterval(function()
         {
-            if (window.location.pathname !== '/federated')
+            if (window.location.pathname !== '/meet')
                 return clearInterval(_this);
 
             if ($('div#noone-to-meet').length === 0)
                 $('div.timeline').parent().append('<div id="noone-to-meet" style="display: none"><span>Nothing to show</span></div>');
 
             // remove discarded accounts from timeline (temporal,
-            //  if /federated is reloaded, blocked accounts won't show either)
+            //  if /meet is reloaded, blocked accounts won't show either)
             prevItems = $('div.virtual-list > div.virtual-list-item:visible');
 
             for (var accId of fediloveData.tmpDiscardedAccounts) {