mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-05-07 02:16:29 +02:00
Bootstrap5 (#10894)
* chore: up deps * chore: up composer * fix(deps): bump 2factor to v7 * chore: up harmony * chore: up harmony * fix: missing await * feat: allow middlewares to pass in template values via res.locals * feat: buildAccountData middleware automatically added ot all account routes * fix: properly allow values in res.locals.templateValues to be added to the template data * refactor: user/blocks * refactor(accounts): categories and consent * feat: automatically 404 if exposeUid or exposeGroupName come up empty * refactor: remove calls to getUserDataByUserSlug for most account routes, since it is populated via middleware now * fix: allow exposeUid and exposeGroupName to work with slugs with mixed capitalization * fix: move reputation removal check to accountHelpers method * test: skip i18n tests if ref branch when present is not develop * fix(deps): bump theme versions * fix(deps): bump ntfy and 2factor * chore: up harmony * fix: add missing return * fix: #11191, only focus on search input on md environments and up * feat: allow file uploads on mobile chat closes https://github.com/NodeBB/NodeBB/issues/11217 * chore: up themes * chore: add lang string * fix(deps): bump ntfy to 1.0.15 * refactor: use new if/each syntax * chore: up composer * fix: regression from user helper refactor * chore: up harmony * chore: up composer * chore: up harmony * chore: up harmony * chore: up harmony * chore: fix composer version * feat: add increment helper * chore: up harmony * fix: #11228 no timestamps in future ⌛ * chore: up harmony * check config.theme as well fire action:posts.loaded after processing dom * chore: up harmony * chore: up harmony * chore: up harmony * chore: up themes * chore: up harmony * remove extra class * refactor: move these to core from harmony * chore: up widgets * chore: up widgets * height auto * fix: closes #11238 * dont focus inputs, annoying on mobile * fix: dont focus twice, only focus on chat input on desktop dont wrap widget footer in row * chore: up harmony * chore: up harmony * update chat window * chore: up themes * fix cache buster for skins * chat fixes * chore: up harmony * chore: up composer * refactor: change hook logs to debug * fix: scroll to post right after adding to dom * fix: hash scrolling and highlighting correct post * test: re-enable read API schema tests * fix: add back schema changes for179faa2270andc3920ccb10* fix: schema changes from488f0978a4* fix: schema changes forf4cf482a87* fix: schema update forbe6bbabd0e* fix: schema changes for69c96078ea* fix: schema changes ford1364c3130* fix: schema changes for84ff1152f7* fix: schema changes forb860c2605c* fix: schema changes for23cb67a112* fix: schema changes forb916e42f40* fix: schema change fora9bbb586fc* fix: schema changes for4b738c8cd3* fix: schema changes for58b5781cea* fix: schema changes for794bf01b21* fix: schema changes for80ea12c1c1,e368feef51, and52ead114be* fix: composer-default object in config? * fix: schema changes for9acdc6808cand0930934200* fix: schema changes forc0a52924f1* fix: schema change foraba420a3f3, move loggedInUser to optional props * fix: schema changes for8c67031609* fix: schema changes for27e53b42f3* fix: schema changes for2835966518* fix: breaking test for email confirmation API call * fix: schema changes for refactored search page * fix: schema changes for user object * fix: schema changes for9f531f957e* fix: schema changes forc4042c70deand23175110a2* fix: schema changes for9b3616b103* fix: schema changes for5afd5de07d* fix: schema change for1d7baf1217* fix: schema changes for57bfb37c55andbe6bbabd0e* fix: schema changes for6e86b4afa2and3efad2e13band68f66223e7* fix: allowing optional qs prop in pagination keys (not sure why this didn't break before) * fix: re-login on email change * fix: schema changes forc926358d73* fix: schema changes for388a8270c9* fix: schema change for2658bcc821* fix: no need to call account middlewares for chats routes * fix: schema changes for71743affc3* fix: final schema changes * test: support for anyOf and oneOf * fix: check thumb * dont scroll to top on back press * remove group log * fix: add top margin to merged and deleted alerts * chore: up widgets * fix: improve fix-lists mixin * chore: up harmony/composer * feat: allow hiding quicksearch results during search * dont record searches made by composer * chore: up 54 * chore: up spam be gone * feat: add prev/next page and page count into mobile paginator * chore: up harmony * chore: up harmony * use old style for IS * fix: hide entire toolbar row if no posts or not singlePost * fix: updated messaging for post-queue template, #11206 * fix: btn-sm on post queue back button * fix: bump harmony, closes #11206 * fix: remove unused alert module import * fix: bump harmony * fix: bump harmony * chore: up harmony * refactor: IS scrolltop * fix: update users:search-user-for-chat source string * feat: support for mark-read toggle on chats dropdown and recent chats list * feat: api v3 calls to mark chat read/unread * feat: send event:chats.mark socket event on mark read or unread * refactor: allow frontend to mark chats as unread, use new API v3 routes instead of socket calls, better frontend event handling * docs: openapi schema updates for chat marking * fix: allow unread state toggling in chats dropdown too * fix: issue where repeated openings of the chats dropdown would continually add events for mark-read/unread * fix: debug log * refactor: move userSearch filter to a module * feat(routes): allow remounting /categories (#11230) * feat: send flags count to frontend on flags list page * refactor: filter form client-side js to extract out some logic * fix: applyFilters to not take any arguments, update selectedCids in updateButton instead of onHidden * fix: use userFilter module for assignee, reporterId, targetUid * fix(openapi): schema changes for updated flags page * fix: dont allow adding duplicates to userFilter * use same var * remove log * fix: closes #11282 * feat: lang key for x-topics * chore: up harmony * chore: up emoji * chore: up harmony * fix: update userFilter to allow new option `selectedBlock` * fix: wrong block name passed to userFilter * fix: https://github.com/NodeBB/NodeBB/issues/11283 * fix: chats, allow multiple dropdowns like in harmony * chore: up harmony * refactor: flag note adding/editing, closes #11285 * fix: remove old prepareEdit logic * chore: add caveat about hacky code block in userFilter module * fix: placeholders for userFilter module * refactor: navigator so it works with multiple thumbs/navigators * chore: up harmony * fix: closes #11287, destroy quick reply autocomplete on navigation * fix: filter disabled categories on user categories page count * chore: up harmony * docs: update openapi spec to include info about passing in timestamps for topic creation, removing timestamp as valid request param for topic replying * fix: send back null values on ACP search dashboard for startDate and endDate if not expicitly passed in, fix tests * fix: tweak table order in ACP dash searches * fix: only invoke navigator click drag on left mouse button * feat: add back unread indicator to navigator * clear bookmark on mark unread * fix: navigator crash on ajaxify * better thumb top calculation * fix: reset user bookmark when topic is marked unread * Revert "fix: reset user bookmark when topic is marked unread" This reverts commit9bcd85c2c6. * fix: update unread indicator on scroll, add unread count * chore: bump harmony * fix: crash on navigator unread update when backing out of a topic * fix: closes #11183 * fix: update topics:recent zset when rescheduling a topic * fix: dupe quote button, increase delay, hide immediately on empty selection * fix: navigator not showing up on first load * refactor: remove glance assorted fixes to navigator dont reduce remaning count if user scrolls down and up quickly only call topic.navigatorCallback when index changes * more sanity checks for bookmark dont allow setting bookmark higher than topic postcount * closes #11218, 🚋 * Revert "fix: update topics:recent zset when rescheduling a topic" This reverts commit737973cca9. * fix: #11306, show proper error if queued post doesn't exist was showing no-privileges if someone else accepted the post * https://github.com/NodeBB/NodeBB/issues/11307 dont use li * chore: up harmony * chore: bump version string * fix: copy paste fail * feat: closes #7382, tag filtering add client side support for filtering by tags on /category, /recent and /unread * chore: up harmony * chore: up harmony * Revert "fix: add back req.query fallback for backwards compatibility" [breaking] This reverts commitcf6cc2c454. This commit is no longer required as passing in a CSRF token via query parameter is no longer supported as of NodeBB v3.x This is a breaking change. * fix: pass csrf token in form data, re: NodeBB/NodeBB#11309 * chore: up deps * fix: tests, use x-csrf-token query param removed * test: fix csrf_token * lint: remove unused * feat: add itemprop="image" to avatar helper * fix: get chat upload button in chat modal * breaking: remove deprecated socket.io methods * test: update messaging tests to not use sockets * fix: parent post links * fix: prevent post tooltip if mouse leaves before data/tpl is loaded * chore: up harmony * chore: up harmony * chore: up harmony * chore: up harmony * fix: nested replies indices * fix(deps): bump 2factor * feat: add loggedIn user to all api routes * chore: up themes * refactor: audit admin v3 write api routes as per #11321 * refactor: audit category v3 write api routes as per #11321 [breaking] docs: fix open api spec for #11321 * refactor: audit chat v3 write api routes as per #11321 * refactor: audit files v3 write api routes as per #11321 * refactor: audit flags v3 write api routes as per #11321 * refactor: audit posts v3 write api routes as per #11321 * refactor: audit topics v3 write api routes as per #11321 * refactor: audit users v3 write api routes as per #11321 * fix: lang string * remove min height * fix: empty topic/labels taking up space * fix: tag filtering when changing filter to watched topics or changing popular time limit to month * chore: up harmony * fix: closes #11354, show no post error if queued post already accepted/rejected * test: #11354 * test: #11354 * fix(deps): bump 2factor * fix: #11357 clear cache on thumb remove * fix: thumb remove on windows, closes #11357 * test: openapi for thumbs * test: fix openapi --------- Co-authored-by: Julian Lam <julian@nodebb.org> Co-authored-by: Opliko <opliko.reg@protonmail.com>
This commit is contained in:
Barış Soner Uşaklı
committed by
GitHub
GitHub
parent
1e7f32b1c4
commit
7ba70d1561
@@ -1,16 +1,12 @@
|
||||
'use strict';
|
||||
|
||||
const winston = require('winston');
|
||||
const jsesc = require('jsesc');
|
||||
|
||||
const nconf = require('nconf');
|
||||
const semver = require('semver');
|
||||
|
||||
const user = require('../user');
|
||||
const meta = require('../meta');
|
||||
const plugins = require('../plugins');
|
||||
const privileges = require('../privileges');
|
||||
const utils = require('../utils');
|
||||
const versions = require('../admin/versions');
|
||||
const helpers = require('./helpers');
|
||||
|
||||
const controllers = {
|
||||
@@ -30,90 +26,6 @@ middleware.buildHeader = helpers.try(async (req, res, next) => {
|
||||
next();
|
||||
});
|
||||
|
||||
middleware.renderHeader = async (req, res, data) => {
|
||||
const custom_header = {
|
||||
plugins: [],
|
||||
authentication: [],
|
||||
};
|
||||
res.locals.config = res.locals.config || {};
|
||||
|
||||
const results = await utils.promiseParallel({
|
||||
userData: user.getUserFields(req.uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed']),
|
||||
scripts: getAdminScripts(),
|
||||
custom_header: plugins.hooks.fire('filter:admin.header.build', custom_header),
|
||||
configs: meta.configs.list(),
|
||||
latestVersion: getLatestVersion(),
|
||||
privileges: privileges.admin.get(req.uid),
|
||||
tags: meta.tags.parse(req, {}, [], []),
|
||||
});
|
||||
|
||||
const { userData } = results;
|
||||
userData.uid = req.uid;
|
||||
userData['email:confirmed'] = userData['email:confirmed'] === 1;
|
||||
userData.privileges = results.privileges;
|
||||
|
||||
let acpPath = req.path.slice(1).split('/');
|
||||
acpPath.forEach((path, i) => {
|
||||
acpPath[i] = path.charAt(0).toUpperCase() + path.slice(1);
|
||||
});
|
||||
acpPath = acpPath.join(' > ');
|
||||
|
||||
const version = nconf.get('version');
|
||||
|
||||
res.locals.config.userLang = res.locals.config.acpLang || res.locals.config.userLang;
|
||||
let templateValues = {
|
||||
config: res.locals.config,
|
||||
configJSON: jsesc(JSON.stringify(res.locals.config), { isScriptContext: true }),
|
||||
relative_path: res.locals.config.relative_path,
|
||||
adminConfigJSON: encodeURIComponent(JSON.stringify(results.configs)),
|
||||
metaTags: results.tags.meta,
|
||||
linkTags: results.tags.link,
|
||||
user: userData,
|
||||
userJSON: jsesc(JSON.stringify(userData), { isScriptContext: true }),
|
||||
plugins: results.custom_header.plugins,
|
||||
authentication: results.custom_header.authentication,
|
||||
scripts: results.scripts,
|
||||
'cache-buster': meta.config['cache-buster'] || '',
|
||||
env: !!process.env.NODE_ENV,
|
||||
title: `${acpPath || 'Dashboard'} | NodeBB Admin Control Panel`,
|
||||
bodyClass: data.bodyClass,
|
||||
version: version,
|
||||
latestVersion: results.latestVersion,
|
||||
upgradeAvailable: results.latestVersion && semver.gt(results.latestVersion, version),
|
||||
showManageMenu: results.privileges.superadmin || ['categories', 'privileges', 'users', 'admins-mods', 'groups', 'tags', 'settings'].some(priv => results.privileges[`admin:${priv}`]),
|
||||
};
|
||||
|
||||
templateValues.template = { name: res.locals.template };
|
||||
templateValues.template[res.locals.template] = true;
|
||||
({ templateData: templateValues } = await plugins.hooks.fire('filter:middleware.renderAdminHeader', {
|
||||
req,
|
||||
res,
|
||||
templateData: templateValues,
|
||||
data,
|
||||
}));
|
||||
|
||||
return await req.app.renderAsync('admin/header', templateValues);
|
||||
};
|
||||
|
||||
async function getAdminScripts() {
|
||||
const scripts = await plugins.hooks.fire('filter:admin.scripts.get', []);
|
||||
return scripts.map(script => ({ src: script }));
|
||||
}
|
||||
|
||||
async function getLatestVersion() {
|
||||
try {
|
||||
const result = await versions.getLatestVersion();
|
||||
return result;
|
||||
} catch (err) {
|
||||
winston.error(`[acp] Failed to fetch latest version${err.stack}`);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
middleware.renderFooter = async function (req, res, data) {
|
||||
return await req.app.renderAsync('admin/footer', data);
|
||||
};
|
||||
|
||||
middleware.checkPrivileges = helpers.try(async (req, res, next) => {
|
||||
// Kick out guests, obviously
|
||||
if (req.uid <= 0) {
|
||||
@@ -169,7 +81,7 @@ middleware.checkPrivileges = helpers.try(async (req, res, next) => {
|
||||
}
|
||||
|
||||
if (res.locals.isAPI) {
|
||||
res.status(401).json({});
|
||||
controllers.helpers.formatApiResponse(401, res);
|
||||
} else {
|
||||
res.redirect(`${nconf.get('relative_path')}/login?local=1`);
|
||||
}
|
||||
|
||||
@@ -11,8 +11,6 @@ const {
|
||||
return req.headers['x-csrf-token'];
|
||||
} else if (req.body.csrf_token) {
|
||||
return req.body.csrf_token;
|
||||
} else if (req.query) {
|
||||
return req.query._csrf;
|
||||
}
|
||||
},
|
||||
size: 64,
|
||||
|
||||
@@ -1,33 +1,17 @@
|
||||
'use strict';
|
||||
|
||||
const nconf = require('nconf');
|
||||
const jsesc = require('jsesc');
|
||||
const _ = require('lodash');
|
||||
const validator = require('validator');
|
||||
const util = require('util');
|
||||
|
||||
const user = require('../user');
|
||||
const topics = require('../topics');
|
||||
const messaging = require('../messaging');
|
||||
const flags = require('../flags');
|
||||
const meta = require('../meta');
|
||||
const plugins = require('../plugins');
|
||||
const navigation = require('../navigation');
|
||||
const translator = require('../translator');
|
||||
const privileges = require('../privileges');
|
||||
const languages = require('../languages');
|
||||
const utils = require('../utils');
|
||||
const helpers = require('./helpers');
|
||||
|
||||
const controllers = {
|
||||
api: require('../controllers/api'),
|
||||
helpers: require('../controllers/helpers'),
|
||||
};
|
||||
|
||||
const middleware = module.exports;
|
||||
|
||||
const relative_path = nconf.get('relative_path');
|
||||
|
||||
middleware.buildHeader = helpers.try(async (req, res, next) => {
|
||||
res.locals.renderHeader = true;
|
||||
res.locals.isAPI = false;
|
||||
@@ -53,213 +37,3 @@ middleware.buildHeader = helpers.try(async (req, res, next) => {
|
||||
});
|
||||
|
||||
middleware.buildHeaderAsync = util.promisify(middleware.buildHeader);
|
||||
|
||||
middleware.renderHeader = async function renderHeader(req, res, data) {
|
||||
const registrationType = meta.config.registrationType || 'normal';
|
||||
res.locals.config = res.locals.config || {};
|
||||
const templateValues = {
|
||||
title: meta.config.title || '',
|
||||
'title:url': meta.config['title:url'] || '',
|
||||
description: meta.config.description || '',
|
||||
'cache-buster': meta.config['cache-buster'] || '',
|
||||
'brand:logo': meta.config['brand:logo'] || '',
|
||||
'brand:logo:url': meta.config['brand:logo:url'] || '',
|
||||
'brand:logo:alt': meta.config['brand:logo:alt'] || '',
|
||||
'brand:logo:display': meta.config['brand:logo'] ? '' : 'hide',
|
||||
allowRegistration: registrationType === 'normal',
|
||||
searchEnabled: plugins.hooks.hasListeners('filter:search.query'),
|
||||
postQueueEnabled: !!meta.config.postQueue,
|
||||
config: res.locals.config,
|
||||
relative_path,
|
||||
bodyClass: data.bodyClass,
|
||||
};
|
||||
|
||||
templateValues.configJSON = jsesc(JSON.stringify(res.locals.config), { isScriptContext: true });
|
||||
|
||||
const results = await utils.promiseParallel({
|
||||
isAdmin: user.isAdministrator(req.uid),
|
||||
isGlobalMod: user.isGlobalModerator(req.uid),
|
||||
isModerator: user.isModeratorOfAnyCategory(req.uid),
|
||||
privileges: privileges.global.get(req.uid),
|
||||
user: user.getUserData(req.uid),
|
||||
isEmailConfirmSent: req.uid <= 0 ? false : await user.email.isValidationPending(req.uid),
|
||||
languageDirection: translator.translate('[[language:dir]]', res.locals.config.userLang),
|
||||
timeagoCode: languages.userTimeagoCode(res.locals.config.userLang),
|
||||
browserTitle: translator.translate(controllers.helpers.buildTitle(translator.unescape(data.title))),
|
||||
navigation: navigation.get(req.uid),
|
||||
});
|
||||
|
||||
const unreadData = {
|
||||
'': {},
|
||||
new: {},
|
||||
watched: {},
|
||||
unreplied: {},
|
||||
};
|
||||
|
||||
results.user.unreadData = unreadData;
|
||||
results.user.isAdmin = results.isAdmin;
|
||||
results.user.isGlobalMod = results.isGlobalMod;
|
||||
results.user.isMod = !!results.isModerator;
|
||||
results.user.privileges = results.privileges;
|
||||
results.user.timeagoCode = results.timeagoCode;
|
||||
results.user[results.user.status] = true;
|
||||
|
||||
results.user.email = String(results.user.email);
|
||||
results.user['email:confirmed'] = results.user['email:confirmed'] === 1;
|
||||
results.user.isEmailConfirmSent = !!results.isEmailConfirmSent;
|
||||
|
||||
templateValues.bootswatchSkin = (parseInt(meta.config.disableCustomUserSkins, 10) !== 1 ? res.locals.config.bootswatchSkin : '') || meta.config.bootswatchSkin || '';
|
||||
templateValues.browserTitle = results.browserTitle;
|
||||
({
|
||||
navigation: templateValues.navigation,
|
||||
unreadCount: templateValues.unreadCount,
|
||||
} = await appendUnreadCounts({
|
||||
uid: req.uid,
|
||||
query: req.query,
|
||||
navigation: results.navigation,
|
||||
unreadData,
|
||||
}));
|
||||
templateValues.isAdmin = results.user.isAdmin;
|
||||
templateValues.isGlobalMod = results.user.isGlobalMod;
|
||||
templateValues.showModMenu = results.user.isAdmin || results.user.isGlobalMod || results.user.isMod;
|
||||
templateValues.canChat = results.privileges.chat && meta.config.disableChat !== 1;
|
||||
templateValues.user = results.user;
|
||||
templateValues.userJSON = jsesc(JSON.stringify(results.user), { isScriptContext: true });
|
||||
templateValues.useCustomCSS = meta.config.useCustomCSS && meta.config.customCSS;
|
||||
templateValues.customCSS = templateValues.useCustomCSS ? (meta.config.renderedCustomCSS || '') : '';
|
||||
templateValues.useCustomHTML = meta.config.useCustomHTML;
|
||||
templateValues.customHTML = templateValues.useCustomHTML ? meta.config.customHTML : '';
|
||||
templateValues.maintenanceHeader = meta.config.maintenanceMode && !results.isAdmin;
|
||||
templateValues.defaultLang = meta.config.defaultLang || 'en-GB';
|
||||
templateValues.userLang = res.locals.config.userLang;
|
||||
templateValues.languageDirection = results.languageDirection;
|
||||
if (req.query.noScriptMessage) {
|
||||
templateValues.noScriptMessage = validator.escape(String(req.query.noScriptMessage));
|
||||
}
|
||||
|
||||
templateValues.template = { name: res.locals.template };
|
||||
templateValues.template[res.locals.template] = true;
|
||||
|
||||
if (data.hasOwnProperty('_header')) {
|
||||
templateValues.metaTags = data._header.tags.meta;
|
||||
templateValues.linkTags = data._header.tags.link;
|
||||
}
|
||||
|
||||
if (req.route && req.route.path === '/') {
|
||||
modifyTitle(templateValues);
|
||||
}
|
||||
|
||||
const hookReturn = await plugins.hooks.fire('filter:middleware.renderHeader', {
|
||||
req: req,
|
||||
res: res,
|
||||
templateValues: templateValues,
|
||||
data: data,
|
||||
});
|
||||
|
||||
return await req.app.renderAsync('header', hookReturn.templateValues);
|
||||
};
|
||||
|
||||
async function appendUnreadCounts({ uid, navigation, unreadData, query }) {
|
||||
const originalRoutes = navigation.map(nav => nav.originalRoute);
|
||||
const calls = {
|
||||
unreadData: topics.getUnreadData({ uid: uid, query: query }),
|
||||
unreadChatCount: messaging.getUnreadCount(uid),
|
||||
unreadNotificationCount: user.notifications.getUnreadCount(uid),
|
||||
unreadFlagCount: (async function () {
|
||||
if (originalRoutes.includes('/flags') && await user.isPrivileged(uid)) {
|
||||
return flags.getCount({
|
||||
uid,
|
||||
query,
|
||||
filters: {
|
||||
quick: 'unresolved',
|
||||
cid: (await user.isAdminOrGlobalMod(uid)) ? [] : (await user.getModeratedCids(uid)),
|
||||
},
|
||||
});
|
||||
}
|
||||
return 0;
|
||||
}()),
|
||||
};
|
||||
const results = await utils.promiseParallel(calls);
|
||||
|
||||
const unreadCounts = results.unreadData.counts;
|
||||
const unreadCount = {
|
||||
topic: unreadCounts[''] || 0,
|
||||
newTopic: unreadCounts.new || 0,
|
||||
watchedTopic: unreadCounts.watched || 0,
|
||||
unrepliedTopic: unreadCounts.unreplied || 0,
|
||||
mobileUnread: 0,
|
||||
unreadUrl: '/unread',
|
||||
chat: results.unreadChatCount || 0,
|
||||
notification: results.unreadNotificationCount || 0,
|
||||
flags: results.unreadFlagCount || 0,
|
||||
};
|
||||
|
||||
Object.keys(unreadCount).forEach((key) => {
|
||||
if (unreadCount[key] > 99) {
|
||||
unreadCount[key] = '99+';
|
||||
}
|
||||
});
|
||||
|
||||
const { tidsByFilter } = results.unreadData;
|
||||
navigation = navigation.map((item) => {
|
||||
function modifyNavItem(item, route, filter, content) {
|
||||
if (item && item.originalRoute === route) {
|
||||
unreadData[filter] = _.zipObject(tidsByFilter[filter], tidsByFilter[filter].map(() => true));
|
||||
item.content = content;
|
||||
unreadCount.mobileUnread = content;
|
||||
unreadCount.unreadUrl = route;
|
||||
if (unreadCounts[filter] > 0) {
|
||||
item.iconClass += ' unread-count';
|
||||
}
|
||||
}
|
||||
}
|
||||
modifyNavItem(item, '/unread', '', unreadCount.topic);
|
||||
modifyNavItem(item, '/unread?filter=new', 'new', unreadCount.newTopic);
|
||||
modifyNavItem(item, '/unread?filter=watched', 'watched', unreadCount.watchedTopic);
|
||||
modifyNavItem(item, '/unread?filter=unreplied', 'unreplied', unreadCount.unrepliedTopic);
|
||||
|
||||
['flags'].forEach((prop) => {
|
||||
if (item && item.originalRoute === `/${prop}` && unreadCount[prop] > 0) {
|
||||
item.iconClass += ' unread-count';
|
||||
item.content = unreadCount.flags;
|
||||
}
|
||||
});
|
||||
|
||||
return item;
|
||||
});
|
||||
|
||||
return { navigation, unreadCount };
|
||||
}
|
||||
|
||||
middleware.renderFooter = async function renderFooter(req, res, templateValues) {
|
||||
const data = await plugins.hooks.fire('filter:middleware.renderFooter', {
|
||||
req: req,
|
||||
res: res,
|
||||
templateValues: templateValues,
|
||||
});
|
||||
|
||||
const scripts = await plugins.hooks.fire('filter:scripts.get', []);
|
||||
|
||||
data.templateValues.scripts = scripts.map(script => ({ src: script }));
|
||||
|
||||
data.templateValues.useCustomJS = meta.config.useCustomJS;
|
||||
data.templateValues.customJS = data.templateValues.useCustomJS ? meta.config.customJS : '';
|
||||
data.templateValues.isSpider = req.uid === -1;
|
||||
|
||||
return await req.app.renderAsync('footer', data.templateValues);
|
||||
};
|
||||
|
||||
function modifyTitle(obj) {
|
||||
const title = controllers.helpers.buildTitle(meta.config.homePageTitle || '[[pages:home]]');
|
||||
obj.browserTitle = title;
|
||||
|
||||
if (obj.metaTags) {
|
||||
obj.metaTags.forEach((tag, i) => {
|
||||
if (tag.property === 'og:title') {
|
||||
obj.metaTags[i].content = title;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return title;
|
||||
}
|
||||
|
||||
@@ -42,6 +42,10 @@ helpers.buildBodyClass = function (req, res, templateData = {}) {
|
||||
parts[index] = index ? `${parts[0]}-${p}` : `page-${p || 'home'}`;
|
||||
});
|
||||
|
||||
if (templateData.template) {
|
||||
parts.push(`template-${templateData.template.name.split('/').join('-')}`);
|
||||
}
|
||||
|
||||
if (templateData.template && templateData.template.topic) {
|
||||
parts.push(`page-topic-category-${templateData.category.cid}`);
|
||||
parts.push(`page-topic-category-${slugify(templateData.category.name)}`);
|
||||
|
||||
@@ -24,6 +24,7 @@ const controllers = {
|
||||
|
||||
const delayCache = cacheCreate({
|
||||
ttl: 1000 * 60,
|
||||
max: 200,
|
||||
});
|
||||
|
||||
const middleware = module.exports;
|
||||
@@ -150,7 +151,13 @@ async function expose(exposedField, method, field, req, res, next) {
|
||||
if (!req.params.hasOwnProperty(field)) {
|
||||
return next();
|
||||
}
|
||||
res.locals[exposedField] = await method(req.params[field]);
|
||||
const value = await method(String(req.params[field]).toLowerCase());
|
||||
if (!value) {
|
||||
next('route');
|
||||
return;
|
||||
}
|
||||
|
||||
res.locals[exposedField] = value;
|
||||
next();
|
||||
}
|
||||
|
||||
@@ -209,9 +216,9 @@ middleware.buildSkinAsset = helpers.try(async (req, res, next) => {
|
||||
}
|
||||
|
||||
await plugins.prepareForBuild(['client side styles']);
|
||||
const css = await meta.css.buildBundle(target[0], true);
|
||||
const [ltr, rtl] = await meta.css.buildBundle(target[0], true);
|
||||
require('../meta/minifier').killAll();
|
||||
res.status(200).type('text/css').send(css);
|
||||
res.status(200).type('text/css').send(req.originalUrl.includes('-rtl') ? rtl : ltr);
|
||||
});
|
||||
|
||||
middleware.addUploadHeaders = function addUploadHeaders(req, res, next) {
|
||||
|
||||
@@ -1,15 +1,28 @@
|
||||
'use strict';
|
||||
|
||||
const _ = require('lodash');
|
||||
const nconf = require('nconf');
|
||||
const validator = require('validator');
|
||||
const jsesc = require('jsesc');
|
||||
const winston = require('winston');
|
||||
const semver = require('semver');
|
||||
|
||||
|
||||
const plugins = require('../plugins');
|
||||
const meta = require('../meta');
|
||||
const db = require('../database');
|
||||
const navigation = require('../navigation');
|
||||
const translator = require('../translator');
|
||||
const privileges = require('../privileges');
|
||||
const languages = require('../languages');
|
||||
const plugins = require('../plugins');
|
||||
const user = require('../user');
|
||||
const topics = require('../topics');
|
||||
const messaging = require('../messaging');
|
||||
const flags = require('../flags');
|
||||
const meta = require('../meta');
|
||||
const widgets = require('../widgets');
|
||||
const utils = require('../utils');
|
||||
const helpers = require('./helpers');
|
||||
const versions = require('../admin/versions');
|
||||
const controllersHelpers = require('../controllers/helpers');
|
||||
|
||||
const relative_path = nconf.get('relative_path');
|
||||
|
||||
@@ -29,6 +42,7 @@ module.exports = function (middleware) {
|
||||
}
|
||||
|
||||
options.loggedIn = req.uid > 0;
|
||||
options.loggedInUser = await getLoggedInUser(req);
|
||||
options.relative_path = relative_path;
|
||||
options.template = { name: template, [template]: true };
|
||||
options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
|
||||
@@ -70,10 +84,11 @@ module.exports = function (middleware) {
|
||||
return res.json(options);
|
||||
}
|
||||
const optionsString = JSON.stringify(options).replace(/<\//g, '<\\/');
|
||||
const headerFooterData = await loadHeaderFooterData(req, res, options);
|
||||
const results = await utils.promiseParallel({
|
||||
header: renderHeaderFooter('renderHeader', req, res, options),
|
||||
header: renderHeaderFooter('renderHeader', req, res, options, headerFooterData),
|
||||
content: renderContent(render, templateToRender, req, res, options),
|
||||
footer: renderHeaderFooter('renderFooter', req, res, options),
|
||||
footer: renderHeaderFooter('renderFooter', req, res, options, headerFooterData),
|
||||
});
|
||||
|
||||
const str = `${results.header +
|
||||
@@ -93,7 +108,7 @@ module.exports = function (middleware) {
|
||||
}
|
||||
|
||||
try {
|
||||
await renderMethod(template, options, fn);
|
||||
await renderMethod(template, { ...res.locals.templateValues, ...options }, fn);
|
||||
} catch (err) {
|
||||
next(err);
|
||||
}
|
||||
@@ -102,7 +117,187 @@ module.exports = function (middleware) {
|
||||
next();
|
||||
};
|
||||
|
||||
async function renderContent(render, tpl, req, res, options) {
|
||||
async function getLoggedInUser(req) {
|
||||
if (req.user) {
|
||||
return await user.getUserData(req.uid);
|
||||
}
|
||||
return {
|
||||
uid: 0,
|
||||
username: '[[global:guest]]',
|
||||
picture: user.getDefaultAvatar(),
|
||||
'icon:text': '?',
|
||||
'icon:bgColor': '#aaa',
|
||||
};
|
||||
}
|
||||
|
||||
async function loadHeaderFooterData(req, res, options) {
|
||||
if (res.locals.renderHeader) {
|
||||
return await loadClientHeaderFooterData(req, res, options);
|
||||
} else if (res.locals.renderAdminHeader) {
|
||||
return await loadAdminHeaderFooterData(req, res, options);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async function loadClientHeaderFooterData(req, res, options) {
|
||||
const registrationType = meta.config.registrationType || 'normal';
|
||||
res.locals.config = res.locals.config || {};
|
||||
const templateValues = {
|
||||
title: meta.config.title || '',
|
||||
'title:url': meta.config['title:url'] || '',
|
||||
description: meta.config.description || '',
|
||||
'cache-buster': meta.config['cache-buster'] || '',
|
||||
'brand:logo': meta.config['brand:logo'] || '',
|
||||
'brand:logo:url': meta.config['brand:logo:url'] || '',
|
||||
'brand:logo:alt': meta.config['brand:logo:alt'] || '',
|
||||
'brand:logo:display': meta.config['brand:logo'] ? '' : 'hide',
|
||||
allowRegistration: registrationType === 'normal',
|
||||
searchEnabled: plugins.hooks.hasListeners('filter:search.query'),
|
||||
postQueueEnabled: !!meta.config.postQueue,
|
||||
config: res.locals.config,
|
||||
relative_path,
|
||||
bodyClass: options.bodyClass,
|
||||
widgets: options.widgets,
|
||||
};
|
||||
|
||||
templateValues.configJSON = jsesc(JSON.stringify(res.locals.config), { isScriptContext: true });
|
||||
|
||||
const results = await utils.promiseParallel({
|
||||
isAdmin: user.isAdministrator(req.uid),
|
||||
isGlobalMod: user.isGlobalModerator(req.uid),
|
||||
isModerator: user.isModeratorOfAnyCategory(req.uid),
|
||||
privileges: privileges.global.get(req.uid),
|
||||
user: user.getUserData(req.uid),
|
||||
isEmailConfirmSent: req.uid <= 0 ? false : await user.email.isValidationPending(req.uid),
|
||||
languageDirection: translator.translate('[[language:dir]]', res.locals.config.userLang),
|
||||
timeagoCode: languages.userTimeagoCode(res.locals.config.userLang),
|
||||
browserTitle: translator.translate(controllersHelpers.buildTitle(translator.unescape(options.title))),
|
||||
navigation: navigation.get(req.uid),
|
||||
roomIds: db.getSortedSetRevRange(`uid:${req.uid}:chat:rooms`, 0, 0),
|
||||
});
|
||||
|
||||
const unreadData = {
|
||||
'': {},
|
||||
new: {},
|
||||
watched: {},
|
||||
unreplied: {},
|
||||
};
|
||||
|
||||
results.user.unreadData = unreadData;
|
||||
results.user.isAdmin = results.isAdmin;
|
||||
results.user.isGlobalMod = results.isGlobalMod;
|
||||
results.user.isMod = !!results.isModerator;
|
||||
results.user.privileges = results.privileges;
|
||||
results.user.timeagoCode = results.timeagoCode;
|
||||
results.user[results.user.status] = true;
|
||||
results.user.lastRoomId = results.roomIds.length ? results.roomIds[0] : null;
|
||||
|
||||
results.user.email = String(results.user.email);
|
||||
results.user['email:confirmed'] = results.user['email:confirmed'] === 1;
|
||||
results.user.isEmailConfirmSent = !!results.isEmailConfirmSent;
|
||||
|
||||
templateValues.bootswatchSkin = (parseInt(meta.config.disableCustomUserSkins, 10) !== 1 ? res.locals.config.bootswatchSkin : '') || meta.config.bootswatchSkin || '';
|
||||
templateValues.browserTitle = results.browserTitle;
|
||||
({
|
||||
navigation: templateValues.navigation,
|
||||
unreadCount: templateValues.unreadCount,
|
||||
} = await appendUnreadCounts({
|
||||
uid: req.uid,
|
||||
query: req.query,
|
||||
navigation: results.navigation,
|
||||
unreadData,
|
||||
}));
|
||||
templateValues.isAdmin = results.user.isAdmin;
|
||||
templateValues.isGlobalMod = results.user.isGlobalMod;
|
||||
templateValues.showModMenu = results.user.isAdmin || results.user.isGlobalMod || results.user.isMod;
|
||||
templateValues.canChat = results.privileges.chat && meta.config.disableChat !== 1;
|
||||
templateValues.user = results.user;
|
||||
templateValues.userJSON = jsesc(JSON.stringify(results.user), { isScriptContext: true });
|
||||
templateValues.useCustomCSS = meta.config.useCustomCSS && meta.config.customCSS;
|
||||
templateValues.customCSS = templateValues.useCustomCSS ? (meta.config.renderedCustomCSS || '') : '';
|
||||
templateValues.useCustomHTML = meta.config.useCustomHTML;
|
||||
templateValues.customHTML = templateValues.useCustomHTML ? meta.config.customHTML : '';
|
||||
templateValues.maintenanceHeader = meta.config.maintenanceMode && !results.isAdmin;
|
||||
templateValues.defaultLang = meta.config.defaultLang || 'en-GB';
|
||||
templateValues.userLang = res.locals.config.userLang;
|
||||
templateValues.languageDirection = results.languageDirection;
|
||||
if (req.query.noScriptMessage) {
|
||||
templateValues.noScriptMessage = validator.escape(String(req.query.noScriptMessage));
|
||||
}
|
||||
|
||||
templateValues.template = { name: res.locals.template };
|
||||
templateValues.template[res.locals.template] = true;
|
||||
|
||||
if (options.hasOwnProperty('_header')) {
|
||||
templateValues.metaTags = options._header.tags.meta;
|
||||
templateValues.linkTags = options._header.tags.link;
|
||||
}
|
||||
|
||||
if (req.route && req.route.path === '/') {
|
||||
modifyTitle(templateValues);
|
||||
}
|
||||
return templateValues;
|
||||
}
|
||||
|
||||
async function loadAdminHeaderFooterData(req, res, options) {
|
||||
const custom_header = {
|
||||
plugins: [],
|
||||
authentication: [],
|
||||
};
|
||||
res.locals.config = res.locals.config || {};
|
||||
|
||||
const results = await utils.promiseParallel({
|
||||
userData: user.getUserFields(req.uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed']),
|
||||
scripts: getAdminScripts(),
|
||||
custom_header: plugins.hooks.fire('filter:admin.header.build', custom_header),
|
||||
configs: meta.configs.list(),
|
||||
latestVersion: getLatestVersion(),
|
||||
privileges: privileges.admin.get(req.uid),
|
||||
tags: meta.tags.parse(req, {}, [], []),
|
||||
});
|
||||
|
||||
const { userData } = results;
|
||||
userData.uid = req.uid;
|
||||
userData['email:confirmed'] = userData['email:confirmed'] === 1;
|
||||
userData.privileges = results.privileges;
|
||||
|
||||
let acpPath = req.path.slice(1).split('/');
|
||||
acpPath.forEach((path, i) => {
|
||||
acpPath[i] = path.charAt(0).toUpperCase() + path.slice(1);
|
||||
});
|
||||
acpPath = acpPath.join(' > ');
|
||||
|
||||
const version = nconf.get('version');
|
||||
|
||||
res.locals.config.userLang = res.locals.config.acpLang || res.locals.config.userLang;
|
||||
const templateValues = {
|
||||
config: res.locals.config,
|
||||
configJSON: jsesc(JSON.stringify(res.locals.config), { isScriptContext: true }),
|
||||
relative_path: res.locals.config.relative_path,
|
||||
adminConfigJSON: encodeURIComponent(JSON.stringify(results.configs)),
|
||||
metaTags: results.tags.meta,
|
||||
linkTags: results.tags.link,
|
||||
user: userData,
|
||||
userJSON: jsesc(JSON.stringify(userData), { isScriptContext: true }),
|
||||
plugins: results.custom_header.plugins,
|
||||
authentication: results.custom_header.authentication,
|
||||
scripts: results.scripts,
|
||||
'cache-buster': meta.config['cache-buster'] || '',
|
||||
env: !!process.env.NODE_ENV,
|
||||
title: `${acpPath || 'Dashboard'} | NodeBB Admin Control Panel`,
|
||||
bodyClass: options.bodyClass,
|
||||
version: version,
|
||||
latestVersion: results.latestVersion,
|
||||
upgradeAvailable: results.latestVersion && semver.gt(results.latestVersion, version),
|
||||
showManageMenu: results.privileges.superadmin || ['categories', 'privileges', 'users', 'admins-mods', 'groups', 'tags', 'settings'].some(priv => results.privileges[`admin:${priv}`]),
|
||||
};
|
||||
|
||||
templateValues.template = { name: res.locals.template };
|
||||
templateValues.template[res.locals.template] = true;
|
||||
return templateValues;
|
||||
}
|
||||
|
||||
function renderContent(render, tpl, req, res, options) {
|
||||
return new Promise((resolve, reject) => {
|
||||
render.call(res, tpl, options, async (err, str) => {
|
||||
if (err) reject(err);
|
||||
@@ -111,14 +306,76 @@ module.exports = function (middleware) {
|
||||
});
|
||||
}
|
||||
|
||||
async function renderHeaderFooter(method, req, res, options) {
|
||||
async function renderHeader(req, res, options, headerFooterData) {
|
||||
const hookReturn = await plugins.hooks.fire('filter:middleware.renderHeader', {
|
||||
req: req,
|
||||
res: res,
|
||||
templateValues: headerFooterData, // TODO: deprecate
|
||||
templateData: headerFooterData,
|
||||
data: options,
|
||||
});
|
||||
|
||||
return await req.app.renderAsync('header', hookReturn.templateData);
|
||||
}
|
||||
|
||||
async function renderFooter(req, res, options, headerFooterData) {
|
||||
const hookReturn = await plugins.hooks.fire('filter:middleware.renderFooter', {
|
||||
req,
|
||||
res,
|
||||
templateValues: headerFooterData, // TODO: deprecate
|
||||
templateData: headerFooterData,
|
||||
data: options,
|
||||
});
|
||||
|
||||
const scripts = await plugins.hooks.fire('filter:scripts.get', []);
|
||||
|
||||
hookReturn.templateData.scripts = scripts.map(script => ({ src: script }));
|
||||
|
||||
hookReturn.templateData.useCustomJS = meta.config.useCustomJS;
|
||||
hookReturn.templateData.customJS = hookReturn.templateData.useCustomJS ? meta.config.customJS : '';
|
||||
hookReturn.templateData.isSpider = req.uid === -1;
|
||||
|
||||
return await req.app.renderAsync('footer', hookReturn.templateData);
|
||||
}
|
||||
|
||||
async function renderAdminHeader(req, res, options, headerFooterData) {
|
||||
const hookReturn = await plugins.hooks.fire('filter:middleware.renderAdminHeader', {
|
||||
req,
|
||||
res,
|
||||
templateValues: headerFooterData, // TODO: deprecate
|
||||
templateData: headerFooterData,
|
||||
data: options,
|
||||
});
|
||||
|
||||
return await req.app.renderAsync('admin/header', hookReturn.templateData);
|
||||
}
|
||||
|
||||
async function renderAdminFooter(req, res, options, headerFooterData) {
|
||||
const hookReturn = await plugins.hooks.fire('filter:middleware.renderAdminFooter', {
|
||||
req,
|
||||
res,
|
||||
templateValues: headerFooterData, // TODO: deprecate
|
||||
templateData: headerFooterData,
|
||||
data: options,
|
||||
});
|
||||
|
||||
return await req.app.renderAsync('admin/footer', hookReturn.templateData);
|
||||
}
|
||||
|
||||
async function renderHeaderFooter(method, req, res, options, headerFooterData) {
|
||||
let str = '';
|
||||
if (res.locals.renderHeader) {
|
||||
str = await middleware[method](req, res, options);
|
||||
if (method === 'renderHeader') {
|
||||
str = await renderHeader(req, res, options, headerFooterData);
|
||||
} else if (method === 'renderFooter') {
|
||||
str = await renderFooter(req, res, options, headerFooterData);
|
||||
}
|
||||
} else if (res.locals.renderAdminHeader) {
|
||||
str = await middleware.admin[method](req, res, options);
|
||||
} else {
|
||||
str = '';
|
||||
if (method === 'renderHeader') {
|
||||
str = await renderAdminHeader(req, res, options, headerFooterData);
|
||||
} else if (method === 'renderFooter') {
|
||||
str = await renderAdminFooter(req, res, options, headerFooterData);
|
||||
}
|
||||
}
|
||||
return await translate(str, getLang(req, res));
|
||||
}
|
||||
@@ -135,4 +392,106 @@ module.exports = function (middleware) {
|
||||
const translated = await translator.translate(str, language);
|
||||
return translator.unescape(translated);
|
||||
}
|
||||
|
||||
async function appendUnreadCounts({ uid, navigation, unreadData, query }) {
|
||||
const originalRoutes = navigation.map(nav => nav.originalRoute);
|
||||
const calls = {
|
||||
unreadData: topics.getUnreadData({ uid: uid, query: query }),
|
||||
unreadChatCount: messaging.getUnreadCount(uid),
|
||||
unreadNotificationCount: user.notifications.getUnreadCount(uid),
|
||||
unreadFlagCount: (async function () {
|
||||
if (originalRoutes.includes('/flags') && await user.isPrivileged(uid)) {
|
||||
return flags.getCount({
|
||||
uid,
|
||||
query,
|
||||
filters: {
|
||||
quick: 'unresolved',
|
||||
cid: (await user.isAdminOrGlobalMod(uid)) ? [] : (await user.getModeratedCids(uid)),
|
||||
},
|
||||
});
|
||||
}
|
||||
return 0;
|
||||
}()),
|
||||
};
|
||||
const results = await utils.promiseParallel(calls);
|
||||
|
||||
const unreadCounts = results.unreadData.counts;
|
||||
const unreadCount = {
|
||||
topic: unreadCounts[''] || 0,
|
||||
newTopic: unreadCounts.new || 0,
|
||||
watchedTopic: unreadCounts.watched || 0,
|
||||
unrepliedTopic: unreadCounts.unreplied || 0,
|
||||
mobileUnread: 0,
|
||||
unreadUrl: '/unread',
|
||||
chat: results.unreadChatCount || 0,
|
||||
notification: results.unreadNotificationCount || 0,
|
||||
flags: results.unreadFlagCount || 0,
|
||||
};
|
||||
|
||||
Object.keys(unreadCount).forEach((key) => {
|
||||
if (unreadCount[key] > 99) {
|
||||
unreadCount[key] = '99+';
|
||||
}
|
||||
});
|
||||
|
||||
const { tidsByFilter } = results.unreadData;
|
||||
navigation = navigation.map((item) => {
|
||||
function modifyNavItem(item, route, filter, content) {
|
||||
if (item && item.originalRoute === route) {
|
||||
unreadData[filter] = _.zipObject(tidsByFilter[filter], tidsByFilter[filter].map(() => true));
|
||||
item.content = content;
|
||||
unreadCount.mobileUnread = content;
|
||||
unreadCount.unreadUrl = route;
|
||||
if (unreadCounts[filter] > 0) {
|
||||
item.iconClass += ' unread-count';
|
||||
}
|
||||
}
|
||||
}
|
||||
modifyNavItem(item, '/unread', '', unreadCount.topic);
|
||||
modifyNavItem(item, '/unread?filter=new', 'new', unreadCount.newTopic);
|
||||
modifyNavItem(item, '/unread?filter=watched', 'watched', unreadCount.watchedTopic);
|
||||
modifyNavItem(item, '/unread?filter=unreplied', 'unreplied', unreadCount.unrepliedTopic);
|
||||
|
||||
['flags'].forEach((prop) => {
|
||||
if (item && item.originalRoute === `/${prop}` && unreadCount[prop] > 0) {
|
||||
item.iconClass += ' unread-count';
|
||||
item.content = unreadCount.flags;
|
||||
}
|
||||
});
|
||||
|
||||
return item;
|
||||
});
|
||||
|
||||
return { navigation, unreadCount };
|
||||
}
|
||||
|
||||
|
||||
function modifyTitle(obj) {
|
||||
const title = controllersHelpers.buildTitle(meta.config.homePageTitle || '[[pages:home]]');
|
||||
obj.browserTitle = title;
|
||||
|
||||
if (obj.metaTags) {
|
||||
obj.metaTags.forEach((tag, i) => {
|
||||
if (tag.property === 'og:title') {
|
||||
obj.metaTags[i].content = title;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return title;
|
||||
}
|
||||
|
||||
async function getAdminScripts() {
|
||||
const scripts = await plugins.hooks.fire('filter:admin.scripts.get', []);
|
||||
return scripts.map(script => ({ src: script }));
|
||||
}
|
||||
|
||||
async function getLatestVersion() {
|
||||
try {
|
||||
return await versions.getLatestVersion();
|
||||
} catch (err) {
|
||||
winston.error(`[acp] Failed to fetch latest version${err.stack}`);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,6 +12,7 @@ const plugins = require('../plugins');
|
||||
const helpers = require('./helpers');
|
||||
const auth = require('../routes/authentication');
|
||||
const writeRouter = require('../routes/write');
|
||||
const accountHelpers = require('../controllers/accounts/helpers');
|
||||
|
||||
const controllers = {
|
||||
helpers: require('../controllers/helpers'),
|
||||
@@ -181,6 +182,7 @@ module.exports = function (middleware) {
|
||||
if (allowed) {
|
||||
return next();
|
||||
}
|
||||
|
||||
controllers.helpers.notAllowed(req, res);
|
||||
});
|
||||
|
||||
@@ -223,6 +225,11 @@ module.exports = function (middleware) {
|
||||
res.status(403).render('403', { title: '[[global:403.title]]' });
|
||||
};
|
||||
|
||||
middleware.buildAccountData = async (req, res, next) => {
|
||||
res.locals.templateValues = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
|
||||
next();
|
||||
};
|
||||
|
||||
middleware.registrationComplete = async function registrationComplete(req, res, next) {
|
||||
// If the user's session contains registration data, redirect the user to complete registration
|
||||
if (!req.session.hasOwnProperty('registration')) {
|
||||
|
||||
Reference in New Issue
Block a user