pleroma-fe

commit: deb2ddb398362f3a1e70391db51775eb77e5e7f8
parent: ad8eb8832364774a1c06f9c78461fb921b3ca361
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Thu, 23 Jan 2020 18:10:55 +0000

Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'

Fix missing TWKN when logged in, but server is set to private mode.

Closes #759

See merge request pleroma/pleroma-fe!1047
Diffstat:
M
src/components/nav_panel/nav_panel.vue
2
+-
M
src/components/side_drawer/side_drawer.vue
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
@@ -33,7 +33,7 @@
             <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
           </router-link>
         </li>
-        <li v-if="federating && !privateMode">
+        <li v-if="federating && (currentUser || !privateMode)">
           <router-link :to="{ name: 'public-external-timeline' }">
             <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
           </router-link>
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
@@ -88,7 +88,7 @@
           </router-link>
         </li>
         <li
-          v-if="federating && !privateMode"
+          v-if="federating && (currentUser || !privateMode)"
           @click="toggleDrawer"
         >
           <router-link to="/main/all">