Node.js based forum software built for the modern web
fix: proper ap undo verb called when unvoting, cc @panosda
Julian Lam47e7bfd99417
diff --git a/src/activitypub/out.js b/src/activitypub/out.jsindex 321ac38bab..5270da491a 100644--- a/src/activitypub/out.js+++ b/src/activitypub/out.js@@ -486,7 +486,7 @@ Out.undo.follow = enabledCheck(async (type, id, actor) => {activitypub.actors._followerCache.del(actor);});-Out.undo.like = enabledCheck(async (uid, pid) => {+async function unvote(type, uid, pid) {if (!activitypub.helpers.isUri(pid)) {return;}@@ -497,13 +497,13 @@ Out.undo.like = enabledCheck(async (uid, pid) => {}const payload = {- id: `${nconf.get('url')}/uid/${uid}#activity/undo:like/${encodeURIComponent(pid)}/${Date.now()}`,+ id: `${nconf.get('url')}/uid/${uid}#activity/undo:${type.toLowerCase()}/${encodeURIComponent(pid)}/${Date.now()}`,type: 'Undo',actor: `${nconf.get('url')}/uid/${uid}`,object: {actor: `${nconf.get('url')}/uid/${uid}`,- id: `${nconf.get('url')}/uid/${uid}#activity/like/${encodeURIComponent(pid)}`,- type: 'Like',+ id: `${nconf.get('url')}/uid/${uid}#activity/${type.toLowerCase()}/${encodeURIComponent(pid)}`,+ type,object: pid,},};@@ -512,6 +512,14 @@ Out.undo.like = enabledCheck(async (uid, pid) => {activitypub.send('uid', uid, [author], payload),activitypub.feps.announce(pid, payload),]);+};++Out.undo.like = enabledCheck(async (uid, pid) => {+ return await unvote('Like', uid, pid);+});++Out.undo.dislike = enabledCheck(async (uid, pid) => {+ return await unvote('Dislike', uid, pid);});Out.undo.flag = enabledCheck(async (uid, flag) => {diff --git a/src/api/helpers.js b/src/api/helpers.jsindex 5867e2822c..7dec96cc30 100644--- a/src/api/helpers.js+++ b/src/api/helpers.js@@ -166,7 +166,8 @@ async function executeCommand(caller, command, eventName, notification, data) {case 'unvote': {socketHelpers.rescindUpvoteNotification(data.pid, caller.uid);- await activitypub.out.undo.like(caller.uid, data.pid);+ const verb = result.was.upvoted ? 'like' : 'dislike';+ await activitypub.out.undo[verb](caller.uid, data.pid);break;}diff --git a/src/posts/votes.js b/src/posts/votes.jsindex d38f35d0ea..915884fc2d 100644--- a/src/posts/votes.js+++ b/src/posts/votes.js@@ -206,6 +206,7 @@ module.exports = function (Posts) {post: postData,upvote: type === 'upvote' && !unvote,downvote: type === 'downvote' && !unvote,+ was: voteStatus,};}