Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not send out ap (undo:)follow if local user or category is (not)already following

Browse Source
This commit is contained in:
Julian Lam
2025-03-24 11:52:09 -04:00
parent 85e7c1a20d
commit c6f2c87478
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/activitypub.js
View File

@@ -37,13 +37,22 @@ function enabledCheck(next) {
activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) => { activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) => {
// Privilege checks should be done upstream // Privilege checks should be done upstream
const acceptedTypes = ['uid', 'cid'];
const assertion = await activitypub.actors.assert(actor); const assertion = await activitypub.actors.assert(actor);
if (!assertion || (Array.isArray(assertion) && assertion.length)) { if (!acceptedTypes.includes(type) || !assertion || (Array.isArray(assertion) && assertion.length)) {
throw new Error('[[error:activitypub.invalid-id]]'); throw new Error('[[error:activitypub.invalid-id]]');
} }
actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor; actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;
const handle = await user.getUserField(actor, 'username'); const [handle, isFollowing] = await Promise.all([
user.getUserField(actor, 'username'),
db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor),
]);
if (isFollowing) { // already following
return;
}
const timestamp = Date.now(); const timestamp = Date.now();
await db.sortedSetAdd(`followRequests:${type}.${id}`, timestamp, actor); await db.sortedSetAdd(`followRequests:${type}.${id}`, timestamp, actor);
@@ -61,13 +70,22 @@ activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) =>
// should be .undo.follow // should be .undo.follow
activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => { activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => {
const acceptedTypes = ['uid', 'cid'];
const assertion = await activitypub.actors.assert(actor); const assertion = await activitypub.actors.assert(actor);
if (!assertion) { if (!acceptedTypes.includes(type) || !assertion) {
throw new Error('[[error:activitypub.invalid-id]]'); throw new Error('[[error:activitypub.invalid-id]]');
} }
actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor; actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;
const handle = await user.getUserField(actor, 'username'); const [handle, isFollowing] = await Promise.all([
user.getUserField(actor, 'username'),
db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor),
]);
if (!isFollowing) { // already not following
return;
}
const timestamps = await db.sortedSetsScore([ const timestamps = await db.sortedSetsScore([
`followRequests:${type}.${id}`, `followRequests:${type}.${id}`,
type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`,