ltlapy/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Purge deleted users from user lookup caches

Browse source
This commit is contained in:
Laura Hausmann 2023-09-05 20:15:23 +02:00
parent 9e5f96b9ad
commit c6dee2da09
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/queue/processors/db/delete-account.ts
View file

@ -8,6 +8,7 @@ import { MoreThan } from "typeorm";
import { deleteFileSync } from "@/services/drive/delete-file.js"; import { deleteFileSync } from "@/services/drive/delete-file.js";
import { sendEmail } from "@/services/send-email.js"; import { sendEmail } from "@/services/send-email.js";
import meilisearch from "@/db/meilisearch.js"; import meilisearch from "@/db/meilisearch.js";
import { publishInternalEvent } from "@/services/stream.js";
const logger = queueLogger.createSubLogger("delete-account"); const logger = queueLogger.createSubLogger("delete-account");
@ -18,6 +19,7 @@ export async function deleteAccount(
const user = await Users.findOneBy({ id: job.data.user.id }); const user = await Users.findOneBy({ id: job.data.user.id });
if (!user) return; if (!user) return;
const isLocal = Users.isLocalUser(user);
{ {
// Delete notes // Delete notes
@ -98,6 +100,7 @@ export async function deleteAccount(
// nop // nop
} else { } else {
await Users.delete(job.data.user.id); await Users.delete(job.data.user.id);
publishInternalEvent(isLocal ? "localUserDeleted" : "remoteUserDeleted", { id: user.id });
} }
return "Account deleted"; return "Account deleted";

6
packages/backend/src/server/api/stream/types.ts
View file

@ -38,9 +38,15 @@ export interface InternalStreamTypes {
localUserUpdated: { localUserUpdated: {
id: User["id"]; id: User["id"];
}; };
localUserDeleted: {
id: User["id"];
};
remoteUserUpdated: { remoteUserUpdated: {
id: User["id"]; id: User["id"];
}; };
remoteUserDeleted: {
id: User["id"];
};
webhookCreated: Webhook; webhookCreated: Webhook;
webhookDeleted: Webhook; webhookDeleted: Webhook;
webhookUpdated: Webhook; webhookUpdated: Webhook;

21
packages/backend/src/services/user-cache.ts
View file

@ -27,6 +27,19 @@ subscriber.on("message", async (_, data) => {
if (obj.channel === "internal") { if (obj.channel === "internal") {
const { type, body } = obj.message; const { type, body } = obj.message;
switch (type) { switch (type) {
case "localUserDeleted": {
await userByIdCache.delete(body.id);
await localUserByIdCache.delete(body.id);
const toDelete = Array.from(await localUserByNativeTokenCache.getAll())
.filter((v) => v[1]?.id === body.id)
.map((v) => v[0]);
await localUserByNativeTokenCache.delete(...toDelete);
const uriCacheToDelete = Array.from(await uriPersonCache.getAll())
.filter((v) => v[1]?.id === body.id)
.map((v) => v[0]);
await uriPersonCache.delete(...uriCacheToDelete);
break;
}
case "localUserUpdated": { case "localUserUpdated": {
await userByIdCache.delete(body.id); await userByIdCache.delete(body.id);
await localUserByIdCache.delete(body.id); await localUserByIdCache.delete(body.id);
@ -55,6 +68,14 @@ subscriber.on("message", async (_, data) => {
} }
break; break;
} }
case "remoteUserDeleted": {
await userByIdCache.delete(body.id);
const toDelete = Array.from(await uriPersonCache.getAll())
.filter((v) => v[1]?.id === body.id)
.map((v) => v[0]);
await uriPersonCache.delete(...toDelete);
break;
}
case "userTokenRegenerated": { case "userTokenRegenerated": {
const user = (await Users.findOneByOrFail({ const user = (await Users.findOneByOrFail({
id: body.id, id: body.id,