From 85976a61b88549927d7325285830ffca913c5744 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 13 Feb 2026 14:33:40 +0200 Subject: [PATCH] notification_utils.js --- .../notification_utils/notification_utils.js | 4 ++-- .../notification_utils.spec.js | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js index 14785a685..a1ea68bf8 100644 --- a/src/services/notification_utils/notification_utils.js +++ b/src/services/notification_utils/notification_utils.js @@ -3,6 +3,7 @@ import { muteFilterHits } from '../status_parser/status_parser.js' import { useAnnouncementsStore } from 'src/stores/announcements' import { useI18nStore } from 'src/stores/i18n.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import FaviconService from 'src/services/favicon_service/favicon_service.js' @@ -19,8 +20,7 @@ export const notificationsFromStore = (store) => store.state.notifications.data export const visibleTypes = (store) => { // When called from within a module we need rootGetters to access wider scope // however when called from a component (i.e. this.$store) we already have wider scope - const rootGetters = store.rootGetters || store.getters - const { notificationVisibility } = rootGetters.mergedConfig + const { notificationVisibility } = useSyncConfigStore().mergedConfig return [ notificationVisibility.likes && 'like', diff --git a/test/unit/specs/services/notification_utils/notification_utils.spec.js b/test/unit/specs/services/notification_utils/notification_utils.spec.js index baafd8961..0db318e3c 100644 --- a/test/unit/specs/services/notification_utils/notification_utils.spec.js +++ b/test/unit/specs/services/notification_utils/notification_utils.spec.js @@ -1,6 +1,21 @@ +import { createTestingPinia } from '@pinia/testing' + +import { useSyncConfigStore } from 'src/stores/sync_config.js' + import * as NotificationUtils from 'src/services/notification_utils/notification_utils.js' describe('NotificationUtils', () => { + beforeEach(() => { + const store = useSyncConfigStore(createTestingPinia()) + store.mergedConfig = { + notificationVisibility: { + likes: true, + repeats: true, + mentions: false, + }, + } + }) + describe('filteredNotificationsFromStore', () => { it('should return sorted notifications with configured types', () => { const store = { @@ -25,15 +40,6 @@ describe('NotificationUtils', () => { ], }, }, - getters: { - mergedConfig: { - notificationVisibility: { - likes: true, - repeats: true, - mentions: false, - }, - }, - }, } const expected = [ {