refactor: async/await controllers
Barış Soner Uşaklı
6 years ago
parent
a121098513
commit
2c4f04462f
@ -1,113 +1,91 @@
|
|||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var async = require('async');
|
const nconf = require('nconf');
|
||||||
var nconf = require('nconf');
|
const querystring = require('querystring');
|
||||||
var querystring = require('querystring');
|
|
||||||
|
|
||||||
var meta = require('../meta');
|
const meta = require('../meta');
|
||||||
var pagination = require('../pagination');
|
const pagination = require('../pagination');
|
||||||
var user = require('../user');
|
const user = require('../user');
|
||||||
var categories = require('../categories');
|
const categories = require('../categories');
|
||||||
var topics = require('../topics');
|
const topics = require('../topics');
|
||||||
var plugins = require('../plugins');
|
const plugins = require('../plugins');
|
||||||
var helpers = require('./helpers');
|
const helpers = require('./helpers');
|
||||||
|
|
||||||
var unreadController = module.exports;
|
const unreadController = module.exports;
|
||||||
|
|
||||||
unreadController.get = function (req, res, next) {
|
unreadController.get = async function (req, res, next) {
|
||||||
var page = parseInt(req.query.page, 10) || 1;
|
const cid = req.query.cid;
|
||||||
var results;
|
const filter = req.query.filter || '';
|
||||||
var cid = req.query.cid;
|
|
||||||
var filter = req.query.filter || '';
|
|
||||||
var settings;
|
|
||||||
|
|
||||||
async.waterfall([
|
const filterData = await plugins.fireHook('filter:unread.getValidFilters', { filters: { ...helpers.validFilters } });
|
||||||
function (next) {
|
if (!filterData.filters[filter]) {
|
||||||
plugins.fireHook('filter:unread.getValidFilters', { filters: { ...helpers.validFilters } }, next);
|
return next();
|
||||||
},
|
}
|
||||||
function (data, _next) {
|
const [watchedCategories, userSettings] = await Promise.all([
|
||||||
if (!data.filters[filter]) {
|
getWatchedCategories(req.uid, cid, filter),
|
||||||
return next();
|
user.getSettings(req.uid),
|
||||||
}
|
]);
|
||||||
|
|
||||||
async.parallel({
|
const page = parseInt(req.query.page, 10) || 1;
|
||||||
watchedCategories: function (next) {
|
const start = Math.max(0, (page - 1) * userSettings.topicsPerPage);
|
||||||
if (plugins.hasListeners('filter:unread.categories')) {
|
const stop = start + userSettings.topicsPerPage - 1;
|
||||||
plugins.fireHook('filter:unread.categories', { uid: req.uid, cid: cid }, next);
|
const cutoff = req.session.unreadCutoff ? req.session.unreadCutoff : topics.unreadCutoff();
|
||||||
} else {
|
const data = await topics.getUnreadTopics({
|
||||||
const states = [categories.watchStates.watching];
|
cid: cid,
|
||||||
if (filter === 'watched') {
|
uid: req.uid,
|
||||||
states.push(categories.watchStates.notwatching, categories.watchStates.ignoring);
|
start: start,
|
||||||
}
|
stop: stop,
|
||||||
helpers.getCategoriesByStates(req.uid, cid, states, next);
|
filter: filter,
|
||||||
}
|
cutoff: cutoff,
|
||||||
},
|
});
|
||||||
settings: function (next) {
|
|
||||||
user.getSettings(req.uid, next);
|
|
||||||
},
|
|
||||||
}, _next);
|
|
||||||
},
|
|
||||||
function (_results, next) {
|
|
||||||
results = _results;
|
|
||||||
settings = results.settings;
|
|
||||||
var start = Math.max(0, (page - 1) * settings.topicsPerPage);
|
|
||||||
var stop = start + settings.topicsPerPage - 1;
|
|
||||||
var cutoff = req.session.unreadCutoff ? req.session.unreadCutoff : topics.unreadCutoff();
|
|
||||||
topics.getUnreadTopics({
|
|
||||||
cid: cid,
|
|
||||||
uid: req.uid,
|
|
||||||
start: start,
|
|
||||||
stop: stop,
|
|
||||||
filter: filter,
|
|
||||||
cutoff: cutoff,
|
|
||||||
}, next);
|
|
||||||
},
|
|
||||||
function (data) {
|
|
||||||
data.title = meta.config.homePageTitle || '[[pages:home]]';
|
|
||||||
data.pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage));
|
|
||||||
data.pagination = pagination.create(page, data.pageCount, req.query);
|
|
||||||
|
|
||||||
if (settings.usePagination && (page < 1 || page > data.pageCount)) {
|
data.title = meta.config.homePageTitle || '[[pages:home]]';
|
||||||
req.query.page = Math.max(1, Math.min(data.pageCount, page));
|
data.pageCount = Math.max(1, Math.ceil(data.topicCount / userSettings.topicsPerPage));
|
||||||
return helpers.redirect(res, '/unread?' + querystring.stringify(req.query));
|
data.pagination = pagination.create(page, data.pageCount, req.query);
|
||||||
}
|
|
||||||
|
|
||||||
data.categories = results.watchedCategories.categories;
|
if (userSettings.usePagination && (page < 1 || page > data.pageCount)) {
|
||||||
data.allCategoriesUrl = 'unread' + helpers.buildQueryString('', filter, '');
|
req.query.page = Math.max(1, Math.min(data.pageCount, page));
|
||||||
data.selectedCategory = results.watchedCategories.selectedCategory;
|
return helpers.redirect(res, '/unread?' + querystring.stringify(req.query));
|
||||||
data.selectedCids = results.watchedCategories.selectedCids;
|
}
|
||||||
if (req.originalUrl.startsWith(nconf.get('relative_path') + '/api/unread') || req.originalUrl.startsWith(nconf.get('relative_path') + '/unread')) {
|
|
||||||
data.title = '[[pages:unread]]';
|
|
||||||
data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[unread:title]]' }]);
|
|
||||||
}
|
|
||||||
|
|
||||||
data.filters = helpers.buildFilters('unread', filter, req.query);
|
data.categories = watchedCategories.categories;
|
||||||
|
data.allCategoriesUrl = 'unread' + helpers.buildQueryString('', filter, '');
|
||||||
|
data.selectedCategory = watchedCategories.selectedCategory;
|
||||||
|
data.selectedCids = watchedCategories.selectedCids;
|
||||||
|
if (req.originalUrl.startsWith(nconf.get('relative_path') + '/api/unread') || req.originalUrl.startsWith(nconf.get('relative_path') + '/unread')) {
|
||||||
|
data.title = '[[pages:unread]]';
|
||||||
|
data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[unread:title]]' }]);
|
||||||
|
}
|
||||||
|
|
||||||
data.selectedFilter = data.filters.find(function (filter) {
|
data.filters = helpers.buildFilters('unread', filter, req.query);
|
||||||
return filter && filter.selected;
|
|
||||||
});
|
|
||||||
|
|
||||||
res.render('unread', data);
|
data.selectedFilter = data.filters.find(filter => filter && filter.selected);
|
||||||
},
|
|
||||||
], next);
|
res.render('unread', data);
|
||||||
};
|
};
|
||||||
|
|
||||||
unreadController.unreadTotal = function (req, res, next) {
|
async function getWatchedCategories(uid, cid, filter) {
|
||||||
var filter = req.query.filter || '';
|
if (plugins.hasListeners('filter:unread.categories')) {
|
||||||
|
return await plugins.fireHook('filter:unread.categories', { uid: uid, cid: cid });
|
||||||
|
}
|
||||||
|
const states = [categories.watchStates.watching];
|
||||||
|
if (filter === 'watched') {
|
||||||
|
states.push(categories.watchStates.notwatching, categories.watchStates.ignoring);
|
||||||
|
}
|
||||||
|
return await helpers.getCategoriesByStates(uid, cid, states);
|
||||||
|
}
|
||||||
|
|
||||||
async.waterfall([
|
unreadController.unreadTotal = async function (req, res, next) {
|
||||||
function (next) {
|
const filter = req.query.filter || '';
|
||||||
plugins.fireHook('filter:unread.getValidFilters', { filters: { ...helpers.validFilters } }, next);
|
try {
|
||||||
},
|
const data = await plugins.fireHook('filter:unread.getValidFilters', { filters: { ...helpers.validFilters } });
|
||||||
function (data, _next) {
|
if (!data.filters[filter]) {
|
||||||
if (!data.filters[filter]) {
|
return next();
|
||||||
return next();
|
}
|
||||||
}
|
const unreadCount = await topics.getTotalUnread(req.uid, filter);
|
||||||
topics.getTotalUnread(req.uid, filter, _next);
|
res.json(unreadCount);
|
||||||
},
|
} catch (err) {
|
||||||
function (data) {
|
next(err);
|
||||||
res.json(data);
|
}
|
||||||
},
|
|
||||||
], next);
|
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue