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

fix: removal of topics from applicable user inboxes when synced

Browse Source 
re: #12642
This commit is contained in:
Julian Lam
2024-07-05 12:00:19 -04:00
parent 0d549f1d80
commit 46341673b3
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/activitypub/notes.js
View File

@@ -292,8 +292,13 @@ Notes.syncUserInboxes = async function (tid, uid) {
const keys = Array.from(uids).map(uid => `uid:${uid}:inbox`); const keys = Array.from(uids).map(uid => `uid:${uid}:inbox`);
const score = await db.sortedSetScore(`cid:${cid}:tids`, tid); const score = await db.sortedSetScore(`cid:${cid}:tids`, tid);
const removeKeys = (await db.getSetMembers(`tid:${tid}:recipients`))
.filter(uid => !uids.has(parseInt(uid, 10)))
.map((uid => `uid:${uid}:inbox`));
// winston.verbose(`[activitypub/syncUserInboxes] Syncing tid ${tid} with ${uids.size} inboxes`); // winston.verbose(`[activitypub/syncUserInboxes] Syncing tid ${tid} with ${uids.size} inboxes`);
await Promise.all([ await Promise.all([
db.sortedSetsRemove(removeKeys, tid),
db.sortedSetsAdd(keys, keys.map(() => score || Date.now()), tid), db.sortedSetsAdd(keys, keys.map(() => score || Date.now()), tid),
db.setAdd(`tid:${tid}:recipients`, Array.from(uids)), db.setAdd(`tid:${tid}:recipients`, Array.from(uids)),
]); ]);
@@ -371,10 +376,14 @@ Notes.delete = async (pids) => {
const exists = await posts.exists(pids); const exists = await posts.exists(pids);
pids = pids.filter((_, idx) => exists[idx]); pids = pids.filter((_, idx) => exists[idx]);
let tids = await posts.getPostsFields(pids, ['tid']);
tids = new Set(tids.map(obj => obj.tid));
const recipientSets = pids.map(id => `post:${id}:recipients`); const recipientSets = pids.map(id => `post:${id}:recipients`);
const announcerSets = pids.map(id => `pid:${id}:announces`); const announcerSets = pids.map(id => `pid:${id}:announces`);
await db.deleteAll([...recipientSets, ...announcerSets]); await db.deleteAll([...recipientSets, ...announcerSets]);
await Promise.all(Array.from(tids).map(async tid => Notes.syncUserInboxes(tid)));
}; };
Notes.prune = async () => { Notes.prune = async () => {

8
test/activitypub/notes.js
View File

@@ -69,6 +69,14 @@ describe('Notes', () => {
assert.strictEqual(inboxed, true); assert.strictEqual(inboxed, true);
}); });
it('should remove a topic from a user\'s inbox if that user is no longer a recipient in any contained posts', async () => {
await activitypub.notes.syncUserInboxes(topicData.tid, uid);
await activitypub.notes.syncUserInboxes(topicData.tid);
const inboxed = await db.isSortedSetMember(`uid:${uid}:inbox`, topicData.tid);
assert.strictEqual(inboxed, false);
});
}); });
describe('Deletion', () => { describe('Deletion', () => {