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: getLocalFollowCounts, show non existing deletes

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2025-02-11 13:45:38 -05:00
parent 70a9f6d337
commit cfbb8ff887
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/activitypub/actors.js
View File

@@ -2,6 +2,7 @@
const nconf = require('nconf'); const nconf = require('nconf');
const winston = require('winston'); const winston = require('winston');
const _ = require('lodash');
const db = require('../database'); const db = require('../database');
const meta = require('../meta'); const meta = require('../meta');
@@ -244,12 +245,17 @@ Actors.getLocalFollowCounts = async (actors) => {
db.sortedSetsCard(followerKeys), db.sortedSetsCard(followerKeys),
db.sortedSetsCard(followingKeys), db.sortedSetsCard(followingKeys),
]); ]);
const actorToCounts = _.zipObject(validActors, validActors.map(
const results = actors.map((actor, index) => { (a, idx) => ({ followers: followersCounts[idx], following: followingCounts[idx] })
if (!validActors.includes(actor)) { ));
const results = actors.map((actor) => {
if (!actorToCounts.hasOwnProperty(actor)) {
return { followers: 0, following: 0 }; return { followers: 0, following: 0 };
} }
return { followers: followersCounts[index], following: followingCounts[index] }; return {
followers: actorToCounts[actor].followers,
following: actorToCounts[actor].following,
};
}); });
return isArray ? results : results[0]; return isArray ? results : results[0];
@@ -306,13 +312,12 @@ Actors.prune = async () => {
winston.info(`[actors/prune] Found ${uids.length} remote users last crawled more than ${days} days ago`); winston.info(`[actors/prune] Found ${uids.length} remote users last crawled more than ${days} days ago`);
let deletionCount = 0; let deletionCount = 0;
let deletionCountNonExisting = 0;
await batch.processArray(uids, async (uids) => { await batch.processArray(uids, async (uids) => {
const exists = await db.exists(uids.map(uid => `userRemote:${uid}`)); const exists = await db.exists(uids.map(uid => `userRemote:${uid}`));
const uidsThatExist = uids.filter((uid, idx) => exists[idx]); const uidsThatExist = uids.filter((uid, idx) => exists[idx]);
const uidsThatDontExist = uids.filter((uid, idx) => !exists[idx]); const uidsThatDontExist = uids.filter((uid, idx) => !exists[idx]);
await db.sortedSetRemove('usersRemote:lastCrawled', uidsThatDontExist);
const [postCounts, roomCounts, followCounts] = await Promise.all([ const [postCounts, roomCounts, followCounts] = await Promise.all([
db.sortedSetsCard(uidsThatExist.map(uid => `uid:${uid}:posts`)), db.sortedSetsCard(uidsThatExist.map(uid => `uid:${uid}:posts`)),
@@ -333,10 +338,13 @@ Actors.prune = async () => {
} }
} }
})); }));
deletionCountNonExisting += uidsThatDontExist.length;
await db.sortedSetRemove('usersRemote:lastCrawled', uidsThatDontExist);
}, { }, {
batch: 50, batch: 50,
interval: 1000, interval: 1000,
}); });
winston.info(`[actors/prune] ${deletionCount} remote users pruned.`); winston.info(`[actors/prune] ${deletionCount} remote users pruned. ${deletionCountNonExisting} does not exist`);
}; };