HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request '[PR]: fix: skip deleting remote actor if not found or already deleted' (#10310) from nmkj/calckey:fix-delete-actor into develop

Browse source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10310
This commit is contained in:
Kainoa Kanter 2023-06-16 16:49:59 +00:00
commit 5cccb3378c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,9 +17,7 @@ export async function deleteAccount(
logger.info(`Deleting account of ${job.data.user.id} ...`); logger.info(`Deleting account of ${job.data.user.id} ...`);
const user = await Users.findOneBy({ id: job.data.user.id }); const user = await Users.findOneBy({ id: job.data.user.id });
if (user == null) { if (!user) return;
return;
}
{ {
// Delete notes // Delete notes

8
packages/backend/src/remote/activitypub/kernel/delete/actor.ts
View file

@ -15,9 +15,11 @@ export async function deleteActor(
return `skip: delete actor ${actor.uri} !== ${uri}`; return `skip: delete actor ${actor.uri} !== ${uri}`;
} }
const user = await Users.findOneByOrFail({ id: actor.id }); const user = await Users.findOneBy({ id: actor.id });
if (user.isDeleted) { if (!user) {
logger.info("skip: already deleted"); return `skip: actor ${actor.id} not found in the local database`;
} else if (user.isDeleted) {
return `skip: user ${user.id} already deleted`;
} }
const job = await createDeleteAccountJob(actor); const job = await createDeleteAccountJob(actor);