hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove async.waterfall

Browse Source
isekai-main
Barış Soner Uşaklı 4 years ago
parent 944a798552
commit f35a0f430a
5 changed files with 87 additions and 188 deletions
Show Stats Download Patch File Download Diff File

38
src/upgrades/1.0.0/global_moderators.js
Unescape Escape View File

@ -1,32 +1,22 @@
'use strict'; 'use strict';
const async = require('async');
module.exports = { module.exports = {
name: 'Creating Global moderators group', name: 'Creating Global moderators group',
timestamp: Date.UTC(2016, 0, 23), timestamp: Date.UTC(2016, 0, 23),
method: function (callback) { method: async function () {
const groups = require('../../groups'); const groups = require('../../groups');
async.waterfall([ const exists = await groups.exists('Global Moderators');
function (next) { if (exists) {
groups.exists('Global Moderators', next); return;
}, }
function (exists, next) { await groups.create({
if (exists) { name: 'Global Moderators',
return next(null, null); userTitle: 'Global Moderator',
} description: 'Forum wide moderators',
groups.create({ hidden: 0,
name: 'Global Moderators', private: 1,
userTitle: 'Global Moderator', disableJoinRequests: 1,
description: 'Forum wide moderators', });
hidden: 0, await groups.show('Global Moderators');
private: 1,
disableJoinRequests: 1,
}, next);
},
function (groupData, next) {
groups.show('Global Moderators', next);
},
], callback);
}, },
}; };

9
src/upgrades/1.0.0/theme_to_active_plugins.js
Unescape Escape View File

@ -1,16 +1,13 @@
'use strict'; 'use strict';
const async = require('async');
const db = require('../../database'); const db = require('../../database');
module.exports = { module.exports = {
name: 'Adding theme to active plugins sorted set', name: 'Adding theme to active plugins sorted set',
timestamp: Date.UTC(2015, 11, 23), timestamp: Date.UTC(2015, 11, 23),
method: function (callback) { method: async function () {
async.waterfall([ const themeId = await db.getObjectField('config', 'theme:id');
async.apply(db.getObjectField, 'config', 'theme:id'), await db.sortedSetAdd('plugins:active', 0, themeId);
async.apply(db.sortedSetAdd, 'plugins:active', 0),
], callback);
}, },
}; };

78
src/upgrades/1.1.0/assign_topic_read_privilege.js
Unescape Escape View File

@ -1,71 +1,35 @@
'use strict'; /* eslint-disable no-await-in-loop */
'use strict';
const async = require('async');
const winston = require('winston'); const winston = require('winston');
const db = require('../../database'); const db = require('../../database');
module.exports = { module.exports = {
name: 'Giving topics:read privs to any group that was previously allowed to Find & Access Category', name: 'Giving topics:read privs to any group/user that was previously allowed to Find & Access Category',
timestamp: Date.UTC(2016, 4, 28), timestamp: Date.UTC(2016, 4, 28),
method: function (callback) { method: async function () {
const groupsAPI = require('../../groups'); const groupsAPI = require('../../groups');
const privilegesAPI = require('../../privileges'); const privilegesAPI = require('../../privileges');
db.getSortedSetRange('categories:cid', 0, -1, (err, cids) => { const cids = await db.getSortedSetRange('categories:cid', 0, -1);
if (err) { for (const cid of cids) {
return callback(err); const { groups, users } = await privilegesAPI.categories.list(cid);
}
async.eachSeries(cids, (cid, next) => {
privilegesAPI.categories.list(cid, (err, data) => {
if (err) {
return next(err);
}
const { groups } = data;
const { users } = data;
async.waterfall([
function (next) {
async.eachSeries(groups, (group, next) => {
if (group.privileges['groups:read']) {
return groupsAPI.join(`cid:${cid}:privileges:groups:topics:read`, group.name, (err) => {
if (!err) {
winston.verbose(`cid:${cid}:privileges:groups:topics:read granted to gid: ${group.name}`);
}
return next(err); for (const group of groups) {
}); if (group.privileges['groups:read']) {
} await groupsAPI.join(`cid:${cid}:privileges:groups:topics:read`, group.name);
winston.verbose(`cid:${cid}:privileges:groups:topics:read granted to gid: ${group.name}`);
next(null); }
}, next); }
},
function (next) {
async.eachSeries(users, (user, next) => {
if (user.privileges.read) {
return groupsAPI.join(`cid:${cid}:privileges:topics:read`, user.uid, (err) => {
if (!err) {
winston.verbose(`cid:${cid}:privileges:topics:read granted to uid: ${user.uid}`);
}
return next(err);
});
}
next(null);
}, next);
},
], (err) => {
if (!err) {
winston.verbose(`-- cid ${cid} upgraded`);
}
next(err); for (const user of users) {
}); if (user.privileges.read) {
}); await groupsAPI.join(`cid:${cid}:privileges:topics:read`, user.uid);
}, callback); winston.verbose(`cid:${cid}:privileges:topics:read granted to uid: ${user.uid}`);
}); }
}
winston.verbose(`-- cid ${cid} upgraded`);
}
}, },
}; };

119
src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
Unescape Escape View File

@ -1,101 +1,56 @@
'use strict'; 'use strict';
const async = require('async');
const winston = require('winston'); const winston = require('winston');
const db = require('../../database'); const db = require('../../database');
module.exports = { module.exports = {
name: 'Dismiss flags from deleted topics', name: 'Dismiss flags from deleted topics',
timestamp: Date.UTC(2016, 3, 29), timestamp: Date.UTC(2016, 3, 29),
method: function (callback) { method: async function () {
const posts = require('../../posts'); const posts = require('../../posts');
const topics = require('../../topics'); const topics = require('../../topics');
let pids; const pids = await db.getSortedSetRange('posts:flagged', 0, -1);
let tids; const postData = await posts.getPostsFields(pids, ['tid']);
const tids = postData.map(t => t.tid);
const topicData = await topics.getTopicsFields(tids, ['deleted']);
const toDismiss = topicData.map((t, idx) => (parseInt(t.deleted, 10) === 1 ? pids[idx] : null)).filter(Boolean);
async.waterfall([ winston.verbose(`[2016/04/29] ${toDismiss.length} dismissable flags found`);
async.apply(db.getSortedSetRange, 'posts:flagged', 0, -1), await Promise.all(toDismiss.map(dismissFlag));
function (_pids, next) {
pids = _pids;
posts.getPostsFields(pids, ['tid'], next);
},
function (_tids, next) {
tids = _tids.map(a => a.tid);
topics.getTopicsFields(tids, ['deleted'], next);
},
function (state, next) {
const toDismiss = state.map((a, idx) => (parseInt(a.deleted, 10) === 1 ? pids[idx] : null)).filter(Boolean);
winston.verbose(`[2016/04/29] ${toDismiss.length} dismissable flags found`);
async.each(toDismiss, dismissFlag, next);
},
], callback);
}, },
}; };
// copied from core since this function was removed // copied from core since this function was removed
// https://github.com/NodeBB/NodeBB/blob/v1.x.x/src/posts/flags.js // https://github.com/NodeBB/NodeBB/blob/v1.x.x/src/posts/flags.js
function dismissFlag(pid, callback) { async function dismissFlag(pid) {
async.waterfall([ const postData = await db.getObjectFields(`post:${pid}`, ['pid', 'uid', 'flags']);
function (next) { if (!postData.pid) {
db.getObjectFields(`post:${pid}`, ['pid', 'uid', 'flags'], next); return;
}, }
function (postData, next) { if (parseInt(postData.uid, 10) && parseInt(postData.flags, 10) > 0) {
if (!postData.pid) { await Promise.all([
return callback(); db.sortedSetIncrBy('users:flags', -postData.flags, postData.uid),
} db.incrObjectFieldBy(`user:${postData.uid}`, 'flags', -postData.flags),
async.parallel([ ]);
function (next) { }
if (parseInt(postData.uid, 10)) { const uids = await db.getSortedSetRange(`pid:${pid}:flag:uids`, 0, -1);
if (parseInt(postData.flags, 10) > 0) { const nids = uids.map(uid => `post_flag:${pid}:uid:${uid}`);
async.parallel([
async.apply(db.sortedSetIncrBy, 'users:flags', -postData.flags, postData.uid), await Promise.all([
async.apply(db.incrObjectFieldBy, `user:${postData.uid}`, 'flags', -postData.flags), db.deleteAll(nids.map(nid => `notifications:${nid}`)),
], next); db.sortedSetRemove('notifications', nids),
} else { db.delete(`pid:${pid}:flag:uids`),
next(); db.sortedSetsRemove([
} 'posts:flagged',
} else { 'posts:flags:count',
next(); `uid:${postData.uid}:flag:pids`,
} ], pid),
}, db.deleteObjectField(`post:${pid}`, 'flags'),
function (next) { db.delete(`pid:${pid}:flag:uid:reason`),
db.sortedSetsRemove([ db.deleteObjectFields(`post:${pid}`, ['flag:state', 'flag:assignee', 'flag:notes', 'flag:history']),
'posts:flagged', ]);
'posts:flags:count',
`uid:${postData.uid}:flag:pids`, await db.sortedSetsRemoveRangeByScore(['users:flags'], '-inf', 0);
], pid, next);
},
function (next) {
async.series([
function (next) {
db.getSortedSetRange(`pid:${pid}:flag:uids`, 0, -1, (err, uids) => {
if (err) {
return next(err);
}
async.each(uids, (uid, next) => {
const nid = `post_flag:${pid}:uid:${uid}`;
async.parallel([
async.apply(db.delete, `notifications:${nid}`),
async.apply(db.sortedSetRemove, 'notifications', `post_flag:${pid}:uid:${uid}`),
], next);
}, next);
});
},
async.apply(db.delete, `pid:${pid}:flag:uids`),
], next);
},
async.apply(db.deleteObjectField, `post:${pid}`, 'flags'),
async.apply(db.delete, `pid:${pid}:flag:uid:reason`),
async.apply(db.deleteObjectFields, `post:${pid}`, ['flag:state', 'flag:assignee', 'flag:notes', 'flag:history']),
], next);
},
function (results, next) {
db.sortedSetsRemoveRangeByScore(['users:flags'], '-inf', 0, next);
},
], callback);
} }

31
src/upgrades/1.10.0/search_privileges.js
Unescape Escape View File

@ -1,30 +1,23 @@
'use strict'; 'use strict';
const async = require('async');
module.exports = { module.exports = {
name: 'Give global search privileges', name: 'Give global search privileges',
timestamp: Date.UTC(2018, 4, 28), timestamp: Date.UTC(2018, 4, 28),
method: function (callback) { method: async function () {
const meta = require('../../meta'); const meta = require('../../meta');
const privileges = require('../../privileges'); const privileges = require('../../privileges');
const allowGuestSearching = parseInt(meta.config.allowGuestSearching, 10) === 1; const allowGuestSearching = parseInt(meta.config.allowGuestSearching, 10) === 1;
const allowGuestUserSearching = parseInt(meta.config.allowGuestUserSearching, 10) === 1; const allowGuestUserSearching = parseInt(meta.config.allowGuestUserSearching, 10) === 1;
async.waterfall([
function (next) { await privileges.global.give(['groups:search:content', 'groups:search:users', 'groups:search:tags'], 'registered-users');
privileges.global.give(['groups:search:content', 'groups:search:users', 'groups:search:tags'], 'registered-users', next); const guestPrivs = [];
}, if (allowGuestSearching) {
function (next) { guestPrivs.push('groups:search:content');
const guestPrivs = []; }
if (allowGuestSearching) { if (allowGuestUserSearching) {
guestPrivs.push('groups:search:content'); guestPrivs.push('groups:search:users');
} }
if (allowGuestUserSearching) { guestPrivs.push('groups:search:tags');
guestPrivs.push('groups:search:users'); await privileges.global.give(guestPrivs, 'guests');
}
guestPrivs.push('groups:search:tags');
privileges.global.give(guestPrivs, 'guests', next);
},
], callback);
}, },
}; };

Write Preview
Loading…
Cancel
Save