From e274adf47dc1475b3f94da5814ee784435ec7862 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 6 Jul 2024 01:55:53 +0200
Subject: [PATCH] Fix setting restore from file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously restoring from file would also restore the old version value
breaking upload of the new settings to the server.

Additionallly it didn’t even attempt to sync settings after restore and
was insufferably slow due to individually updating every single setting
with a dispatch. Instead only update changed settings like on server
syncs which usually speeds the process up considerably.

Fixes: https://akkoma.dev/AkkomaGang/akkoma-fe/issues/405
---
 src/modules/config.js | 44 +++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/modules/config.js b/src/modules/config.js
index 038bb24e..c3363a5e 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -22,7 +22,7 @@ export const multiChoiceProperties = [
 
 export const defaultState = {
   profile: 'default',
-  profileVersion: 0,
+  profileVersion: 0, // internal fe copy of server-side version
   expertLevel: 0, // used to track which settings to show and hide
   colors: {},
   theme: undefined,
@@ -127,6 +127,21 @@ export const instanceDefaultProperties = Object.entries(defaultState)
   .filter(([key, value]) => value === undefined)
   .map(([key, value]) => key)
 
+function updateLocalSettings(store, settingEntries, version = null) {
+  if (version == null)
+    version = store.state.profileVersion
+
+  settingEntries.forEach(([name, value]) => {
+    if (store.state[name] !== value) {
+      store.dispatch('setOption', { name, value })
+    }
+  })
+
+  // Set this at the end to override any potentially stored profileVersion
+  store.commit('setOption', { name: 'profileVersion', value: version })
+}
+
+
 const config = {
   state: { ...defaultState },
   getters: {
@@ -198,19 +213,17 @@ const config = {
         store.dispatch('listSettingsProfiles')
       })
     },
-    loadSettings ({ dispatch }, data) {
+    loadSettings (store, data) {
       const knownKeys = new Set(Object.keys(defaultState))
-      const presentKeys = new Set(Object.keys(data))
-      const intersection = new Set()
-      for (let elem of presentKeys) {
-        if (knownKeys.has(elem)) {
-          intersection.add(elem)
-        }
-      }
 
-      intersection.forEach(
-        name => dispatch('setOption', { name, value: data[name] })
-      )
+      // Limit to supported properties
+      const newSettingEntries =
+         Object.entries(data)
+        .filter(([key, value]) => knownKeys.has(key))
+
+      // disregard stored profileVersion; sync afterwards increases previous version
+      updateLocalSettings(store, newSettingEntries, null)
+      store.dispatch('syncSettings')
     },
     setHighlight ({ commit, dispatch }, { user, color, type }) {
       commit('setHighlight', { user, color, type })
@@ -244,12 +257,7 @@ const config = {
         .then(({ settings, version }) => {
           console.log('found settings version', version)
           if (forceUpdate || (version > store.state.profileVersion)) {
-            store.commit('setOption', { name: 'profileVersion', value: version })
-            Object.entries(settings).forEach(([name, value]) => {
-              if (store.state[name] !== value) {
-                store.dispatch('setOption', { name, value })
-              }
-            })
+            updateLocalSettings(store, Object.entries(settings), version)
           } else {
             console.log('settings are up to date')
           }
-- 
2.43.0