Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,49 @@
+#### v3.5.3 (2023-12-13)
+
+##### Chores
+
+*  up composer (245e5df3)
+*  up composer default (c1f82b78)
+*  incrementing version number - v3.5.2 (52fbb2da)
+*  update changelog for v3.5.2 (e2e85053)
+*  incrementing version number - v3.5.1 (4c543488)
+*  incrementing version number - v3.5.0 (d06fb4f0)
+*  incrementing version number - v3.4.3 (5c984250)
+*  incrementing version number - v3.4.2 (3f0dac38)
+*  incrementing version number - v3.4.1 (01e69574)
+*  incrementing version number - v3.4.0 (fd9247c5)
+*  incrementing version number - v3.3.9 (5805e770)
+*  incrementing version number - v3.3.8 (a5603565)
+*  incrementing version number - v3.3.7 (b26f1744)
+*  incrementing version number - v3.3.6 (7fb38792)
+*  incrementing version number - v3.3.4 (a67f84ea)
+*  incrementing version number - v3.3.3 (f94d239b)
+*  incrementing version number - v3.3.2 (ec9dac97)
+*  incrementing version number - v3.3.1 (151cc68f)
+*  incrementing version number - v3.3.0 (fc1ad70f)
+*  incrementing version number - v3.2.3 (b06d3e63)
+*  incrementing version number - v3.2.2 (758ecfcd)
+*  incrementing version number - v3.2.1 (20145074)
+*  incrementing version number - v3.2.0 (9ecac38e)
+*  incrementing version number - v3.1.7 (0b4e81ab)
+*  incrementing version number - v3.1.6 (b3a3b130)
+*  incrementing version number - v3.1.5 (ec19343a)
+*  incrementing version number - v3.1.4 (2452783c)
+*  incrementing version number - v3.1.3 (3b4e9d3f)
+*  incrementing version number - v3.1.2 (40fa3489)
+*  incrementing version number - v3.1.1 (40250733)
+*  incrementing version number - v3.1.0 (0cb386bd)
+*  incrementing version number - v3.0.1 (26f6ea49)
+*  incrementing version number - v3.0.0 (224e08cd)
+
+##### Bug Fixes
+
+*  change translator escape (c434262e)
+
+##### Other Changes
+
+*  add types for database abstration layer (#10762) (17cd19c7)
+
 #### v3.5.2 (2023-11-29)
 
 ##### Chores

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "3.5.2",
+    "version": "3.5.3",
     "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",

src/middleware/header.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const user = require('../user');
 const plugins = require('../plugins');
 const helpers = require('./helpers');
 
@@ -27,17 +26,5 @@ async function doBuildHeader(req, res) {
 	}
 
 	await plugins.hooks.fire('filter:middleware.buildHeader', { req: req, locals: res.locals });
-	const [config, canLoginIfBanned] = await Promise.all([
-		controllers.api.loadConfig(req),
-		user.bans.canLoginIfBanned(req.uid),
-	]);
-
-	if (!canLoginIfBanned && req.loggedIn) {
-		req.logout(() => {
-			res.redirect('/');
-		});
-		return;
-	}
-
-	res.locals.config = config;
+	res.locals.config = await controllers.api.loadConfig(req);
 }

src/middleware/user.js

@@ -221,6 +221,20 @@ module.exports = function (middleware) {
 		controllers.helpers.redirect(res, path);
 	});
 
+	middleware.redirectToHomeIfBanned = helpers.try(async (req, res, next) => {
+		if (req.loggedIn) {
+			const canLoginIfBanned = await user.bans.canLoginIfBanned(req.uid);
+			if (!canLoginIfBanned) {
+				req.logout(() => {
+					res.redirect('/');
+				});
+				return;
+			}
+		}
+
+		next();
+	});
+
 	middleware.requireUser = function (req, res, next) {
 		if (req.loggedIn) {
 			return next();

src/routes/helpers.js

@@ -18,6 +18,7 @@ helpers.setupPageRoute = function (...args) {
 	middlewares = [
 		middleware.applyBlacklist,
 		middleware.authenticateRequest,
+		middleware.redirectToHomeIfBanned,
 		middleware.maintenanceMode,
 		middleware.registrationComplete,
 		middleware.pluginHooks,