diff options
| author | Amelia Yukii <amelia.yukii@shourai.de> | 2024-03-02 16:36:49 +0000 |
|---|---|---|
| committer | Amelia Yukii <amelia.yukii@shourai.de> | 2024-03-02 16:36:49 +0000 |
| commit | 46c664348e53b1eef17983f83ed539490122e1a8 (patch) | |
| tree | 6d23f6739482466abcc71965cd83f9bbfb2c3ae0 /packages/backend/src/queue/processors/InboxProcessorService.ts | |
| parent | merge: Fix Images in ReadMe (!445) (diff) | |
| parent | merge upstream for 2024.2.1 (diff) | |
| download | sharkey-46c664348e53b1eef17983f83ed539490122e1a8.tar.gz sharkey-46c664348e53b1eef17983f83ed539490122e1a8.tar.bz2 sharkey-46c664348e53b1eef17983f83ed539490122e1a8.zip | |
merge: merge upstream for 2024.2.1 (!446)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/446
Closes #434
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
Diffstat (limited to 'packages/backend/src/queue/processors/InboxProcessorService.ts')
| -rw-r--r-- | packages/backend/src/queue/processors/InboxProcessorService.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index d5e103abe3..ad1d9799a7 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -196,7 +196,10 @@ export class InboxProcessorService { await this.apInboxService.performActivity(authUser.user, activity); } catch (e) { if (e instanceof IdentifiableError) { - if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') return 'blocked notes with prohibited words'; + if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') { + return 'blocked notes with prohibited words'; + } + if (e.id === '85ab9bd7-3a41-4530-959d-f07073900109') return 'actor has been suspended'; } throw e; } |