darkkirb/akkoma-fe
1
0
Fork 0
Code Pull requests Activity

Revert "Merge pull request 'Don't show timeline links if disabled and logged out' (#250) from sfr/pleroma-fe:fix/hide-timelines into develop"

Browse source 
This reverts commit 0b5793c1e0, reversing
changes made to 72ef2e7454.
This commit is contained in:
FloatingGhost 2022-12-29 15:18:13 +00:00
parent d00e28d5e9
commit bb243168b3
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/desktop_nav/desktop_nav.js
View file

@ -98,15 +98,11 @@ export default {
logoLeft () { return this.$store.state.instance.logoLeft }, logoLeft () { return this.$store.state.instance.logoLeft },
currentUser () { return this.$store.state.users.currentUser }, currentUser () { return this.$store.state.users.currentUser },
privateMode () { return this.$store.state.instance.private }, privateMode () { return this.$store.state.instance.private },
federating () { return this.$store.state.instance.federating },
shouldConfirmLogout () { shouldConfirmLogout () {
return this.$store.getters.mergedConfig.modalOnLogout return this.$store.getters.mergedConfig.modalOnLogout
}, },
showBubbleTimeline () { showBubbleTimeline () {
return this.$store.state.instance.localBubbleInstances.length > 0 return this.$store.state.instance.localBubbleInstances.length > 0
},
restrictedTimelines () {
return this.$store.state.instance.restrict_unauthenticated.timelines
} }
}, },
methods: { methods: {

2
src/components/desktop_nav/desktop_nav.vue
View file

@ -44,7 +44,6 @@
/> />
</router-link> </router-link>
<router-link <router-link
v-if="currentUser || !(privateMode || restrictedTimelines.public)"
:to="{ name: 'public-timeline' }" :to="{ name: 'public-timeline' }"
class="nav-icon" class="nav-icon"
> >
@ -68,7 +67,6 @@
/> />
</router-link> </router-link>
<router-link <router-link
v-if="federating && (currentUser || !(privateMode || restrictedTimelines.federated))"
:to="{ name: 'public-external-timeline' }" :to="{ name: 'public-external-timeline' }"
class="nav-icon" class="nav-icon"
> >

3
src/components/timeline_menu/timeline_menu_content.js
View file

@ -24,8 +24,7 @@ const TimelineMenuContent = {
currentUser: state => state.users.currentUser, currentUser: state => state.users.currentUser,
privateMode: state => state.instance.private, privateMode: state => state.instance.private,
federating: state => state.instance.federating, federating: state => state.instance.federating,
showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0), showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0)
restrictedTimelines: state => state.instance.restrict_unauthenticated.timelines
}) })
} }
} }

4
src/components/timeline_menu/timeline_menu_content.vue
View file

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