Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-24 08:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use Map to track sorted lists in Settings.set()

Browse Source
This commit is contained in:
Julian Lam
2021-01-29 15:00:06 -05:00
parent a5bf9779fd
commit 65de2e76b4
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/meta/settings.js
View File

@@ -44,37 +44,36 @@ Settings.getOne = async function (hash, field) {
Settings.set = async function (hash, values, quiet) { Settings.set = async function (hash, values, quiet) {
quiet = quiet || false; quiet = quiet || false;
const sortedLists = []; const sortedLists = new Map();
for (const key in values) { for (const key in values) {
if (values.hasOwnProperty(key)) { if (values.hasOwnProperty(key)) {
if (Array.isArray(values[key]) && typeof values[key][0] !== 'string') { 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 })); ({ 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.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 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); await db.delete('settings:' + hash + ':sorted-list:' + list + ':' + order);
})); }));
})); }));
const ops = []; const ops = [];
sortedLists.forEach(function (list) { sortedLists.forEach(function (list) {
const arr = values[list]; list.forEach(function (data, key) {
delete values[list]; const order = sortedListKeys.indexOf(key);
ops.push(db.sortedSetAdd('settings:' + hash + ':sorted-list:' + key, order, order));
arr.forEach(function (data, order) { ops.push(db.setObject('settings:' + hash + ':sorted-list:' + key + ':' + order, data));
ops.push(db.sortedSetAdd('settings:' + hash + ':sorted-list:' + list, order, order));
ops.push(db.setObject('settings:' + hash + ':sorted-list:' + list + ':' + order, data));
}); });
}); });
@@ -85,6 +84,9 @@ Settings.set = async function (hash, values, quiet) {
await db.setObject('settings:' + hash, values); await db.setObject('settings:' + hash, values);
} }
// Add back sorted list data
values = { ...values, ...Object.fromEntries(sortedLists) };
cache.del('settings:' + hash); cache.del('settings:' + hash);
plugins.hooks.fire('action:settings.set', { plugins.hooks.fire('action:settings.set', {