Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-23 18:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9580, proper 404 when ajaxifying

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-05-25 12:44:17 -04:00
parent 09f5179216
commit 9ebfdeb7ee
3 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/middleware/render.js
View File

@@ -2,14 +2,14 @@
const nconf = require('nconf');
const validator = require('validator');
const winston = require('winston');
const plugins = require('../plugins');
const meta = require('../meta');
const translator = require('../translator');
const widgets = require('../widgets');
const utils = require('../utils');
const slugify = require('../slugify');
const helpers = require('./helpers');
const relative_path = nconf.get('relative_path');
@@ -31,7 +31,7 @@ module.exports = function (middleware) {
options.relative_path = relative_path;
options.template = { name: template, [template]: true };
options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
options.bodyClass = buildBodyClass(req, res, options);
options.bodyClass = helpers.buildBodyClass(req, res, options);
const buildResult = await plugins.hooks.fire(`filter:${template}.build`, { req: req, res: res, templateData: options });
if (res.headersSent) {
@@ -123,34 +123,4 @@ module.exports = function (middleware) {
const translated = await translator.translate(str, language);
return translator.unescape(translated);
}
function buildBodyClass(req, res, templateData) {
const clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, '');
const parts = clean.split('/').slice(0, 3);
parts.forEach((p, index) => {
try {
p = slugify(decodeURIComponent(p));
} catch (err) {
winston.error(err.stack);
p = '';
}
p = validator.escape(String(p));
parts[index] = index ? `${parts[0]}-${p}` : `page-${p || 'home'}`;
});
if (templateData.template.topic) {
parts.push(`page-topic-category-${templateData.category.cid}`);
parts.push(`page-topic-category-${slugify(templateData.category.name)}`);
}
if (templateData.breadcrumbs) {
templateData.breadcrumbs.forEach((crumb) => {
if (crumb.hasOwnProperty('cid')) {
parts.push(`parent-category-${crumb.cid}`);
}
});
}
parts.push(`page-status-${res.statusCode}`);
return parts.join(' ');
}
};