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: handle missing fullname in actor removal logic

Browse Source
This commit is contained in:
Julian Lam
2024-06-10 15:18:32 -04:00
parent 6272d059e7
commit ae3fa85f40
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/activitypub/actors.js
View File

@@ -227,11 +227,15 @@ Actors.remove = async (id) => {
let { username, fullname, url, followersUrl } = await user.getUserFields(id, ['username', 'fullname', 'url', 'followersUrl']); let { username, fullname, url, followersUrl } = await user.getUserFields(id, ['username', 'fullname', 'url', 'followersUrl']);
username = username.toLowerCase(); username = username.toLowerCase();
const bulkRemove = [
['ap.preferredUsername:sorted', `${username}:${id}`],
];
if (fullname) {
bulkRemove.push(['ap.name:sorted', `${fullname.toLowerCase()}:${id}`]);
}
await Promise.all([ await Promise.all([
db.sortedSetRemoveBulk([ db.sortedSetRemoveBulk(bulkRemove),
['ap.preferredUsername:sorted', `${username}:${id}`],
['ap.name:sorted', `${fullname.toLowerCase()}:${id}`],
]),
db.deleteObjectField('handle:uid', username), db.deleteObjectField('handle:uid', username),
db.deleteObjectField('followersUrl:uid', followersUrl), db.deleteObjectField('followersUrl:uid', followersUrl),
db.deleteObjectField('remoteUrl:uid', url), db.deleteObjectField('remoteUrl:uid', url),
@@ -249,17 +253,17 @@ Actors.prune = async () => {
* Clear out remote user accounts that do not have content on the forum anywhere * Clear out remote user accounts that do not have content on the forum anywhere
* Re-crawl those that have not been updated recently * Re-crawl those that have not been updated recently
*/ */
winston.verbose('[actors/prune] Started scheduled pruning of remote user accounts'); winston.info('[actors/prune] Started scheduled pruning of remote user accounts');
const days = parseInt(meta.config.activitypubUserPruneDays, 10); const days = parseInt(meta.config.activitypubUserPruneDays, 10);
const timestamp = Date.now() - (1000 * 60 * 60 * 24 * days); const timestamp = Date.now() - (1000 * 60 * 60 * 24 * days);
const uids = await db.getSortedSetRangeByScore('usersRemote:lastCrawled', 0, -1, 0, timestamp); const uids = await db.getSortedSetRangeByScore('usersRemote:lastCrawled', 0, -1, 0, timestamp);
if (!uids.length) { if (!uids.length) {
winston.verbose('[actors/prune] No remote users to prune, all done.'); winston.info('[actors/prune] No remote users to prune, all done.');
return; return;
} }
winston.verbose(`[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;
const reassertionSet = new Set(); const reassertionSet = new Set();
@@ -286,7 +290,7 @@ Actors.prune = async () => {
interval: 1000, interval: 1000,
}); });
winston.verbose(`[actors/prune] ${deletionCount} remote users pruned, re-asserting ${reassertionSet.size} remote users.`); winston.info(`[actors/prune] ${deletionCount} remote users pruned, re-asserting ${reassertionSet.size} remote users.`);
await Actors.assert(Array.from(reassertionSet), { update: true }); await Actors.assert(Array.from(reassertionSet), { update: true });
}; };