From d6c8821d3749f8b85ef769a53937d6e12e3d8063 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 15 Dec 2022 00:53:32 +0200 Subject: fix private mode & timelines dropdown --- src/components/navigation/filter.js | 2 +- src/components/navigation/navigation_pins.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/components/navigation') diff --git a/src/components/navigation/filter.js b/src/components/navigation/filter.js index 5474a8ac..e8e77f8f 100644 --- a/src/components/navigation/filter.js +++ b/src/components/navigation/filter.js @@ -2,7 +2,7 @@ export const filterNavigation = (list = [], { hasChats, hasAnnouncements, isFede return list.filter(({ criteria, anon, anonRoute }) => { const set = new Set(criteria || []) if (!isFederating && set.has('federating')) return false - if (isPrivate && set.has('!private')) return false + if (!currentUser && isPrivate && set.has('!private')) return false if (!currentUser && !(anon || anonRoute)) return false if ((!currentUser || !currentUser.locked) && set.has('lockedUser')) return false if (!hasChats && set.has('chats')) return false diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js index 57b8d589..9dd795aa 100644 --- a/src/components/navigation/navigation_pins.js +++ b/src/components/navigation/navigation_pins.js @@ -56,11 +56,17 @@ const NavPanel = { }), pinnedList () { if (!this.currentUser) { - return [ + return filterNavigation([ { ...TIMELINES.public, name: 'public' }, { ...TIMELINES.twkn, name: 'twkn' }, { ...ROOT_ITEMS.about, name: 'about' } - ] + ], + { + hasChats: this.pleromaChatMessagesAvailable, + isFederating: this.federating, + isPrivate: this.privateMode, + currentUser: this.currentUser + }) } return filterNavigation( [ -- cgit v1.2.3-70-g09d2