From 362541f4ae0c9fd9565e790288cf6546e4cbf0c2 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 8 Apr 2025 14:00:24 -0400
Subject: [PATCH] fix: remote bare hash for remote users on prune as well

---
 src/activitypub/actors.js | 3 ---
 src/user/delete.js        | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/activitypub/actors.js b/src/activitypub/actors.js
index 58f52ac101..23bcc2b19e 100644
--- a/src/activitypub/actors.js
+++ b/src/activitypub/actors.js
@@ -624,9 +624,6 @@ Actors.prune = async () => {
 		uids = Array.from(uids);
 		cids = Array.from(cids);
 
-		// const uidsThatExist = ids.filter((uid, idx) => exists[idx]);
-		// const uidsThatDontExist = ids.filter((uid, idx) => !exists[idx]);
-
 		// Remote users
 		const [postCounts, roomCounts, followCounts] = await Promise.all([
 			db.sortedSetsCard(uids.map(uid => `uid:${uid}:posts`)),
diff --git a/src/user/delete.js b/src/user/delete.js
index 39f2b3cde4..8b084b184b 100644
--- a/src/user/delete.js
+++ b/src/user/delete.js
@@ -159,9 +159,10 @@ module.exports = function (User) {
 			activitypub.actors.remove(uid),
 		]);
 		await db.deleteAll([
-			`followers:${uid}`, `following:${uid}`, `user:${uid}`,
+			`followers:${uid}`, `following:${uid}`,
 			`uid:${uid}:followed_tags`, `uid:${uid}:followed_tids`,
 			`uid:${uid}:ignored_tids`,
+			`${utils.isNumber(uid) ? 'user' : 'userRemote'}:${uid}`,
 		]);
 		delete deletesInProgress[uid];
 		return userData;