Merge pull request #11301 from misskey-dev/develop

Release: 13.14.0

1 files changed, 23 insertions, 3 deletions

diff --git a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
index 4e57e6613e..8330d6c82f 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
@@ -33,15 +33,35 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					delayedQueues = await this.queueService.deliverQueue.getDelayed();
 					for (let queueIndex = 0; queueIndex < delayedQueues.length; queueIndex++) {
 						const queue = delayedQueues[queueIndex];
-						await queue.promote();
+						try {
+							await queue.promote();
+						} catch (e) {
+							if (e instanceof Error) {
+								if (e.message.indexOf('not in a delayed state') !== -1) {
+									throw e;
+								}
+							} else {
+								throw e;
+							}
+						}
 					}
 					break;
-				
+
 				case 'inbox':
 					delayedQueues = await this.queueService.inboxQueue.getDelayed();
 					for (let queueIndex = 0; queueIndex < delayedQueues.length; queueIndex++) {
 						const queue = delayedQueues[queueIndex];
-						await queue.promote();
+						try {
+							await queue.promote();
+						} catch (e) {
+							if (e instanceof Error) {
+								if (e.message.indexOf('not in a delayed state') !== -1) {
+									throw e;
+								}
+							} else {
+								throw e;
+							}
+						}
 					}
 					break;
 			}