From bb243168b378a931be78c642030c9e89a0b8197b Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 29 Dec 2022 15:18:13 +0000
Subject: [PATCH] Revert "Merge pull request 'Don't show timeline links if
disabled and logged out' (#250) from sfr/pleroma-fe:fix/hide-timelines into
develop"
This reverts commit 0b5793c1e0fc3d311ffb54784299442f2fa45967, reversing
changes made to 72ef2e7454d654ceb34fc736c3f8080536b80b40.
---
src/components/desktop_nav/desktop_nav.js | 4 ----
src/components/desktop_nav/desktop_nav.vue | 2 --
src/components/timeline_menu/timeline_menu_content.js | 3 +--
src/components/timeline_menu/timeline_menu_content.vue | 4 ++--
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 2fb8a5ac..f4900c38 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -98,15 +98,11 @@ export default {
logoLeft () { return this.$store.state.instance.logoLeft },
currentUser () { return this.$store.state.users.currentUser },
privateMode () { return this.$store.state.instance.private },
- federating () { return this.$store.state.instance.federating },
shouldConfirmLogout () {
return this.$store.getters.mergedConfig.modalOnLogout
},
showBubbleTimeline () {
return this.$store.state.instance.localBubbleInstances.length > 0
- },
- restrictedTimelines () {
- return this.$store.state.instance.restrict_unauthenticated.timelines
}
},
methods: {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index a52989a5..92d3fa5b 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -44,7 +44,6 @@
/>
</router-link>
<router-link
- v-if="currentUser || !(privateMode || restrictedTimelines.public)"
:to="{ name: 'public-timeline' }"
class="nav-icon"
>
@@ -68,7 +67,6 @@
/>
</router-link>
<router-link
- v-if="federating && (currentUser || !(privateMode || restrictedTimelines.federated))"
:to="{ name: 'public-external-timeline' }"
class="nav-icon"
>
diff --git a/src/components/timeline_menu/timeline_menu_content.js b/src/components/timeline_menu/timeline_menu_content.js
index 25bd30d9..df15030b 100644
--- a/src/components/timeline_menu/timeline_menu_content.js
+++ b/src/components/timeline_menu/timeline_menu_content.js
@@ -24,8 +24,7 @@ const TimelineMenuContent = {
currentUser: state => state.users.currentUser,
privateMode: state => state.instance.private,
federating: state => state.instance.federating,
- showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
- restrictedTimelines: state => state.instance.restrict_unauthenticated.timelines
+ showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0)
})
}
}
diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue
index 220b0278..27aece22 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 || restrictedTimelines.public)">
+ <li v-if="currentUser || !privateMode">
<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 || restrictedTimelines.federated))">
+ <li v-if="federating && (currentUser || !privateMode)">
<router-link
class="menu-item"
:to="{ name: 'public-external-timeline' }"