Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-09 00:36:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into activitypub

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-06-11 18:18:14 -04:00
parent 42f514b793 43f6d35a0d
commit 04b4c16e27
73 changed files with 234 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/middleware/render.js
View File

@@ -116,7 +116,7 @@ module.exports = function (middleware) {
}
try {
await renderMethod(template, { ...res.locals.templateValues, ...options }, fn);
await renderMethod(template, options, fn);
} catch (err) {
next(err);
}

14
src/middleware/uploads.js
View File

@@ -5,12 +5,12 @@ const meta = require('../meta');
const helpers = require('./helpers');
const user = require('../user');
const cache = cacheCreate({
ttl: meta.config.uploadRateLimitCooldown * 1000,
});
let cache;
exports.clearCache = function () {
cache.clear();
if (cache) {
cache.clear();
}
};
exports.ratelimit = helpers.try(async (req, res, next) => {
@@ -18,7 +18,11 @@ exports.ratelimit = helpers.try(async (req, res, next) => {
if (!meta.config.uploadRateLimitThreshold || (uid && await user.isAdminOrGlobalMod(uid))) {
return next();
}
if (!cache) {
cache = cacheCreate({
ttl: meta.config.uploadRateLimitCooldown * 1000,
});
}
const count = (cache.get(`${req.ip}:uploaded_file_count`) || 0) + req.files.files.length;
if (count > meta.config.uploadRateLimitThreshold) {
return next(new Error(['[[error:upload-ratelimit-reached]]']));

13
src/middleware/user.js
View File

@@ -248,7 +248,18 @@ module.exports = function (middleware) {
};
middleware.buildAccountData = async (req, res, next) => {
res.locals.templateValues = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
// use lowercase slug on api routes, or direct to the user/<lowercaseslug>
const lowercaseSlug = req.params.userslug.toLowerCase();
if (req.params.userslug !== lowercaseSlug) {
if (res.locals.isAPI) {
req.params.userslug = lowercaseSlug;
} else {
const newPath = req.path.replace(new RegExp(`/${req.params.userslug}`), () => `/${lowercaseSlug}`);
return res.redirect(`${nconf.get('relative_path')}${newPath}`);
}
}
res.locals.userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
next();
};