AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

Make display of links to public external timeline dependent on restrict_unauthenticated setting (#204) #216

Closed
fedward wants to merge 1 commit from fedward:issue204 into develop
pull from: fedward:issue204
merge into: AkkomaGang:develop
Conversation 1 Commits 1 Files changed 3 +3 -1
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/App.js
View file

@ -92,6 +92,7 @@ export default {
editingAvailable () { return this.$store.state.instance.editingAvailable }, editingAvailable () { return this.$store.state.instance.editingAvailable },
layoutType () { return this.$store.state.interface.layoutType }, layoutType () { return this.$store.state.interface.layoutType },
privateMode () { return this.$store.state.instance.private }, privateMode () { return this.$store.state.instance.private },
showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated) },
Ghost commented 2022-11-16 20:22:03 +00:00
Review
Copy link

nit: {return => { return
surprised the console didn't scream at you for that

actually it's probably too big to be a oneliner, try this

    showPublicExternalTimeline () {
      if (currentUser() || !privateMode ||
        !this.$store.state.instance.restrict_unauthenticated.timelines.federated) {
        return true
      }
    },
nit: `{return => { return` surprised the console didn't scream at you for that actually it's probably too big to be a oneliner, try this ```js showPublicExternalTimeline () { if (currentUser() || !privateMode || !this.$store.state.instance.restrict_unauthenticated.timelines.federated) { return true } }, ```
reverseLayout () { reverseLayout () {
const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig
if (this.layoutType !== 'wide') { if (this.layoutType !== 'wide') {

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

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

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

@ -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)"> <li v-if="federating && showPublicExternalTimeline">
Ghost commented 2022-11-16 20:26:41 +00:00
Review
Copy link

maybe federating should be grouped into this new variable as well?

maybe `federating` should be grouped into this new variable as well?
fedward commented 2022-11-16 20:30:57 +00:00
Review
Copy link

My goal was the lightest possible change, but I thought about that. But then I also thought that maybe there should be a corresponding variable for the local timeline so the style could be consistent wherever those links appear.

My goal was the lightest possible change, but I thought about that. But then I also thought that maybe there should be a corresponding variable for the local timeline so the style could be consistent wherever those links appear.
Ghost commented 2022-11-16 20:40:39 +00:00
Review
Copy link

well it makes sense for it to be grouped; it wouldn't show if it doesn't federate, so the name is a bit misleading if it's not in there

well it makes sense for it to be grouped; it wouldn't `show` if it doesn't federate, so the name is a bit misleading if it's not in there
👍 1
<router-link <router-link
class="menu-item" class="menu-item"
:to="{ name: 'public-external-timeline' }" :to="{ name: 'public-external-timeline' }"