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

refactor: follow/accept/undo logic to pass the same timestamp throughout the follow's lifetime

Browse Source
This commit is contained in:
Julian Lam
2024-07-30 14:05:59 -04:00
parent 2ced350250
commit e015339ccf
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/activitypub/inbox.js
View File

@@ -376,11 +376,11 @@ inbox.accept = async (req) => {
if (await db.isSortedSetMember(`followingRemote:${id}`, actor)) return; // already following
return reject('Accept', req.body, actor); // not following, not requested, so reject to hopefully stop retries
}
const now = Date.now();
const timestamp = await db.sortedSetScore(`followRequests:uid.${id}`, actor);
await Promise.all([
db.sortedSetRemove(`followRequests:uid.${id}`, actor),
db.sortedSetAdd(`followingRemote:${id}`, now, actor),
db.sortedSetAdd(`followersRemote:${actor}`, now, id), // for followers backreference and notes assertion checking
db.sortedSetAdd(`followingRemote:${id}`, timestamp, actor),
db.sortedSetAdd(`followersRemote:${actor}`, timestamp, id), // for followers backreference and notes assertion checking
]);
const followingRemoteCount = await db.sortedSetCard(`followingRemote:${id}`);
await user.setUserField(id, 'followingRemoteCount', followingRemoteCount);
@@ -389,11 +389,11 @@ inbox.accept = async (req) => {
if (await db.isSortedSetMember(`cid:${id}:following`, actor)) return; // already following
return reject('Accept', req.body, actor); // not following, not requested, so reject to hopefully stop retries
}
const now = Date.now();
const timestamp = await db.sortedSetScore(`followRequests:cid.${id}`, actor);
await Promise.all([
db.sortedSetRemove(`followRequests:cid.${id}`, actor),
db.sortedSetAdd(`cid:${id}:following`, now, actor),
db.sortedSetAdd(`followersRemote:${actor}`, now, `cid|${id}`), // for notes assertion checking
db.sortedSetAdd(`cid:${id}:following`, timestamp, actor),
db.sortedSetAdd(`followersRemote:${actor}`, timestamp, `cid|${id}`), // for notes assertion checking
]);
}
}

14
src/api/activitypub.js
View File

@@ -42,14 +42,15 @@ activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) =>
actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;
const handle = await user.getUserField(actor, 'username');
const timestamp = Date.now();
await activitypub.send(type, id, [actor], {
id: `${nconf.get('url')}/${type}/${id}#activity/follow/${handle}/${Date.now()}`,
id: `${nconf.get('url')}/${type}/${id}#activity/follow/${handle}/${timestamp}`,
type: 'Follow',
object: actor,
});
await db.sortedSetAdd(`followRequests:${type}.${id}`, Date.now(), actor);
await db.sortedSetAdd(`followRequests:${type}.${id}`, timestamp, actor);
});
// should be .undo.follow
@@ -61,9 +62,14 @@ activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => {
actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;
const handle = await user.getUserField(actor, 'username');
const timestamps = await db.sortedSetsScore([
`followRequests:${type}.${id}`,
type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`,
], actor);
const timestamp = timestamps[0] || timestamps[1];
const object = {
id: `${nconf.get('url')}/${type}/${id}#activity/follow/${handle}`,
id: `${nconf.get('url')}/${type}/${id}#activity/follow/${handle}/${timestamp}`,
type: 'Follow',
object: actor,
};
@@ -74,7 +80,7 @@ activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => {
}
await activitypub.send(type, id, [actor], {
id: `${nconf.get('url')}/${type}/${id}#activity/undo:follow/${handle}/${Date.now()}`,
id: `${nconf.get('url')}/${type}/${id}#activity/undo:follow/${handle}/${timestamp}`,
type: 'Undo',
object,
});