Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-07 15:20:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter out non-asserted targets when sending ap messages, diff. getter method when passed-in ID is a remote category

Browse Source
This commit is contained in:
Julian Lam
2025-03-24 14:29:26 -04:00
parent c5901e0d24
commit 309deb0d7a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/activitypub/index.js
View File

@@ -8,6 +8,7 @@ const { CronJob } = require('cron');
const request = require('../request'); const request = require('../request');
const db = require('../database'); const db = require('../database');
const meta = require('../meta'); const meta = require('../meta');
const categories = require('../categories');
const posts = require('../posts'); const posts = require('../posts');
const messaging = require('../messaging'); const messaging = require('../messaging');
const user = require('../user'); const user = require('../user');
@@ -114,8 +115,15 @@ ActivityPub.resolveInboxes = async (ids) => {
} }
await ActivityPub.actors.assert(ids); await ActivityPub.actors.assert(ids);
// Remove non-asserted targets
const exists = await db.isSortedSetMembers('usersRemote:lastCrawled', ids);
ids = ids.filter((_, idx) => exists[idx]);
const isCategory = await db.exists(ids.map(id => `categoryRemote:${id}`));
await batch.processArray(ids, async (currentIds) => { await batch.processArray(ids, async (currentIds) => {
const usersData = await user.getUsersFields(currentIds, ['inbox', 'sharedInbox']); const method = isCategory ? categories.getCategoriesFields : user.getUsersFields;
const usersData = await method(currentIds, ['inbox', 'sharedInbox']);
usersData.forEach((u) => { usersData.forEach((u) => {
if (u && (u.sharedInbox || u.inbox)) { if (u && (u.sharedInbox || u.inbox)) {
inboxes.add(u.sharedInbox || u.inbox); inboxes.add(u.sharedInbox || u.inbox);