Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 17:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: full settings hash not passed through to action:settings.set

Browse Source 
The sorted lists were being filtered out
This commit is contained in:
Julian Lam
2021-01-29 15:18:57 -05:00
parent eb96046e97
commit 473d5f4aba
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/meta/settings.js
View File

@@ -44,15 +44,16 @@ 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 sortedListData = {};
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); sortedListData[key] = values[key];
delete values[key];
} }
} }
} }
const sortedLists = Object.keys(sortedListData);
({ 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 }));
@@ -62,16 +63,14 @@ Settings.set = async function (hash, values, quiet) {
await Promise.all(sortedLists.map(async function (list) { await Promise.all(sortedLists.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(sortedListData[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]; const arr = sortedListData[list];
delete values[list];
arr.forEach(function (data, order) { arr.forEach(function (data, order) {
ops.push(db.sortedSetAdd('settings:' + hash + ':sorted-list:' + list, order, order)); ops.push(db.sortedSetAdd('settings:' + hash + ':sorted-list:' + list, order, order));
ops.push(db.setObject('settings:' + hash + ':sorted-list:' + list + ':' + order, data)); ops.push(db.setObject('settings:' + hash + ':sorted-list:' + list + ':' + order, data));
@@ -89,7 +88,7 @@ Settings.set = async function (hash, values, quiet) {
plugins.hooks.fire('action:settings.set', { plugins.hooks.fire('action:settings.set', {
plugin: hash, plugin: hash,
settings: values, settings: { ...values, ...sortedListData }, // Add back sorted list data to values hash
}); });
pubsub.publish('action:settings.set.' + hash, values); pubsub.publish('action:settings.set.' + hash, values);