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: regression from filter hook change

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-03-13 10:12:30 -05:00
parent e539ff4f95
commit 53f67ff396
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/hooks.js
View File

@@ -1,8 +1,10 @@
'use strict'; 'use strict';
const async = require('async');
const util = require('util'); const util = require('util');
const winston = require('winston'); const winston = require('winston');
const plugins = require('.'); const plugins = require('.');
const utils = require('../utils');
const Hooks = module.exports; const Hooks = module.exports;
@@ -114,22 +116,37 @@ async function fireFilterHook(hook, hookList, params) {
if (!Array.isArray(hookList) || !hookList.length) { if (!Array.isArray(hookList) || !hookList.length) {
return params; return params;
} }
return await async.reduce(hookList, params, (params, hookObj, next) => {
for (const hookObj of hookList) {
if (typeof hookObj.method !== 'function') { if (typeof hookObj.method !== 'function') {
if (global.env === 'development') { if (global.env === 'development') {
winston.warn(`[plugins] Expected method for hook '${hook}' in plugin '${hookObj.id}' not found, skipping.`); winston.warn(`[plugins] Expected method for hook '${hook}' in plugin '${hookObj.id}' not found, skipping.`);
} }
} else { return next(null, params);
let hookFn = hookObj.method;
if (hookFn.constructor && hookFn.constructor.name !== 'AsyncFunction') {
hookFn = util.promisify(hookFn);
}
// eslint-disable-next-line
params = await hookFn(params);
} }
} const returned = hookObj.method(params, next);
return params; if (utils.isPromise(returned)) {
returned.then(
payload => setImmediate(next, null, payload),
err => setImmediate(next, err)
);
}
});
// breaks plugins that use a non-async function ie emoji-one parse.raw
// for (const hookObj of hookList) {
// if (typeof hookObj.method !== 'function') {
// if (global.env === 'development') {
// winston.warn(`[plugins] Expected method for hook '${hook}' in plugin '${hookObj.id}' not found, skipping.`);
// }
// } else {
// let hookFn = hookObj.method;
// if (hookFn.constructor && hookFn.constructor.name !== 'AsyncFunction') {
// hookFn = util.promisify(hookFn);
// }
// // eslint-disable-next-line
// params = await hookFn(params);
// }
// }
// return params;
} }
async function fireActionHook(hook, hookList, params) { async function fireActionHook(hook, hookList, params) {