From 6cdb921e567815be1da9b12a835b321e168606fe Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 24 Mar 2026 21:48:28 +0200 Subject: [PATCH] fixes --- src/components/settings_modal/tabs/filtering_tab.js | 2 +- src/stores/merged_config.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js index 44d0ae711..ef3d8835b 100644 --- a/src/components/settings_modal/tabs/filtering_tab.js +++ b/src/components/settings_modal/tabs/filtering_tab.js @@ -37,7 +37,7 @@ const FilteringTab = { label: this.$t(`user_card.mute_block_${mode}`), })), muteFiltersDraftObject: cloneDeep( - useMergedConfigStore().mergedConfig.muteFilters, + useSyncConfigStore().prefsStorage.simple.muteFilters, ), muteFiltersDraftDirty: Object.fromEntries( Object.entries( diff --git a/src/stores/merged_config.js b/src/stores/merged_config.js index 1f0ed8aff..e28d79748 100644 --- a/src/stores/merged_config.js +++ b/src/stores/merged_config.js @@ -28,7 +28,7 @@ export const useMergedConfigStore = defineStore('merged_config', { const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k] const result = Object.fromEntries( - Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [ + Object.keys(ROOT_CONFIG).map((k) => [ k, getValue(k) ?? getDefault(k), ]), @@ -41,7 +41,7 @@ export const useMergedConfigStore = defineStore('merged_config', { const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k] const result = Object.fromEntries( - Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [ + Object.keys(ROOT_CONFIG).map((k) => [ k, getDefault(k), ]), @@ -58,7 +58,7 @@ export const useMergedConfigStore = defineStore('merged_config', { tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k] ?? instancePrefs[k] const result = Object.fromEntries( - Object.keys(INSTANCE_DEFAULT_CONFIG).map(([k, value]) => [ + Object.keys(ROOT_CONFIG).map(([k, value]) => [ k, getValue(k), ]),