1 files changed, 15 insertions, 1 deletions
diff --git a/packages/backend/src/misc/is-retryable-error.ts b/packages/backend/src/misc/is-retryable-error.ts
index 9bb8700c7a..63b561b280 100644
--- a/packages/backend/src/misc/is-retryable-error.ts
+++ b/packages/backend/src/misc/is-retryable-error.ts
@@ -3,20 +3,34 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { AbortError } from 'node-fetch';
+import { AbortError, FetchError } from 'node-fetch';
 import { UnrecoverableError } from 'bullmq';
 import { StatusError } from '@/misc/status-error.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { CaptchaError, captchaErrorCodes } from '@/core/CaptchaService.js';
+import { FastifyReplyError } from '@/misc/fastify-reply-error.js';
+import { ConflictError } from '@/server/SkRateLimiterService.js';
 
 /**
  * Returns false if the provided value represents a "permanent" error that cannot be retried.
  * Returns true if the error is retryable, unknown (as all errors are retryable by default), or not an error object.
  */
 export function isRetryableError(e: unknown): boolean {
+	if (e instanceof AggregateError) return e.errors.every(inner => isRetryableError(inner));
 	if (e instanceof StatusError) return e.isRetryable;
 	if (e instanceof IdentifiableError) return e.isRetryable;
+	if (e instanceof CaptchaError) {
+		if (e.code === captchaErrorCodes.verificationFailed) return false;
+		if (e.code === captchaErrorCodes.invalidParameters) return false;
+		if (e.code === captchaErrorCodes.invalidProvider) return false;
+		return true;
+	}
+	if (e instanceof FastifyReplyError) return false;
+	if (e instanceof ConflictError) return true;
 	if (e instanceof UnrecoverableError) return false;
 	if (e instanceof AbortError) return true;
+	if (e instanceof FetchError) return true;
+	if (e instanceof SyntaxError) return false;
 	if (e instanceof Error) return e.name === 'AbortError';
 	return true;
 }