Merge branch 'from/develop/tusooa/announcements' into 'develop'

Announcements

See merge request pleroma/pleroma-fe!1466

2 files changed, 9 insertions, 1 deletions

diff --git a/src/components/navigation/filter.js b/src/components/navigation/filter.js
index 31b55486..5474a8ac 100644
--- a/src/components/navigation/filter.js
+++ b/src/components/navigation/filter.js
@@ -1,4 +1,4 @@
-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
@@ -6,6 +6,7 @@ export const filterNavigation = (list = [], { hasChats, isFederating, isPrivate,
     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']
   }
 }