Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 02:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #13392, regression from c6f2c87, unable to unfollow from pending follows

Browse Source
This commit is contained in:
Julian Lam
2025-05-08 13:55:17 -04:00
parent a9a5ab5e4b
commit 401ff797c9
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/activitypub.js
View File

@@ -84,13 +84,22 @@ activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => {
throw new Error('[[error:activitypub.invalid-id]]'); throw new Error('[[error:activitypub.invalid-id]]');
} }
actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor; if (actor.includes('@')) {
const [handle, isFollowing] = await Promise.all([ const [uid, cid] = await Promise.all([
user.getUidByUserslug(actor),
categories.getCidByHandle(actor),
]);
actor = uid || cid;
}
const [handle, isFollowing, isPending] = await Promise.all([
user.getUserField(actor, 'username'), user.getUserField(actor, 'username'),
db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor), db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor),
db.isSortedSetMember(`followRequests:${type === 'uid' ? 'uid' : 'cid'}.${id}`, actor),
]); ]);
if (!isFollowing) { // already not following if (!isFollowing && !isPending) { // already not following/pending
return; return;
} }