From 0f4cdcda483c85a63c6f34514dab14ea9b6f5a54 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 16 Mar 2023 16:41:37 +0000
Subject: [PATCH] Add checks for currentUser on sidebar

---
 src/components/timeline_menu/timeline_menu_content.vue   | 4 ++--
 src/components/timeline_menu_tabs/timeline_menu_tabs.js  | 7 ++++++-
 src/components/timeline_menu_tabs/timeline_menu_tabs.vue | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue
index 70af126c..0144f2fd 100644
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@@ -32,7 +32,7 @@
         >{{ $t("nav.bubble_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="(currentUser || !privateMode) && (publicTimelineVisibility?.local ?? true)">
+    <li v-if="(currentUser || !privateMode) && (currentUser || (publicTimelineVisibility?.local ?? true))">
       <router-link
         class="menu-item"
         :to="{ name: 'public-timeline' }"
@@ -48,7 +48,7 @@
         >{{ $t("nav.public_tl") }}</span>
       </router-link>
     </li>
-    <li v-if="federating && (currentUser || !privateMode) && (publicTimelineVisibility?.federated ?? true)">
+    <li v-if="federating && (currentUser || !privateMode) && (currentUser || (publicTimelineVisibility?.federated ?? true))">
       <router-link
         class="menu-item"
         :to="{ name: 'public-external-timeline' }"
diff --git a/src/components/timeline_menu_tabs/timeline_menu_tabs.js b/src/components/timeline_menu_tabs/timeline_menu_tabs.js
index 40192b39..74ed61aa 100644
--- a/src/components/timeline_menu_tabs/timeline_menu_tabs.js
+++ b/src/components/timeline_menu_tabs/timeline_menu_tabs.js
@@ -4,6 +4,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChevronDown
 } from '@fortawesome/free-solid-svg-icons'
+import { mapState } from 'vuex'
 
 library.add(faChevronDown)
 
@@ -41,7 +42,11 @@ const TimelineMenuTabs = {
     },
     privateMode () {
       return this.$store.state.instance.private
-    }
+    },
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      publicTimelineVisibility: state => state.instance.publicTimelineVisibility,
+    })
   },
   methods: {
     timelineName () {
diff --git a/src/components/timeline_menu_tabs/timeline_menu_tabs.vue b/src/components/timeline_menu_tabs/timeline_menu_tabs.vue
index f017fa1f..e922ffcc 100644
--- a/src/components/timeline_menu_tabs/timeline_menu_tabs.vue
+++ b/src/components/timeline_menu_tabs/timeline_menu_tabs.vue
@@ -18,6 +18,7 @@
     <router-link
       :to="{ name: 'public-timeline' }"
       class="nav-icon"
+      v-if="currentUser || (publicTimelineVisibility?.local ?? true)"
     >
       <FAIcon
         fixed-width
@@ -41,6 +42,7 @@
     <router-link
       :to="{ name: 'public-external-timeline' }"
       class="nav-icon"
+      v-if="currentUser || (publicTimelineVisibility?.federated ?? true)"
     >
       <FAIcon
         fixed-width