Merge branch 'master' into develop

install/package.json

@@ -96,7 +96,7 @@
         "mousetrap": "1.6.5",
         "multer": "2.0.2",
         "nconf": "0.13.0",
-        "nodebb-plugin-2factor": "7.5.10",
+        "nodebb-plugin-2factor": "7.6.0",
         "nodebb-plugin-composer-default": "10.3.1",
         "nodebb-plugin-dbsearch": "6.3.2",
         "nodebb-plugin-emoji": "6.0.3",

src/activitypub/inbox.js

@@ -302,6 +302,7 @@ inbox.announce = async (req) => {
 			const exists = await posts.exists(localId || id);
 			if (exists) {
 				try {
+					await activitypub.actors.assert(object.actor);
 					const result = await posts.upvote(localId || id, object.actor);
 					if (localId) {
 						socketHelpers.upvote(result, 'notifications:upvoted-your-post-in');

src/database/postgres/main.js

@@ -85,7 +85,8 @@ module.exports = function (module) {
 			text: `
 		SELECT o."_key"
 		FROM "legacy_object_live" o
-		WHERE o."_key" LIKE '${match}'`,
+		WHERE o."_key" LIKE $1`,
+			values: [match],
 		});
 
 		return res.rows.map(r => r._key);