Merge branch 'master' into develop

src/activitypub/index.js

@@ -120,8 +120,13 @@ ActivityPub.resolveInboxes = async (ids) => {
 
 	if (!meta.config.activitypubAllowLoopback) {
 		ids = ids.filter((id) => {
-			const { hostname } = new URL(id);
-			return hostname !== nconf.get('url_parsed').hostname;
+			try {
+				const { hostname } = new URL(id);
+				return hostname !== nconf.get('url_parsed').hostname;
+			} catch (err) {
+				winston.error(`[activitypub/resolveInboxes] Invalid id: ${id}`);
+				return false;
+			}
 		});
 	}
 

src/controllers/authentication.js

@@ -490,7 +490,7 @@ authenticationController.logout = async function (req, res) {
 		};
 		await plugins.hooks.fire('filter:user.logout', payload);
 
-		if (req.body?.noscript === 'true') {
+		if (req.body?.noscript === 'true' || res.locals.logoutRedirect === true) {
 			return res.redirect(payload.next);
 		}
 		res.status(200).send(payload);

src/middleware/user.js

@@ -53,6 +53,12 @@ module.exports = function (middleware) {
 		}
 
 		if (req.loggedIn) {
+			const exists = await user.exists(req.uid);
+			if (!exists) {
+				res.locals.logoutRedirect = true;
+				return controllers.authentication.logout(req, res);
+			}
+
 			return true;
 		} else if (req.headers.hasOwnProperty('authorization')) {
 			const user = await passportAuthenticateAsync(req, res);

test/i18n.js

@@ -163,7 +163,7 @@ describe('i18n', () => {
 						assert.strictEqual(
 							sourceKeys.length,
 							translationKeys.length,
-							`Extra keys found in namespace ${namespace.slice(1, -5)} for language "${language}"`
+							`Extra keys found in namespace "${namespace.slice(1, -5)}" for language "${language}"`
 						);
 					});
 				});