summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorCyberRex <hspwinx86@gmail.com>2023-03-22 08:58:23 +0900
committerGitHub <noreply@github.com>2023-03-22 08:58:23 +0900
commit7331de0bcef74bde0789259830f98be2b063de57 (patch)
treede7fd2a258b716f1bc37cd051b5503f445b00c16 /packages/backend/src
parentNew Crowdin updates (#10369) (diff)
downloadsharkey-7331de0bcef74bde0789259830f98be2b063de57.tar.gz
sharkey-7331de0bcef74bde0789259830f98be2b063de57.tar.bz2
sharkey-7331de0bcef74bde0789259830f98be2b063de57.zip
feat: queue force promote (#10370)
* feat: queue force promote * Update CHANGELOG.md * small fix
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/server/api/EndpointsModule.ts4
-rw-r--r--packages/backend/src/server/api/endpoints.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/admin/queue/promote.ts52
3 files changed, 58 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts
index 516e90dcb3..835e884193 100644
--- a/packages/backend/src/server/api/EndpointsModule.ts
+++ b/packages/backend/src/server/api/EndpointsModule.ts
@@ -42,6 +42,7 @@ import * as ep___admin_promo_create from './endpoints/admin/promo/create.js';
import * as ep___admin_queue_clear from './endpoints/admin/queue/clear.js';
import * as ep___admin_queue_deliverDelayed from './endpoints/admin/queue/deliver-delayed.js';
import * as ep___admin_queue_inboxDelayed from './endpoints/admin/queue/inbox-delayed.js';
+import * as ep___admin_queue_promote from './endpoints/admin/queue/promote.js';
import * as ep___admin_queue_stats from './endpoints/admin/queue/stats.js';
import * as ep___admin_relays_add from './endpoints/admin/relays/add.js';
import * as ep___admin_relays_list from './endpoints/admin/relays/list.js';
@@ -370,6 +371,7 @@ const $admin_promo_create: Provider = { provide: 'ep:admin/promo/create', useCla
const $admin_queue_clear: Provider = { provide: 'ep:admin/queue/clear', useClass: ep___admin_queue_clear.default };
const $admin_queue_deliverDelayed: Provider = { provide: 'ep:admin/queue/deliver-delayed', useClass: ep___admin_queue_deliverDelayed.default };
const $admin_queue_inboxDelayed: Provider = { provide: 'ep:admin/queue/inbox-delayed', useClass: ep___admin_queue_inboxDelayed.default };
+const $admin_queue_promote: Provider = { provide: 'ep:admin/queue/promote', useClass: ep___admin_queue_promote.default };
const $admin_queue_stats: Provider = { provide: 'ep:admin/queue/stats', useClass: ep___admin_queue_stats.default };
const $admin_relays_add: Provider = { provide: 'ep:admin/relays/add', useClass: ep___admin_relays_add.default };
const $admin_relays_list: Provider = { provide: 'ep:admin/relays/list', useClass: ep___admin_relays_list.default };
@@ -702,6 +704,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$admin_queue_clear,
$admin_queue_deliverDelayed,
$admin_queue_inboxDelayed,
+ $admin_queue_promote,
$admin_queue_stats,
$admin_relays_add,
$admin_relays_list,
@@ -1028,6 +1031,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$admin_queue_clear,
$admin_queue_deliverDelayed,
$admin_queue_inboxDelayed,
+ $admin_queue_promote,
$admin_queue_stats,
$admin_relays_add,
$admin_relays_list,
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 2930468a22..f6fc79fc70 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -42,6 +42,7 @@ import * as ep___admin_promo_create from './endpoints/admin/promo/create.js';
import * as ep___admin_queue_clear from './endpoints/admin/queue/clear.js';
import * as ep___admin_queue_deliverDelayed from './endpoints/admin/queue/deliver-delayed.js';
import * as ep___admin_queue_inboxDelayed from './endpoints/admin/queue/inbox-delayed.js';
+import * as ep___admin_queue_promote from './endpoints/admin/queue/promote.js';
import * as ep___admin_queue_stats from './endpoints/admin/queue/stats.js';
import * as ep___admin_relays_add from './endpoints/admin/relays/add.js';
import * as ep___admin_relays_list from './endpoints/admin/relays/list.js';
@@ -368,6 +369,7 @@ const eps = [
['admin/queue/clear', ep___admin_queue_clear],
['admin/queue/deliver-delayed', ep___admin_queue_deliverDelayed],
['admin/queue/inbox-delayed', ep___admin_queue_inboxDelayed],
+ ['admin/queue/promote', ep___admin_queue_promote],
['admin/queue/stats', ep___admin_queue_stats],
['admin/relays/add', ep___admin_relays_add],
['admin/relays/list', ep___admin_relays_list],
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
new file mode 100644
index 0000000000..4e57e6613e
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
@@ -0,0 +1,52 @@
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ requireCredential: true,
+ requireModerator: true,
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ type: { type: 'string', enum: ['deliver', 'inbox'] },
+ },
+ required: ['type'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+ constructor(
+ private moderationLogService: ModerationLogService,
+ private queueService: QueueService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ let delayedQueues;
+
+ switch (ps.type) {
+ case 'deliver':
+ delayedQueues = await this.queueService.deliverQueue.getDelayed();
+ for (let queueIndex = 0; queueIndex < delayedQueues.length; queueIndex++) {
+ const queue = delayedQueues[queueIndex];
+ await queue.promote();
+ }
+ break;
+
+ case 'inbox':
+ delayedQueues = await this.queueService.inboxQueue.getDelayed();
+ for (let queueIndex = 0; queueIndex < delayedQueues.length; queueIndex++) {
+ const queue = delayedQueues[queueIndex];
+ await queue.promote();
+ }
+ break;
+ }
+
+ this.moderationLogService.insertModerationLog(me, 'promoteQueue');
+ });
+ }
+}