Merge branch 'master' into develop

install/package.json

@@ -44,7 +44,7 @@
         "async": "3.2.6",
         "autoprefixer": "10.4.20",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "2.5.1",
+        "benchpressjs": "2.5.2",
         "body-parser": "1.20.3",
         "bootbox": "6.0.0",
         "bootstrap": "5.3.3",
@@ -108,10 +108,10 @@
         "nodebb-plugin-spam-be-gone": "2.3.0",
         "nodebb-plugin-web-push": "0.7.2",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "2.0.3",
+        "nodebb-theme-harmony": "2.0.5",
         "nodebb-theme-lavender": "7.1.17",
-        "nodebb-theme-peace": "2.2.33",
-        "nodebb-theme-persona": "14.0.2",
+        "nodebb-theme-peace": "2.2.34",
+        "nodebb-theme-persona": "14.0.3",
         "nodebb-widget-essentials": "7.0.32",
         "nodemailer": "6.9.16",
         "nprogress": "0.2.0",

src/activitypub/actors.js

@@ -67,7 +67,7 @@ Actors.assert = async (ids, options = {}) => {
 	})));
 
 	// Webfinger failures = assertion failure
-	if (!ids.every(Boolean)) {
+	if (!ids.length || !ids.every(Boolean)) {
 		return false;
 	}
 

src/api/activitypub.js

@@ -38,7 +38,7 @@ function enabledCheck(next) {
 activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) => {
 	// Privilege checks should be done upstream
 	const assertion = await activitypub.actors.assert(actor);
-	if (!assertion) {
+	if (!assertion || !assertion.length) {
 		throw new Error('[[error:activitypub.invalid-id]]');
 	}