AkkomaGang
/
akkoma-fe
4
13
Fork 56
Code Issues 72 Pull Requests 16 Projects Releases 1 Wiki Activity

Don't show timeline links if disabled and logged out
ci/woodpecker/pr/woodpecker Pipeline was successful Details

This commit is contained in:
Sol Fisher Romanoff 2022-12-10 21:17:41 +02:00
parent 9bf310d509
commit 6e1ba218df
Signed by untrusted user who does not match committer: nbsp
GPG Key ID: 9D3F2B64F2341B62
4 changed files with 10 additions and 3 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,11 +98,15 @@ 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: {

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

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

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

@ -24,7 +24,8 @@ const TimelineMenuContent = {
currentUser: state => state.users.currentUser,
privateMode: state => state.instance.private,
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>
</router-link>
</li>
<li v-if="currentUser || !privateMode">
<li v-if="currentUser || !(privateMode || restrictedTimelines.public)">
<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)">
<li v-if="federating && (currentUser || !(privateMode || restrictedTimelines.federated))">
<router-link
class="menu-item"
:to="{ name: 'public-external-timeline' }"