pass 2

src/components/settings_modal/helpers/setting.js

@@ -259,7 +259,7 @@ export default {
             const writePath = `simple.${readPath}`
 
             if (!this.timedApplyMode) {
-              useSyncConfigStore().setPreference({ path: writePath, value })
+              useSyncConfigStore().setSimplePrefAndSave({ path: writePath, value })
               useSyncConfigStore().pushSyncConfig()
             } else {
               if (useInterfaceStore().temporaryChangesTimeoutId !== null) {

src/components/settings_modal/settings_modal.js

@@ -195,8 +195,8 @@ const SettingsModal = {
         return useSyncConfigStore().mergedConfig.expertLevel > 0
       },
       set(value) {
-        useSyncConfigStore().setPreference({
-          path: 'simple.expertLevel',
+        useSyncConfigStore().setSimplePrefAndSave({
+          path: 'expertLevel',
           value: value ? 1 : 0,
         })
       },

src/components/settings_modal/tabs/clutter_tab.js

@@ -52,8 +52,8 @@ const ClutterTab = {
         if (value !== 'ask' && value !== 'forever') {
           realValue = '14d'
         }
-        useSyncConfigStore().setPreference({
-          path: 'simple.onMuteDefaultAction',
+        useSyncConfigStore().setSimplePrefAndSave({
+          path: 'onMuteDefaultAction',
           value: realValue,
         })
       },
@@ -72,8 +72,8 @@ const ClutterTab = {
         if (value !== 'ask' && value !== 'forever') {
           realValue = '14d'
         }
-        useSyncConfigStore().setPreference({
-          path: 'simple.onBlockDefaultAction',
+        useSyncConfigStore().setSimplePrefAndSave({
+          path: 'onBlockDefaultAction',
           value: realValue,
         })
       },
@@ -90,8 +90,8 @@ const ClutterTab = {
   },
   methods: {
     ...mapActions(useSyncConfigStore, [
-      'setPreference',
-      'unsetPreference',
+      'setSimplePrefAndSave',
+      'unsetSimplePrefAndSave',
       'pushSyncConfig',
     ]),
     getDatetimeLocal(timestamp) {
@@ -138,7 +138,7 @@ const ClutterTab = {
 
       filter.order = this.muteFilters.length + 2
       this.muteFiltersDraftObject[newId] = filter
-      this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
+      this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
       this.pushSyncConfig()
     },
     exportFilter(id) {
@@ -154,18 +154,18 @@ const ClutterTab = {
       const newId = uuidv4()
 
       this.muteFiltersDraftObject[newId] = filter
-      this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
+      this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
       this.pushSyncConfig()
     },
     deleteFilter(id) {
       delete this.muteFiltersDraftObject[id]
-      this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null })
+      this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
       this.pushSyncConfig()
     },
     purgeExpiredFilters() {
       this.muteFiltersExpired.forEach(([id]) => {
         delete this.muteFiltersDraftObject[id]
-        this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null })
+        this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
       })
       this.pushSyncConfig()
     },
@@ -189,8 +189,8 @@ const ClutterTab = {
       this.muteFiltersDraftDirty[id] = true
     },
     saveFilter(id) {
-      this.setPreference({
-        path: 'simple.muteFilters.' + id,
+      this.setSimplePrefAndSave({
+        path: 'muteFilters.' + id,
         value: this.muteFiltersDraftObject[id],
       })
       this.pushSyncConfig()

src/components/settings_modal/tabs/composing_tab.js

@@ -120,8 +120,8 @@ const ComposingTab = {
         return useSyncConfigStore().mergedConfig.interfaceLanguage
       },
       set: function (val) {
-        useSyncConfigStore().setPreference({
-          path: 'simple.interfaceLanguage',
+        useSyncConfigStore().setSimplePrefAndSave({
+          path: 'interfaceLanguage',
           value: val,
         })
       },
@@ -172,8 +172,8 @@ const ComposingTab = {
         })
     },
     updateFont(key, value) {
-      useSyncConfigStore().setPreference({
-        path: 'simple.theme3hacks',
+      useSyncConfigStore().setSimplePrefAndSave({
+        path: 'theme3hacks',
         value: {
           ...this.mergedConfig.theme3hacks,
           fonts: {

src/components/settings_modal/tabs/filtering_tab.js

@@ -36,11 +36,11 @@ const FilteringTab = {
         label: this.$t(`user_card.mute_block_${mode}`),
       })),
       muteFiltersDraftObject: cloneDeep(
-        useSyncConfigStore().prefsStorage.simple.muteFilters,
+        this.prefsStorage.simple.muteFilters,
       ),
       muteFiltersDraftDirty: Object.fromEntries(
         Object.entries(
-          useSyncConfigStore().prefsStorage.simple.muteFilters,
+          this.prefsStorage.simple.muteFilters,
         ).map(([k]) => [k, false]),
       ),
       exportedFilter: null,
@@ -112,7 +112,7 @@ const FilteringTab = {
         if (value !== 'ask' && value !== 'forever') {
           realValue = '14d'
         }
-        useSyncConfigStore().setPreference({
+        this.setPreference({
           path: 'simple.onMuteDefaultAction',
           value: realValue,
         })
@@ -132,7 +132,7 @@ const FilteringTab = {
         if (value !== 'ask' && value !== 'forever') {
           realValue = '14d'
         }
-        useSyncConfigStore().setPreference({
+        this.setPreference({
           path: 'simple.onBlockDefaultAction',
           value: realValue,
         })
@@ -151,7 +151,9 @@ const FilteringTab = {
   methods: {
     ...mapActions(useSyncConfigStore, [
       'setPreference',
+      'setPrefAndSave',
       'unsetPreference',
+      'unsetPrefAndSave',
       'pushSyncConfig',
     ]),
     getDatetimeLocal(timestamp) {
@@ -198,8 +200,7 @@ const FilteringTab = {
 
       filter.order = this.muteFilters.length + 2
       this.muteFiltersDraftObject[newId] = filter
-      this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
-      this.pushSyncConfig()
+      this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
     },
     exportFilter(id) {
       this.exportedFilter = { ...this.muteFiltersDraftObject[id] }
@@ -214,13 +215,11 @@ const FilteringTab = {
       const newId = uuidv4()
 
       this.muteFiltersDraftObject[newId] = filter
-      this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
-      this.pushSyncConfig()
+      this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
     },
     deleteFilter(id) {
       delete this.muteFiltersDraftObject[id]
-      this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null })
-      this.pushSyncConfig()
+      this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
     },
     purgeExpiredFilters() {
       this.muteFiltersExpired.forEach(([id]) => {
@@ -249,11 +248,10 @@ const FilteringTab = {
       this.muteFiltersDraftDirty[id] = true
     },
     saveFilter(id) {
-      this.setPreference({
-        path: 'simple.muteFilters.' + id,
+      this.setPrefAndSave({
+        path: 'muteFilters.' + id,
         value: this.muteFiltersDraftObject[id],
       })
-      this.pushSyncConfig()
       this.muteFiltersDraftDirty[id] = false
     },
   },

src/components/settings_modal/tabs/general_tab.js

@@ -41,8 +41,8 @@ const GeneralTab = {
         return useSyncConfigStore().mergedConfig.interfaceLanguage
       },
       set: function (val) {
-        useSyncConfigStore().setPreference({
-          path: 'simple.interfaceLanguage',
+        useSyncConfigStore().setSimplePrefAndSave({
+          path: 'interfaceLanguage',
           value: val,
         })
       },
@@ -69,8 +69,8 @@ const GeneralTab = {
         })
     },
     updateFont(key, value) {
-      useSyncConfigStore().setPreference({
-        path: 'simple.theme3hacks',
+      useSyncConfigStore().setSimplePrefAndSave({
+        path: 'theme3hacks',
         value: {
           ...this.mergedConfig.theme3hacks,
           fonts: {

src/components/settings_modal/tabs/posts_tab.js

@@ -67,8 +67,8 @@ const GeneralTab = {
   },
   methods: {
     updateFont(key, value) {
-      useSyncConfigStore().setPreference({
-        path: 'simple.theme3hacks',
+      useSyncConfigStore().setSimplePrefAndSave({
+        path: 'theme3hacks',
         value: {
           ...this.mergedConfig.theme3hacks,
           fonts: {