3 files changed, 18 insertions, 4 deletions
diff --git a/src/components/navigation/filter.js b/src/components/navigation/filter.js
index 31b55486..e8e77f8f 100644
--- a/src/components/navigation/filter.js
+++ b/src/components/navigation/filter.js
@@ -1,11 +1,12 @@
-export const filterNavigation = (list = [], { hasChats, isFederating, isPrivate, currentUser }) => {
+export const filterNavigation = (list = [], { hasChats, hasAnnouncements, isFederating, isPrivate, currentUser }) => {
   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
+    if (!hasAnnouncements && set.has('announcements')) return false
     return true
   })
 }
diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index f66dd981..7f096316 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -71,5 +71,12 @@ export const ROOT_ITEMS = {
     anon: true,
     icon: 'info-circle',
     label: 'nav.about'
+  },
+  announcements: {
+    route: 'announcements',
+    icon: 'bullhorn',
+    label: 'nav.announcements',
+    badgeGetter: 'unreadAnnouncementCount',
+    criteria: ['announcements']
   }
 }
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(
         [