From af548d05ca821725eabd5a96241d3228b92186f0 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sat, 2 Mar 2024 16:36:49 +0000
Subject: merge upstream for 2024.2.1

---
 packages/backend/src/queue/processors/InboxProcessorService.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'packages/backend/src/queue/processors/InboxProcessorService.ts')

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;
 		}
-- 
cgit v1.2.3-freya