fix import

src/components/settings_modal/settings_modal.js

@@ -143,49 +143,52 @@ const SettingsModal = {
         })
       }
     },
-    onImport(data) {
+    onImport(input) {
-      if (data) {
+      if (!input) return
-        Object.entries(data).forEach(([path, value]) => {
+      const { _pleroma_settings_version, ...data } = input
-          if (LOCAL_ONLY_KEYS.has(path)) {
+
-            useLocalConfigStore().set({ path, value })
+      Object.entries(data).forEach(([path, value]) => {
+        const definition = ROOT_CONFIG_DEFINITIONS[path]
+
+        const finalValue = validateSetting({
+          path,
+          value,
+          definition,
+          throwError: false,
+          defaultState: ROOT_CONFIG,
+        })
+
+        if (finalValue === undefined) return
+
+        if (LOCAL_ONLY_KEYS.has(path)) {
+          useLocalConfigStore().set({ path, value: finalValue })
+        } else {
+          if (path.startsWith('muteFilters')) {
+            Object.keys(
+              useMergedConfigStore().mergedConfig.muteFilters,
+            ).forEach((key) => {
+              useSyncConfigStore().unsetPreference({
+                path: `simple.${path}.${key}`,
+              })
+            })
+
+            Object.entries(value).forEach(([key, filter]) => {
+              useSyncConfigStore().setPreference({
+                path: `simple.${path}.${key}`,
+                value: filter,
+              })
+            })
           } else {
-            if (path.startsWith('muteFilters')) {
+            if (finalValue !== undefined) {
-              Object.keys(
+              useSyncConfigStore().setPreference({
-                useMergedConfigStore().mergedConfig.muteFilters,
-              ).forEach((key) => {
-                useSyncConfigStore().unsetPreference({
-                  path: `simple.${path}.${key}`,
-                })
-              })
-
-              Object.entries(value).forEach(([key, filter]) => {
-                useSyncConfigStore().setPreference({
-                  path: `simple.${path}.${key}`,
-                  value: filter,
-                })
-              })
-            } else {
-              const definition = ROOT_CONFIG_DEFINITIONS[path]
-
-              const finalValue = validateSetting({
                 path: `simple.${path}`,
-                value,
+                value: finalValue,
-                definition,
-                throwError: false,
-                defaultState: ROOT_CONFIG,
               })
-
-              if (finalValue !== undefined) {
-                useSyncConfigStore().setPreference({
-                  path: `simple.${path}`,
-                  value,
-                })
-              }
             }
           }
-        })
+        }
-        useSyncConfigStore().pushSyncConfig()
+      })
-      }
+      useSyncConfigStore().pushSyncConfig()
     },
     restore() {
       this.dataImporter.importData()

src/modules/default_config_state.js

@@ -738,7 +738,7 @@ export const validateSetting = ({
 }) => {
   if (value === undefined) return // only null is allowed as missing value
   if (get(defaultState, path) === undefined) {
-    const string = `Unknown instance option ${path}, value: ${value}`
+    const string = `Unknown option ${path}, value: ${value}`
 
     if (throwError) {
       throw new Error(string)