diff --git a/src/components/settings_modal/helpers/list_setting.js b/src/components/settings_modal/helpers/list_setting.js index c1d504cd5..232ea123f 100644 --- a/src/components/settings_modal/helpers/list_setting.js +++ b/src/components/settings_modal/helpers/list_setting.js @@ -1,6 +1,8 @@ import Checkbox from 'src/components/checkbox/checkbox.vue' import Setting from './setting.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' + export default { ...Setting, data() { @@ -43,7 +45,7 @@ export default { if (this.forceNew) return true if (!this.allowNew) return false - const isExpert = this.$store.state.config.expertLevel > 0 + const isExpert = useSyncConfigStore().mergedConfig.expertLevel > 0 const hasBuiltins = this.builtinEntries.length > 0 if (hasBuiltins) { diff --git a/src/components/settings_modal/settings_modal_user_content.js b/src/components/settings_modal/settings_modal_user_content.js index ddee812ca..6c33b4fa6 100644 --- a/src/components/settings_modal/settings_modal_user_content.js +++ b/src/components/settings_modal/settings_modal_user_content.js @@ -16,6 +16,7 @@ import SecurityTab from './tabs/security_tab/security_tab.vue' import StyleTab from './tabs/style_tab/style_tab.vue' import { useInterfaceStore } from 'src/stores/interface.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -83,7 +84,7 @@ const SettingsModalContent = { return useInterfaceStore().settingsModalState === 'visible' }, expertLevel() { - return this.$store.state.config.expertLevel + return useSyncConfigStore().mergedConfig.expertLevel }, }, data() { diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js index 510425e2d..85749ab3f 100644 --- a/src/components/settings_modal/tabs/clutter_tab.js +++ b/src/components/settings_modal/tabs/clutter_tab.js @@ -38,55 +38,6 @@ const ClutterTab = { Object.entries(store.prefsStorage.simple.muteFilters), muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters, }), - onMuteDefaultActionLv1: { - get() { - const value = this.$store.state.config.onMuteDefaultAction - if (value === 'ask' || value === 'forever') { - return value - } else { - return 'temporarily' - } - }, - set(value) { - let realValue = value - if (value !== 'ask' && value !== 'forever') { - realValue = '14d' - } - useSyncConfigStore().setSimplePrefAndSave({ - path: 'onMuteDefaultAction', - value: realValue, - }) - }, - }, - onBlockDefaultActionLv1: { - get() { - const value = this.$store.state.config.onBlockDefaultAction - if (value === 'ask' || value === 'forever') { - return value - } else { - return 'temporarily' - } - }, - set(value) { - let realValue = value - if (value !== 'ask' && value !== 'forever') { - realValue = '14d' - } - useSyncConfigStore().setSimplePrefAndSave({ - path: 'onBlockDefaultAction', - value: realValue, - }) - }, - }, - muteFiltersDraft() { - return Object.entries(this.muteFiltersDraftObject) - }, - muteFiltersExpired() { - const now = Date.now() - return Object.entries(this.muteFiltersDraftObject).filter( - ([, { expires }]) => expires != null && expires <= now, - ) - }, }, methods: { ...mapActions(useSyncConfigStore, [ diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js index 64710d745..3724ea0e7 100644 --- a/src/components/settings_modal/tabs/filtering_tab.js +++ b/src/components/settings_modal/tabs/filtering_tab.js @@ -100,7 +100,7 @@ const FilteringTab = { ...mapState(useInstanceCapabilitiesStore, ['blockExpiration']), onMuteDefaultActionLv1: { get() { - const value = this.$store.state.config.onMuteDefaultAction + const value = useSyncConfigStore().mergedConfig.onMuteDefaultAction if (value === 'ask' || value === 'forever') { return value } else { @@ -120,7 +120,7 @@ const FilteringTab = { }, onBlockDefaultActionLv1: { get() { - const value = this.$store.state.config.onBlockDefaultAction + const value = useSyncConfigStore().mergedConfig.onBlockDefaultAction if (value === 'ask' || value === 'forever') { return value } else {