From 76d3ec1b3958173a0b30f5af38713c3a51f87820 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 13 Feb 2026 14:34:35 +0200 Subject: [PATCH] Revert "notification_utils.js" This reverts commit 67059addfe64d3cf531a4797a3b9d38174f622e4. --- .../notification_utils/notification_utils.js | 4 ++-- .../notification_utils.spec.js | 24 +++++++------------ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js index a1ea68bf8..14785a685 100644 --- a/src/services/notification_utils/notification_utils.js +++ b/src/services/notification_utils/notification_utils.js @@ -3,7 +3,6 @@ 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' @@ -20,7 +19,8 @@ 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 { notificationVisibility } = useSyncConfigStore().mergedConfig + const rootGetters = store.rootGetters || store.getters + const { notificationVisibility } = rootGetters.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 0db318e3c..baafd8961 100644 --- a/test/unit/specs/services/notification_utils/notification_utils.spec.js +++ b/test/unit/specs/services/notification_utils/notification_utils.spec.js @@ -1,21 +1,6 @@ -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 = { @@ -40,6 +25,15 @@ describe('NotificationUtils', () => { ], }, }, + getters: { + mergedConfig: { + notificationVisibility: { + likes: true, + repeats: true, + mentions: false, + }, + }, + }, } const expected = [ {