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

feat: async refactor

Browse Source
v1.18.x
Baris Usakli 6 years ago
parent 47e30a67be
commit 3a9d83a44b
5 changed files with 209 additions and 292 deletions
Show Stats Download Patch File Download Diff File

74
src/controllers/composer.js
Unescape Escape View File

@ -1,31 +1,27 @@
'use strict'; 'use strict';
var async = require('async'); const nconf = require('nconf');
var nconf = require('nconf');
var user = require('../user'); const user = require('../user');
var plugins = require('../plugins'); const plugins = require('../plugins');
var topics = require('../topics'); const topics = require('../topics');
var posts = require('../posts'); const posts = require('../posts');
var helpers = require('./helpers'); const helpers = require('./helpers');
exports.get = function (req, res, callback) { exports.get = async function (req, res, callback) {
res.locals.metaTags = { res.locals.metaTags = {
...res.locals.metaTags, ...res.locals.metaTags,
name: 'robots', name: 'robots',
content: 'noindex', content: 'noindex',
}; };
async.waterfall([ const data = await plugins.fireHook('filter:composer.build', {
function (next) {
plugins.fireHook('filter:composer.build', {
req: req, req: req,
res: res, res: res,
next: callback, next: callback,
templateData: {}, templateData: {},
}, next); });
},
function (data) {
if (data.templateData.disabled) { if (data.templateData.disabled) {
res.render('', { res.render('', {
title: '[[modules:composer.compose]]', title: '[[modules:composer.compose]]',
@ -34,13 +30,11 @@ exports.get = function (req, res, callback) {
data.templateData.title = '[[modules:composer.compose]]'; data.templateData.title = '[[modules:composer.compose]]';
res.render('compose', data.templateData); res.render('compose', data.templateData);
} }
},
], callback);
}; };
exports.post = function (req, res) { exports.post = async function (req, res) {
var body = req.body; const body = req.body;
var data = { const data = {
uid: req.uid, uid: req.uid,
req: req, req: req,
timestamp: Date.now(), timestamp: Date.now(),
@ -52,49 +46,37 @@ exports.post = function (req, res) {
if (!data.content) { if (!data.content) {
return helpers.noScriptErrors(req, res, '[[error:invalid-data]]', 400); return helpers.noScriptErrors(req, res, '[[error:invalid-data]]', 400);
} }
async function queueOrPost(postFn, data) {
async.waterfall([ const shouldQueue = await posts.shouldQueue(req.uid, data);
function (next) {
function queueOrPost(postFn, data, next) {
async.waterfall([
function (next) {
posts.shouldQueue(req.uid, data, next);
},
function (shouldQueue, next) {
if (shouldQueue) { if (shouldQueue) {
delete data.req; delete data.req;
posts.addToQueue(data, next); return await posts.addToQueue(data);
} else {
postFn(data, next);
} }
}, return await postFn(data);
], next);
} }
try {
let result;
if (body.tid) { if (body.tid) {
data.tid = body.tid; data.tid = body.tid;
queueOrPost(topics.reply, data, next); result = await queueOrPost(topics.reply, data);
} else if (body.cid) { } else if (body.cid) {
data.cid = body.cid; data.cid = body.cid;
data.title = body.title; data.title = body.title;
data.tags = []; data.tags = [];
data.thumb = ''; data.thumb = '';
queueOrPost(topics.post, data, next); result = await queueOrPost(topics.post, data);
} else { } else {
next(new Error('[[error:invalid-data]]')); throw new Error('[[error:invalid-data]]');
} }
},
function (result, next) {
if (result.queued) { if (result.queued) {
return res.redirect((nconf.get('relative_path') || '/')); return res.redirect((nconf.get('relative_path') || '/'));
} }
var uid = result.uid ? result.uid : result.topicData.uid; const uid = result.uid ? result.uid : result.topicData.uid;
user.updateOnlineUsers(uid); user.updateOnlineUsers(uid);
next(null, result.pid ? '/post/' + result.pid : '/topic/' + result.topicData.slug); const path = result.pid ? '/post/' + result.pid : '/topic/' + result.topicData.slug;
},
], function (err, path) {
if (err) {
return helpers.noScriptErrors(req, res, err.message, 400);
}
res.redirect(nconf.get('relative_path') + path); res.redirect(nconf.get('relative_path') + path);
}); } catch (err) {
helpers.noScriptErrors(req, res, err.message, 400);
}
}; };

44
src/controllers/home.js
Unescape Escape View File

@ -1,56 +1,44 @@
'use strict'; 'use strict';
var async = require('async'); const url = require('url');
var url = require('url');
var plugins = require('../plugins'); const plugins = require('../plugins');
var meta = require('../meta'); const meta = require('../meta');
var user = require('../user'); const user = require('../user');
function adminHomePageRoute() { function adminHomePageRoute() {
return (meta.config.homePageRoute || meta.config.homePageCustom || '').replace(/^\/+/, '') || 'categories'; return (meta.config.homePageRoute || meta.config.homePageCustom || '').replace(/^\/+/, '') || 'categories';
} }
function getUserHomeRoute(uid, callback) { async function getUserHomeRoute(uid) {
async.waterfall([ const settings = await user.getSettings(uid);
function (next) { let route = adminHomePageRoute();
user.getSettings(uid, next);
},
function (settings, next) {
var route = adminHomePageRoute();
if (settings.homePageRoute !== 'undefined' && settings.homePageRoute !== 'none') { if (settings.homePageRoute !== 'undefined' && settings.homePageRoute !== 'none') {
route = (settings.homePageRoute || route).replace(/^\/+/, ''); route = (settings.homePageRoute || route).replace(/^\/+/, '');
} }
next(null, route); return route;
},
], callback);
} }
function rewrite(req, res, next) { async function rewrite(req, res, next) {
if (req.path !== '/' && req.path !== '/api/' && req.path !== '/api') { if (req.path !== '/' && req.path !== '/api/' && req.path !== '/api') {
return next(); return next();
} }
let route = adminHomePageRoute();
async.waterfall([
function (next) {
if (meta.config.allowUserHomePage) { if (meta.config.allowUserHomePage) {
getUserHomeRoute(req.uid, next); route = await getUserHomeRoute(req.uid, next);
} else {
next(null, adminHomePageRoute());
} }
},
function (route, next) { let parsedUrl;
var parsedUrl;
try { try {
parsedUrl = url.parse(route, true); parsedUrl = url.parse(route, true);
} catch (err) { } catch (err) {
return next(err); return next(err);
} }
var pathname = parsedUrl.pathname; const pathname = parsedUrl.pathname;
var hook = 'action:homepage.get:' + pathname; const hook = 'action:homepage.get:' + pathname;
if (!plugins.hasListeners(hook)) { if (!plugins.hasListeners(hook)) {
req.url = req.path + (!req.path.endsWith('/') ? '/' : '') + pathname; req.url = req.path + (!req.path.endsWith('/') ? '/' : '') + pathname;
} else { } else {
@ -59,8 +47,6 @@ function rewrite(req, res, next) {
req.query = Object.assign(parsedUrl.query, req.query); req.query = Object.assign(parsedUrl.query, req.query);
next(); next();
},
], next);
} }
exports.rewrite = rewrite; exports.rewrite = rewrite;

28
src/controllers/popular.js
Unescape Escape View File

@ -1,36 +1,30 @@
'use strict'; 'use strict';
var async = require('async'); const nconf = require('nconf');
var nconf = require('nconf'); const validator = require('validator');
var validator = require('validator');
var helpers = require('./helpers'); const helpers = require('./helpers');
var recentController = require('./recent'); const recentController = require('./recent');
var popularController = module.exports; const popularController = module.exports;
popularController.get = function (req, res, next) { popularController.get = async function (req, res, next) {
async.waterfall([ const data = await recentController.getData(req, 'popular', 'posts');
function (next) {
recentController.getData(req, 'popular', 'posts', next);
},
function (data, next) {
if (!data) { if (!data) {
return next(); return next();
} }
var term = helpers.terms[req.query.term] || 'alltime'; const term = helpers.terms[req.query.term] || 'alltime';
if (req.originalUrl.startsWith(nconf.get('relative_path') + '/api/popular') || req.originalUrl.startsWith(nconf.get('relative_path') + '/popular')) { if (req.originalUrl.startsWith(nconf.get('relative_path') + '/api/popular') || req.originalUrl.startsWith(nconf.get('relative_path') + '/popular')) {
data.title = '[[pages:popular-' + term + ']]'; data.title = '[[pages:popular-' + term + ']]';
var breadcrumbs = [{ text: '[[global:header.popular]]' }]; const breadcrumbs = [{ text: '[[global:header.popular]]' }];
data.breadcrumbs = helpers.buildBreadcrumbs(breadcrumbs); data.breadcrumbs = helpers.buildBreadcrumbs(breadcrumbs);
} }
var feedQs = data.rssFeedUrl.split('?')[1];
const feedQs = data.rssFeedUrl.split('?')[1];
data.rssFeedUrl = nconf.get('relative_path') + '/popular/' + (validator.escape(String(req.query.term)) || 'alltime') + '.rss'; data.rssFeedUrl = nconf.get('relative_path') + '/popular/' + (validator.escape(String(req.query.term)) || 'alltime') + '.rss';
if (req.loggedIn) { if (req.loggedIn) {
data.rssFeedUrl += '?' + feedQs; data.rssFeedUrl += '?' + feedQs;
} }
res.render('popular', data); res.render('popular', data);
},
], next);
}; };

116
src/controllers/recent.js
Unescape Escape View File

@ -1,80 +1,53 @@
'use strict'; 'use strict';
var async = require('async'); const nconf = require('nconf');
var nconf = require('nconf');
const user = require('../user');
var user = require('../user'); const categories = require('../categories');
var categories = require('../categories'); const topics = require('../topics');
var topics = require('../topics'); const meta = require('../meta');
var meta = require('../meta'); const helpers = require('./helpers');
var helpers = require('./helpers'); const pagination = require('../pagination');
var pagination = require('../pagination'); const privileges = require('../privileges');
var privileges = require('../privileges');
const recentController = module.exports;
var recentController = module.exports;
recentController.get = async function (req, res, next) {
recentController.get = function (req, res, next) { const data = await recentController.getData(req, 'recent', 'recent');
async.waterfall([
function (next) {
recentController.getData(req, 'recent', 'recent', next);
},
function (data, next) {
if (!data) { if (!data) {
return next(); return next();
} }
res.render('recent', data); res.render('recent', data);
},
], next);
}; };
recentController.getData = function (req, url, sort, callback) { recentController.getData = async function (req, url, sort) {
var page = parseInt(req.query.page, 10) || 1; const page = parseInt(req.query.page, 10) || 1;
var stop = 0; let term = helpers.terms[req.query.term];
var term = helpers.terms[req.query.term]; const cid = req.query.cid;
var settings; const filter = req.query.filter || '';
var cid = req.query.cid;
var filter = req.query.filter || '';
var categoryData;
var rssToken;
var canPost;
if (!helpers.validFilters[filter] || (!term && req.query.term)) { if (!helpers.validFilters[filter] || (!term && req.query.term)) {
return callback(null, null); return null;
} }
term = term || 'alltime'; term = term || 'alltime';
async.waterfall([
function (next) {
async.parallel({
settings: function (next) {
user.getSettings(req.uid, next);
},
categories: function (next) {
const states = [categories.watchStates.watching, categories.watchStates.notwatching]; const states = [categories.watchStates.watching, categories.watchStates.notwatching];
if (filter === 'watched') { if (filter === 'watched') {
states.push(categories.watchStates.ignoring); states.push(categories.watchStates.ignoring);
} }
helpers.getCategoriesByStates(req.uid, cid, states, next);
}, const [settings, categoryData, rssToken, canPost] = await Promise.all([
rssToken: function (next) { user.getSettings(req.uid),
user.auth.getFeedToken(req.uid, next); helpers.getCategoriesByStates(req.uid, cid, states),
}, user.auth.getFeedToken(req.uid),
canPost: function (next) { canPostTopic(req.uid),
canPostTopic(req.uid, next); ]);
},
}, next); const start = Math.max(0, (page - 1) * settings.topicsPerPage);
}, const stop = start + settings.topicsPerPage - 1;
function (results, next) {
rssToken = results.rssToken; const data = await topics.getSortedTopics({
settings = results.settings;
categoryData = results.categories;
canPost = results.canPost;
var start = Math.max(0, (page - 1) * settings.topicsPerPage);
stop = start + settings.topicsPerPage - 1;
topics.getSortedTopics({
cids: cid, cids: cid,
uid: req.uid, uid: req.uid,
start: start, start: start,
@ -83,9 +56,8 @@ recentController.getData = function (req, url, sort, callback) {
term: term, term: term,
sort: sort, sort: sort,
query: req.query, query: req.query,
}, next); });
},
function (data, next) {
data.canPost = canPost; data.canPost = canPost;
data.categories = categoryData.categories; data.categories = categoryData.categories;
data.allCategoriesUrl = url + helpers.buildQueryString('', filter, ''); data.allCategoriesUrl = url + helpers.buildQueryString('', filter, '');
@ -111,21 +83,11 @@ recentController.getData = function (req, url, sort, callback) {
data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[' + url + ':title]]' }]); data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[' + url + ':title]]' }]);
} }
next(null, data); return data;
},
], callback);
}; };
function canPostTopic(uid, callback) { async function canPostTopic(uid) {
async.waterfall([ let cids = await categories.getAllCidsFromSet('categories:cid');
function (next) { cids = await privileges.categories.filterCids('topics:create', cids, uid);
categories.getAllCidsFromSet('categories:cid', next); return cids.length > 0;
},
function (cids, next) {
privileges.categories.filterCids('topics:create', cids, uid, next);
},
function (cids, next) {
next(null, cids.length > 0);
},
], callback);
} }

25
src/controllers/top.js
Unescape Escape View File

@ -1,35 +1,28 @@
'use strict'; 'use strict';
var async = require('async'); const nconf = require('nconf');
var nconf = require('nconf'); const validator = require('validator');
var validator = require('validator');
var helpers = require('./helpers'); const helpers = require('./helpers');
var recentController = require('./recent'); const recentController = require('./recent');
var topController = module.exports; const topController = module.exports;
topController.get = function (req, res, next) { topController.get = async function (req, res, next) {
async.waterfall([ const data = await recentController.getData(req, 'top', 'votes');
function (next) {
recentController.getData(req, 'top', 'votes', next);
},
function (data, next) {
if (!data) { if (!data) {
return next(); return next();
} }
var term = helpers.terms[req.query.term] || 'alltime'; const term = helpers.terms[req.query.term] || 'alltime';
if (req.originalUrl.startsWith(nconf.get('relative_path') + '/api/top') || req.originalUrl.startsWith(nconf.get('relative_path') + '/top')) { if (req.originalUrl.startsWith(nconf.get('relative_path') + '/api/top') || req.originalUrl.startsWith(nconf.get('relative_path') + '/top')) {
data.title = '[[pages:top-' + term + ']]'; data.title = '[[pages:top-' + term + ']]';
} }
var feedQs = data.rssFeedUrl.split('?')[1]; const feedQs = data.rssFeedUrl.split('?')[1];
data.rssFeedUrl = nconf.get('relative_path') + '/top/' + (validator.escape(String(req.query.term)) || 'alltime') + '.rss'; data.rssFeedUrl = nconf.get('relative_path') + '/top/' + (validator.escape(String(req.query.term)) || 'alltime') + '.rss';
if (req.loggedIn) { if (req.loggedIn) {
data.rssFeedUrl += '?' + feedQs; data.rssFeedUrl += '?' + feedQs;
} }
res.render('top', data); res.render('top', data);
},
], next);
}; };

Write Preview
Loading…
Cancel
Save