natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skip if actor is not found or has been already deleted

This commit is contained in:
Namekuji 2023-06-16 04:36:11 -04:00
parent da6f611185
commit aa46f5f1bb
No known key found for this signature in database
GPG Key ID: B541BD6E646CABC7
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);