Merge pull request 'Merge changes from unauth-global-timeline branch' (#4) from develop into stable

Reviewed-on: fedward/pleroma-fe#4

src/App.js

@@ -92,6 +92,7 @@ export default {
     editingAvailable () { return this.$store.state.instance.editingAvailable },
     layoutType () { return this.$store.state.interface.layoutType },
     privateMode () { return this.$store.state.instance.private },
+    showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated) },
     reverseLayout () {
       const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig
       if (this.layoutType !== 'wide') {

src/components/desktop_nav/desktop_nav.vue

@@ -67,7 +67,7 @@
             />
           </router-link>
           <router-link
-            v-if="currentUser"
+            v-if="showPublicExternalTimeline"
             :to="{ name: 'public-external-timeline' }"
             class="nav-icon"
           >

src/components/timeline_menu/timeline_menu_content.vue

@@ -48,7 +48,7 @@
         >{{ $t("nav.public_tl") }}</span>
       </router-link>
     </li>
-    <li v-if="federating && (currentUser || !privateMode)">
+    <li v-if="federating && showPublicExternalTimeline">
       <router-link
         class="menu-item"
         :to="{ name: 'public-external-timeline' }"