From dddbe98fca1d46ec56335ce084deb48849f37154 Mon Sep 17 00:00:00 2001
From: siiky <github-siiky@net-c.cat>
Date: Tue, 3 Jun 2025 12:20:21 +0100
Subject: [PATCH] refactor: use a single DB task to load the latest settings

---
 packages/server/lib/new-settings-loader.js | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/server/lib/new-settings-loader.js b/packages/server/lib/new-settings-loader.js
index 84919715..a83ff7db 100644
--- a/packages/server/lib/new-settings-loader.js
+++ b/packages/server/lib/new-settings-loader.js
@@ -168,16 +168,19 @@ function migrationSaveConfig(config) {
   })
 }
 
-function loadLatest(schemaVersion) {
-  return Promise.all([
-    loadLatestConfigOrNoneReturningVersion(schemaVersion),
-    loadAccounts(schemaVersion),
-  ]).then(([configObj, accounts]) => ({
-    config: configObj.config,
-    accounts,
-    version: configObj.version,
-  }))
-}
+const loadLatest = schemaVersion =>
+  db
+    .task(t =>
+      t.batch([
+        loadLatestConfigOrNoneReturningVersion(t, schemaVersion),
+        _loadAccounts(t, schemaVersion),
+      ]),
+    )
+    .then(([configObj, accounts]) => ({
+      config: configObj.config,
+      accounts,
+      version: configObj.version,
+    }))
 
 function loadLatestConfig() {
   const sql = `SELECT data
@@ -196,7 +199,7 @@ function loadLatestConfig() {
     })
 }
 
-function loadLatestConfigOrNoneReturningVersion(schemaVersion) {
+function loadLatestConfigOrNoneReturningVersion(db, schemaVersion) {
   const sql = `SELECT data, id
     FROM user_config
     WHERE type = 'config'