From a38d0c14abf596b649bb78d233d45321683a2fd3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 26 Mar 2024 16:41:51 -0400 Subject: [PATCH] Revert "refactor: use getSortedSetUnion in syncUserInboxes instead" This reverts commit 6c1a0fb1dccd5a813f093b073080d82ab0ff8ea0. --- src/activitypub/notes.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/activitypub/notes.js b/src/activitypub/notes.js index 597c632b43..5604ecff3a 100644 --- a/src/activitypub/notes.js +++ b/src/activitypub/notes.js @@ -318,15 +318,12 @@ Notes.syncUserInboxes = async function (tid) { ]); pids.unshift(mainPid); - const uids = await db.getSortedSetUnion({ - sets: pids.map(id => `post:${id}:recipients`), - start: 0, - stop: -1, - }); - const keys = uids.map(uid => `uid:${uid}:inbox`); + const recipients = await db.getSetsMembers(pids.map(id => `post:${id}:recipients`)); + const uids = recipients.reduce((set, uids) => new Set([...set, ...uids.map(u => parseInt(u, 10))]), new Set()); + const keys = Array.from(uids).map(uid => `uid:${uid}:inbox`); const score = await db.sortedSetScore(`cid:${cid}:tids`, tid); - winston.verbose(`[activitypub/syncUserInboxes] Syncing tid ${tid} with ${uids.length} inboxes`); + winston.verbose(`[activitypub/syncUserInboxes] Syncing tid ${tid} with ${uids.size} inboxes`); await db.sortedSetsAdd(keys, keys.map(() => score || Date.now()), tid); };