From 38b6f0a013ec09b4c54bfe830a92bde46290bda1 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 20 Nov 2023 00:14:56 +0200 Subject: fix notification dot in favicon and mobile nav, minor refactor --- src/components/notifications/notifications.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/components/notifications/notifications.js') diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index 00d3a511..a9fa8455 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -8,7 +8,8 @@ import { notificationsFromStore, filteredNotificationsFromStore, unseenNotificationsFromStore, - countExtraNotifications + countExtraNotifications, + ACTIONABLE_NOTIFICATION_TYPES } from '../../services/notification_utils/notification_utils.js' import FaviconService from '../../services/favicon_service/favicon_service.js' import { library } from '@fortawesome/fontawesome-svg-core' @@ -21,7 +22,6 @@ library.add( ) const DEFAULT_SEEN_TO_DISPLAY_COUNT = 30 -const ACTIONABLE_NOTIFICATION_TYPES = new Set(['mention', 'pleroma:report', 'follow_request']) const Notifications = { components: { @@ -85,11 +85,7 @@ const Notifications = { return `${this.unseenCount ? this.unseenCount : ''}${this.extraNotificationsCount ? '*' : ''}` }, unseenCount () { - if (this.ignoreInactionableSeen) { - return this.unseenNotifications.filter(n => ACTIONABLE_NOTIFICATION_TYPES.has(n.type)).length - } else { - return this.unseenNotifications.length - } + return this.unseenNotifications.length }, ignoreInactionableSeen () { return this.$store.getters.mergedConfig.ignoreInactionableSeen }, extraNotificationsCount () { -- cgit v1.2.3-70-g09d2