simplify timeline vibility checks

src/components/desktop_nav/desktop_nav.js

@@ -1,6 +1,11 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  publicTimelineVisible,
+  federatedTimelineVisible,
+  bubbleTimelineVisible,
+} from '../../lib/timeline_visibility'
 import {
   faSignInAlt,
   faSignOutAlt,
@@ -106,8 +111,9 @@ export default {
       return this.$store.state.instance.localBubbleInstances.length > 0
     },
     ...mapState({
-      publicTimelineVisibility: state => state.instance.publicTimelineVisibility,
+      publicTimelineVisible,
-      federatedTimelineAvailable: state => state.instance.federatedTimelineAvailable,
+      federatedTimelineVisible,
+      bubbleTimelineVisible,
     })
   },
   methods: {

src/components/desktop_nav/desktop_nav.vue

@@ -46,7 +46,7 @@
           <router-link
             :to="{ name: 'public-timeline' }"
             class="nav-icon"
-            v-if="(currentUser || (publicTimelineVisibility?.local ?? true))"
+            v-if="publicTimelineVisible"
           >
             <FAIcon
               fixed-width
@@ -56,7 +56,7 @@
             />
           </router-link>
           <router-link
-            v-if="(currentUser || publicTimelineVisibility?.bubble) && showBubbleTimeline"
+            v-if="bubbleTimelineVisible"
             :to="{ name: 'bubble-timeline' }"
             class="nav-icon"
           >
@@ -70,7 +70,7 @@
           <router-link
             :to="{ name: 'public-external-timeline' }"
             class="nav-icon"
-            v-if="federatedTimelineAvailable && (currentUser || (publicTimelineVisibility?.federated ?? true))"
+            v-if="federatedTimelineVisible"
           >
             <FAIcon
               fixed-width

src/components/timeline_menu/timeline_menu_content.js

@@ -8,6 +8,7 @@ import {
   faHome,
   faCircle
 } from '@fortawesome/free-solid-svg-icons'
+import { federatedTimelineVisible, publicTimelineVisible, bubbleTimelineVisible } from '../../lib/timeline_visibility'
 
 library.add(
   faUsers,
@@ -24,9 +25,9 @@ const TimelineMenuContent = {
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating,
-      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
+      publicTimelineVisible,
-      publicTimelineVisibility: state => state.instance.publicTimelineVisibility,
+      federatedTimelineVisible,
-      federatedTimelineAvailable: state => state.instance.federatedTimelineAvailable,
+      bubbleTimelineVisible,
     })
   }
 }

src/components/timeline_menu/timeline_menu_content.vue

@@ -16,7 +16,7 @@
         >{{ $t("nav.home_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="(currentUser || publicTimelineVisibility?.bubble) && showBubbleTimeline">
+    <li v-if="bubbleTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'bubble-timeline' }"
@@ -32,7 +32,7 @@
         >{{ $t("nav.bubble_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="(currentUser || !privateMode) && (currentUser || (publicTimelineVisibility?.local ?? true))">
+    <li v-if="publicTimelineVisible">
       <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 && federatedTimelineAvailable && (currentUser || !privateMode) && (currentUser || (publicTimelineVisibility?.federated ?? true))">
+    <li v-if="federatedTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'public-external-timeline' }"

src/components/timeline_menu_tabs/timeline_menu_content.js

@@ -8,6 +8,7 @@ import {
   faHome
 } from '@fortawesome/free-solid-svg-icons'
 import { faCircle } from '@fortawesome/free-regular-svg-icons'
+import { federatedTimelineVisible, publicTimelineVisible, bubbleTimelineVisible } from '../../lib/timeline_visibility'
 library.add(
   faUsers,
   faGlobe,
@@ -23,9 +24,9 @@ const TimelineMenuContent = {
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating,
-      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
+      publicTimelineVisible,
-      publicTimelineVisibility: state => state.instance.publicTimelineVisibility,
+      federatedTimelineVisible,
-      federatedTimelineAvailable: state => state.instance.federatedTimelineAvailable,
+      bubbleTimelineVisible,
     })
   }
 }

src/components/timeline_menu_tabs/timeline_menu_content.vue

@@ -16,7 +16,7 @@
         >{{ $t("nav.home_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="(currentUser || publicTimelineVisibility?.bubble) && showBubbleTimeline">
+    <li v-if="bubbleTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'bubble-timeline' }"
@@ -32,7 +32,7 @@
         >{{ $t("nav.bubble_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="currentUser || !privateMode">
+    <li v-if="publicTimelineVisible">
       <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 && federatedTimelineAvailable && (currentUser || !privateMode || publicTimelineVisibility?.federated)">
+    <li v-if="federatedTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'public-external-timeline' }"

src/components/timeline_menu_tabs/timeline_menu_tabs.js

@@ -5,6 +5,11 @@ import {
   faChevronDown
 } from '@fortawesome/free-solid-svg-icons'
 import { mapState } from 'vuex'
+import {
+  publicTimelineVisible,
+  federatedTimelineVisible,
+  bubbleTimelineVisible,
+} from '../../lib/timeline_visibility'
 
 library.add(faChevronDown)
 
@@ -37,17 +42,14 @@ const TimelineMenuTabs = {
     }
   },
   computed: {
-    currentUser () {
-      return this.$store.state.users.currentUser
-    },
     privateMode () {
       return this.$store.state.instance.private
     },
     ...mapState({
       currentUser: state => state.users.currentUser,
-      publicTimelineVisibility: state => state.instance.publicTimelineVisibility,
+      publicTimelineVisible,
-      federatedTimelineAvailable: state => state.instance.federatedTimelineAvailable,
+      federatedTimelineVisible,
-      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
+      bubbleTimelineVisible,
     })
   },
   methods: {

src/components/timeline_menu_tabs/timeline_menu_tabs.vue

@@ -18,7 +18,7 @@
     <router-link
       :to="{ name: 'public-timeline' }"
       class="nav-icon"
-      v-if="currentUser || (publicTimelineVisibility?.local ?? true)"
+      v-if="publicTimelineVisible"
     >
       <FAIcon
         fixed-width
@@ -28,7 +28,7 @@
       />
     </router-link>
     <router-link
-      v-if="(currentUser || publicTimelineVisibility?.bubble) && showBubbleTimeline"
+      v-if="bubbleTimelineVisible"
       :to="{ name: 'bubble-timeline' }"
       class="nav-icon"
     >
@@ -42,7 +42,7 @@
     <router-link
       :to="{ name: 'public-external-timeline' }"
       class="nav-icon"
-      v-if="(currentUser || (publicTimelineVisibility?.federated ?? true)) && federatedTimelineAvailable"
+      v-if="federatedTimelineVisible"
     >
       <FAIcon
         fixed-width

src/lib/timeline_visibility.js

@@ -0,0 +1,23 @@
+const timelineVisibleUnauthenticated =  (state, timeline) => (
+    state.instance.publicTimelineVisibility[timeline] ?? false
+);
+
+const currentUser = (state) => state.users.currentUser;
+
+const currentUserOrTimelineVisibleUnauthenticated = (state, timeline) => (
+  currentUser(state) || timelineVisibleUnauthenticated(state, timeline)
+);
+
+const federatedTimelineAvailable = (state) => state.instance.federatedTimelineAvailable;
+
+export const federatedTimelineVisible = (state) => (
+  federatedTimelineAvailable(state) && currentUserOrTimelineVisibleUnauthenticated(state, 'federated')
+);
+
+export const publicTimelineVisible = (state) => (
+  currentUserOrTimelineVisibleUnauthenticated(state, 'local')
+);
+
+export const bubbleTimelineVisible = (state) => (
+  state.instance.localBubbleInstances.length > 0 && currentUserOrTimelineVisibleUnauthenticated(state, 'bubble')
+);