Node.js based forum software built for the modern web
fix: update AP api (un)follow ids to be url encoded id instead of handle
Julian Lam7cf61ab0809b
diff --git a/src/api/activitypub.js b/src/api/activitypub.jsindex be6600d3a2..ddb2cd2386 100644--- a/src/api/activitypub.js+++ b/src/api/activitypub.js@@ -44,11 +44,8 @@ activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) =>}actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;- const [handle, isFollowing] = await Promise.all([- user.getUserField(actor, 'username'),- db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor),- ]);+ const isFollowing = await db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor);if (isFollowing) { // already followingreturn;}@@ -58,7 +55,7 @@ activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) =>await db.sortedSetAdd(`followRequests:${type}.${id}`, timestamp, actor);try {await activitypub.send(type, id, [actor], {- id: `${nconf.get('url')}/${type}/${id}#activity/follow/${handle}/${timestamp}`,+ id: `${nconf.get('url')}/${type}/${id}#activity/follow/${encodeURIComponent(actor)}/${timestamp}`,type: 'Follow',object: actor,});@@ -77,11 +74,8 @@ activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => {}actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;- const [handle, isFollowing] = await Promise.all([- user.getUserField(actor, 'username'),- db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor),- ]);+ const isFollowing = await db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor);if (!isFollowing) { // already not followingreturn;}@@ -93,7 +87,7 @@ activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => {const timestamp = timestamps[0] || timestamps[1];const object = {- id: `${nconf.get('url')}/${type}/${id}#activity/follow/${handle}/${timestamp}`,+ id: `${nconf.get('url')}/${type}/${id}#activity/follow/${encodeURIComponent(actor)}/${timestamp}`,type: 'Follow',object: actor,};