From 65de2e76b400d922a1000889f97b1b3c3fce0f98 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 29 Jan 2021 15:00:06 -0500
Subject: [PATCH] refactor: use Map to track sorted lists in Settings.set()

---
 src/meta/settings.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/meta/settings.js b/src/meta/settings.js
index 5a290411da..06dc384239 100644
--- a/src/meta/settings.js
+++ b/src/meta/settings.js
@@ -44,37 +44,36 @@ Settings.getOne = async function (hash, field) {
 Settings.set = async function (hash, values, quiet) {
 	quiet = quiet || false;
 
-	const sortedLists = [];
-
+	const sortedLists = new Map();
 	for (const key in values) {
 		if (values.hasOwnProperty(key)) {
 			if (Array.isArray(values[key]) && typeof values[key][0] !== 'string') {
-				sortedLists.push(key);
+				sortedLists.set(key, values[key]);
+				delete values[key];	// don't save in primary settings hash
 			}
 		}
 	}
+	const sortedListKeys = Array.from(sortedLists.keys());
 
 	({ plugin: hash, settings: values, quiet } = await plugins.hooks.fire('filter:settings.set', { plugin: hash, settings: values, quiet }));
 
-	if (sortedLists.length) {
+	if (sortedLists.size) {
 		await db.delete('settings:' + hash + ':sorted-lists');
-		await db.setAdd('settings:' + hash + ':sorted-lists', sortedLists);
+		await db.setAdd('settings:' + hash + ':sorted-lists', sortedListKeys);
 
-		await Promise.all(sortedLists.map(async function (list) {
+		await Promise.all(sortedListKeys.map(async function (list) {
 			await db.delete('settings:' + hash + ':sorted-list:' + list);
-			await Promise.all(values[list].map(async function (data, order) {
+			await Promise.all(sortedLists.get(list).map(async function (data, order) {
 				await db.delete('settings:' + hash + ':sorted-list:' + list + ':' + order);
 			}));
 		}));
 
 		const ops = [];
 		sortedLists.forEach(function (list) {
-			const arr = values[list];
-			delete values[list];
-
-			arr.forEach(function (data, order) {
-				ops.push(db.sortedSetAdd('settings:' + hash + ':sorted-list:' + list, order, order));
-				ops.push(db.setObject('settings:' + hash + ':sorted-list:' + list + ':' + order, data));
+			list.forEach(function (data, key) {
+				const order = sortedListKeys.indexOf(key);
+				ops.push(db.sortedSetAdd('settings:' + hash + ':sorted-list:' + key, order, order));
+				ops.push(db.setObject('settings:' + hash + ':sorted-list:' + key + ':' + order, data));
 			});
 		});
 
@@ -85,6 +84,9 @@ Settings.set = async function (hash, values, quiet) {
 		await db.setObject('settings:' + hash, values);
 	}
 
+	// Add back sorted list data
+	values = { ...values, ...Object.fromEntries(sortedLists) };
+
 	cache.del('settings:' + hash);
 
 	plugins.hooks.fire('action:settings.set', {