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: accept and undo logic saving improper id into database, updated follow logic so remote follow is not added to collection until an accept is received

Browse Source
This commit is contained in:
Julian Lam
2024-01-03 13:54:17 -05:00
parent ccbf32bcc5
commit 759d69e06c
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/activitypub/inbox.js
View File

@@ -48,9 +48,11 @@ inbox.isFollowed = async (actorId, uid) => {
}; };
inbox.accept = async (req) => { inbox.accept = async (req) => {
const { actor, object } = req.body; let { actor, object } = req.body;
const { type } = object; const { type } = object;
actor = await activitypub.getActor(actor);
if (type === 'Follow') { if (type === 'Follow') {
// todo: should check that actor and object.actor are the same person? // todo: should check that actor and object.actor are the same person?
const uid = await helpers.resolveLocalUid(object.actor); const uid = await helpers.resolveLocalUid(object.actor);
@@ -60,25 +62,27 @@ inbox.accept = async (req) => {
const now = Date.now(); const now = Date.now();
await Promise.all([ await Promise.all([
db.sortedSetAdd(`followingRemote:${uid}`, now, actor.name), db.sortedSetAdd(`followingRemote:${uid}`, now, actor.id),
db.incrObjectField(`user:${uid}`, 'followingRemoteCount'), db.incrObjectField(`user:${uid}`, 'followingRemoteCount'),
]); ]);
} }
}; };
inbox.undo = async (req) => { inbox.undo = async (req) => {
const { actor, object } = req.body; let { actor, object } = req.body;
const { type } = object; const { type } = object;
actor = await activitypub.getActor(actor);
if (type === 'Follow') { if (type === 'Follow') {
// todo: should check that actor and object.actor are the same person? // todo: should check that actor and object.actor are the same person?
const uid = await helpers.resolveLocalUid(object.actor); const uid = await helpers.resolveLocalUid(object.object);
if (!uid) { if (!uid) {
throw new Error('[[error:invalid-uid]]'); throw new Error('[[error:invalid-uid]]');
} }
await Promise.all([ await Promise.all([
db.sortedSetRemove(`followingRemote:${uid}`, actor.name), db.sortedSetRemove(`followingRemote:${uid}`, actor.id),
db.decrObjectField(`user:${uid}`, 'followingRemoteCount'), db.decrObjectField(`user:${uid}`, 'followingRemoteCount'),
]); ]);
} }

8
src/api/activitypub.js
View File

@@ -26,12 +26,6 @@ activitypubApi.follow = async (caller, { actorId } = {}) => {
type: 'Follow', type: 'Follow',
object: object.id, object: object.id,
}); });
const now = Date.now();
await Promise.all([
db.sortedSetAdd(`followingRemote:${caller.uid}`, now, actorId),
db.incrObjectField(`user:${caller.uid}`, 'followingRemoteCount'),
]);
}; };
activitypubApi.unfollow = async (caller, { actorId }) => { activitypubApi.unfollow = async (caller, { actorId }) => {
@@ -51,7 +45,7 @@ activitypubApi.unfollow = async (caller, { actorId }) => {
}); });
await Promise.all([ await Promise.all([
db.sortedSetRemove(`followingRemote:${caller.uid}`, actorId), db.sortedSetRemove(`followingRemote:${caller.uid}`, object.id),
db.decrObjectField(`user:${caller.uid}`, 'followingRemoteCount'), db.decrObjectField(`user:${caller.uid}`, 'followingRemoteCount'),
]); ]);
}; };