Merge branch 'misskey-dev:develop' into disable-reconnect-alert

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 2025.4.1
 
 ### General
+- Feat: bull-boardに代わるジョブキューの管理ツールが実装されました
 - Enhance: チャットの新規メッセージをプッシュ通知するように
 
 ### Client
@@ -18,6 +19,7 @@
 - Fix: アカウントの移行時にアンテナのフィルターのユーザが更新されない問題を修正 #15843
 
 ### Server
+- Enhance: ジョブキューの成功/失敗したジョブも一定数・一定期間保存するようにし、後から問題を調査することを容易に
 - Enhance: フォローしているユーザーならフォロワー限定投稿のノートでもアンテナで検知できるように  
 	(Cherry-picked from https://github.com/yojo-art/cherrypick/pull/568 and https://github.com/team-shahu/misskey/pull/38)
 - Fix: システムアカウントの名前がサーバー名と同期されない問題を修正

locales/index.d.ts

@@ -5398,6 +5398,10 @@ export interface Locale extends ILocale {
      * デッキへ戻る
      */
     "goToDeck": string;
+    /**
+     * 連合ジョブ
+     */
+    "federationJobs": string;
     "_chat": {
         /**
          * まだメッセージはありません

locales/ja-JP.yml

@@ -1345,6 +1345,7 @@ embed: "埋め込み"
 settingsMigrating: "設定を移行しています。しばらくお待ちください... (後ほど、設定→その他→旧設定情報を移行 で手動で移行することもできます)"
 readonly: "読み取り専用"
 goToDeck: "デッキへ戻る"
+federationJobs: "連合ジョブ"
 
 _chat:
   noMessagesYet: "まだメッセージはありません"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.4.1-alpha.1",
+	"version": "2025.4.1-alpha.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/package.json

@@ -93,6 +93,7 @@
 		"@swc/cli": "0.6.0",
 		"@swc/core": "1.11.18",
 		"@twemoji/parser": "15.1.1",
+		"@types/redis-info": "3.0.3",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
 		"archiver": "7.0.1",
@@ -111,7 +112,7 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "5.2.2",
+		"fastify": "5.3.2",
 		"fastify-raw-body": "5.0.0",
 		"feed": "4.2.2",
 		"file-type": "19.6.0",
@@ -159,6 +160,7 @@
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"re2": "1.21.4",
+		"redis-info": "3.1.0",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.2.2",
 		"rename": "1.0.4",

packages/backend/src/core/NoteCreateService.ts

@@ -576,7 +576,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 				noteId: note.id,
 			}, {
 				delay,
-				removeOnComplete: true,
+				removeOnComplete: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 30,
+				},
+				removeOnFail: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 100,
+				},
 			});
 		}
 

packages/backend/src/core/QueueService.ts

@@ -5,6 +5,8 @@
 
 import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
+import { MetricsTime, type JobType } from 'bullmq';
+import { parse as parseRedisInfo } from 'redis-info';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
@@ -69,50 +71,58 @@ export class QueueService {
 		this.systemQueue.add('tickCharts', {
 		}, {
 			repeat: { pattern: '55 * * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 
 		this.systemQueue.add('resyncCharts', {
 		}, {
 			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 
 		this.systemQueue.add('cleanCharts', {
 		}, {
 			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 
 		this.systemQueue.add('aggregateRetention', {
 		}, {
 			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 
 		this.systemQueue.add('clean', {
 		}, {
 			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 
 		this.systemQueue.add('checkExpiredMutings', {
 		}, {
 			repeat: { pattern: '*/5 * * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 
 		this.systemQueue.add('bakeBufferedReactions', {
 		}, {
 			repeat: { pattern: '0 0 * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 
 		this.systemQueue.add('checkModeratorsActivity', {
 		}, {
 			// 毎時30分に起動
 			repeat: { pattern: '30 * * * *' },
-			removeOnComplete: true,
+			removeOnComplete: 10,
+			removeOnFail: 30,
 		});
 	}
 
@@ -134,13 +144,21 @@ export class QueueService {
 			isSharedInbox,
 		};
 
-		return this.deliverQueue.add(to, data, {
+		const label = to.replace('https://', '').replace('/inbox', '');
+
+		return this.deliverQueue.add(label, data, {
 			attempts: this.config.deliverJobMaxAttempts ?? 12,
 			backoff: {
 				type: 'custom',
 			},
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -162,12 +180,18 @@ export class QueueService {
 			backoff: {
 				type: 'custom',
 			},
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		};
 
 		await this.deliverQueue.addBulk(Array.from(inboxes.entries(), d => ({
-			name: d[0],
+			name: d[0].replace('https://', '').replace('/inbox', ''),
 			data: {
 				user,
 				content: contentBody,
@@ -188,13 +212,21 @@ export class QueueService {
 			signature,
 		};
 
-		return this.inboxQueue.add('', data, {
+		const label = (activity.id ?? '').replace('https://', '').replace('/activity', '');
+
+		return this.inboxQueue.add(label, data, {
 			attempts: this.config.inboxJobMaxAttempts ?? 8,
 			backoff: {
 				type: 'custom',
 			},
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -203,8 +235,14 @@ export class QueueService {
 		return this.dbQueue.add('deleteDriveFiles', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -213,8 +251,14 @@ export class QueueService {
 		return this.dbQueue.add('exportCustomEmojis', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -223,8 +267,14 @@ export class QueueService {
 		return this.dbQueue.add('exportNotes', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -233,8 +283,14 @@ export class QueueService {
 		return this.dbQueue.add('exportClips', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -243,8 +299,14 @@ export class QueueService {
 		return this.dbQueue.add('exportFavorites', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -255,8 +317,14 @@ export class QueueService {
 			excludeMuting,
 			excludeInactive,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -265,8 +333,14 @@ export class QueueService {
 		return this.dbQueue.add('exportMuting', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -275,8 +349,14 @@ export class QueueService {
 		return this.dbQueue.add('exportBlocking', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -285,8 +365,14 @@ export class QueueService {
 		return this.dbQueue.add('exportUserLists', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -295,8 +381,14 @@ export class QueueService {
 		return this.dbQueue.add('exportAntennas', {
 			user: { id: user.id },
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -307,8 +399,14 @@ export class QueueService {
 			fileId: fileId,
 			withReplies,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -324,8 +422,14 @@ export class QueueService {
 			user: { id: user.id },
 			fileId: fileId,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -335,8 +439,14 @@ export class QueueService {
 			user: { id: user.id },
 			fileId: fileId,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -356,8 +466,14 @@ export class QueueService {
 			name,
 			data,
 			opts: {
-				removeOnComplete: true,
+				removeOnComplete: {
-				removeOnFail: true,
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 30,
+				},
+				removeOnFail: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 100,
+				},
 			},
 		};
 	}
@@ -368,8 +484,14 @@ export class QueueService {
 			user: { id: user.id },
 			fileId: fileId,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -379,8 +501,14 @@ export class QueueService {
 			user: { id: user.id },
 			fileId: fileId,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -390,8 +518,14 @@ export class QueueService {
 			user: { id: user.id },
 			antenna,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -401,8 +535,14 @@ export class QueueService {
 			user: { id: user.id },
 			soft: opts.soft,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -452,8 +592,14 @@ export class QueueService {
 				withReplies: data.withReplies,
 			},
 			opts: {
-				removeOnComplete: true,
+				removeOnComplete: {
-				removeOnFail: true,
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 30,
+				},
+				removeOnFail: {
+					age: 3600 * 24 * 7, // keep up to 7 days
+					count: 100,
+				},
 				...opts,
 			},
 		};
@@ -464,16 +610,28 @@ export class QueueService {
 		return this.objectStorageQueue.add('deleteFile', {
 			key: key,
 		}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
 	@bindThis
 	public createCleanRemoteFilesJob() {
 		return this.objectStorageQueue.add('cleanRemoteFiles', {}, {
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -504,8 +662,14 @@ export class QueueService {
 			backoff: {
 				type: 'custom',
 			},
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
@@ -535,13 +699,19 @@ export class QueueService {
 			backoff: {
 				type: 'custom',
 			},
-			removeOnComplete: true,
+			removeOnComplete: {
-			removeOnFail: true,
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 30,
+			},
+			removeOnFail: {
+				age: 3600 * 24 * 7, // keep up to 7 days
+				count: 100,
+			},
 		});
 	}
 
 	@bindThis
-	private getQueue(type: typeof QUEUE_TYPES[number]) {
+	private getQueue(type: typeof QUEUE_TYPES[number]): Bull.Queue {
 		switch (type) {
 			case 'system': return this.systemQueue;
 			case 'endedPollNotification': return this.endedPollNotificationQueue;
@@ -557,19 +727,173 @@ export class QueueService {
 	}
 
 	@bindThis
-	public clearQueue(queueType: typeof QUEUE_TYPES[number], state: '*' | 'completed' | 'wait' | 'active' | 'paused' | 'prioritized' | 'delayed' | 'failed') {
+	public async queueClear(queueType: typeof QUEUE_TYPES[number], state: '*' | 'completed' | 'wait' | 'active' | 'paused' | 'prioritized' | 'delayed' | 'failed') {
 		const queue = this.getQueue(queueType);
 
 		if (state === '*') {
-			queue.clean(0, 0, 'completed');
+			await Promise.all([
-			queue.clean(0, 0, 'wait');
+				queue.clean(0, 0, 'completed'),
-			queue.clean(0, 0, 'active');
+				queue.clean(0, 0, 'wait'),
-			queue.clean(0, 0, 'paused');
+				queue.clean(0, 0, 'active'),
-			queue.clean(0, 0, 'prioritized');
+				queue.clean(0, 0, 'paused'),
-			queue.clean(0, 0, 'delayed');
+				queue.clean(0, 0, 'prioritized'),
-			queue.clean(0, 0, 'failed');
+				queue.clean(0, 0, 'delayed'),
+				queue.clean(0, 0, 'failed'),
+			]);
 		} else {
-			queue.clean(0, 0, state);
+			await queue.clean(0, 0, state);
 		}
 	}
+
+	@bindThis
+	public async queuePromoteJobs(queueType: typeof QUEUE_TYPES[number]) {
+		const queue = this.getQueue(queueType);
+		await queue.promoteJobs();
+	}
+
+	@bindThis
+	public async queueRetryJob(queueType: typeof QUEUE_TYPES[number], jobId: string) {
+		const queue = this.getQueue(queueType);
+		const job: Bull.Job | null = await queue.getJob(jobId);
+		if (job) {
+			if (job.finishedOn != null) {
+				await job.retry();
+			} else {
+				await job.promote();
+			}
+		}
+	}
+
+	@bindThis
+	public async queueRemoveJob(queueType: typeof QUEUE_TYPES[number], jobId: string) {
+		const queue = this.getQueue(queueType);
+		const job: Bull.Job | null = await queue.getJob(jobId);
+		if (job) {
+			await job.remove();
+		}
+	}
+
+	@bindThis
+	private packJobData(job: Bull.Job) {
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		const stacktrace = job.stacktrace ? job.stacktrace.filter(Boolean) : [];
+		stacktrace.reverse();
+
+		return {
+			id: job.id,
+			name: job.name,
+			data: job.data,
+			opts: job.opts,
+			timestamp: job.timestamp,
+			processedOn: job.processedOn,
+			processedBy: job.processedBy,
+			finishedOn: job.finishedOn,
+			progress: job.progress,
+			attempts: job.attemptsMade,
+			delay: job.delay,
+			failedReason: job.failedReason,
+			stacktrace: stacktrace,
+			returnValue: job.returnvalue,
+			isFailed: !!job.failedReason || (Array.isArray(stacktrace) && stacktrace.length > 0),
+		};
+	}
+
+	@bindThis
+	public async queueGetJob(queueType: typeof QUEUE_TYPES[number], jobId: string) {
+		const queue = this.getQueue(queueType);
+		const job: Bull.Job | null = await queue.getJob(jobId);
+		if (job) {
+			return this.packJobData(job);
+		} else {
+			throw new Error(`Job not found: ${jobId}`);
+		}
+	}
+
+	@bindThis
+	public async queueGetJobs(queueType: typeof QUEUE_TYPES[number], jobTypes: JobType[], search?: string) {
+		const RETURN_LIMIT = 100;
+		const queue = this.getQueue(queueType);
+		let jobs: Bull.Job[];
+
+		if (search) {
+			jobs = await queue.getJobs(jobTypes, 0, 1000);
+
+			jobs = jobs.filter(job => {
+				const jobString = JSON.stringify(job).toLowerCase();
+				return search.toLowerCase().split(' ').every(term => {
+					return jobString.includes(term);
+				});
+			});
+
+			jobs = jobs.slice(0, RETURN_LIMIT);
+		} else {
+			jobs = await queue.getJobs(jobTypes, 0, RETURN_LIMIT);
+		}
+
+		return jobs.map(job => this.packJobData(job));
+	}
+
+	@bindThis
+	public async queueGetQueues() {
+		const fetchings = QUEUE_TYPES.map(async type => {
+			const queue = this.getQueue(type);
+
+			const counts = await queue.getJobCounts();
+			const isPaused = await queue.isPaused();
+			const metrics_completed = await queue.getMetrics('completed', 0, MetricsTime.ONE_WEEK);
+			const metrics_failed = await queue.getMetrics('failed', 0, MetricsTime.ONE_WEEK);
+
+			return {
+				name: type,
+				counts: counts,
+				isPaused,
+				metrics: {
+					completed: metrics_completed,
+					failed: metrics_failed,
+				},
+			};
+		});
+
+		return await Promise.all(fetchings);
+	}
+
+	@bindThis
+	public async queueGetQueue(queueType: typeof QUEUE_TYPES[number]) {
+		const queue = this.getQueue(queueType);
+		const counts = await queue.getJobCounts();
+		const isPaused = await queue.isPaused();
+		const metrics_completed = await queue.getMetrics('completed', 0, MetricsTime.ONE_WEEK);
+		const metrics_failed = await queue.getMetrics('failed', 0, MetricsTime.ONE_WEEK);
+		const db = parseRedisInfo(await (await queue.client).info());
+
+		return {
+			name: queueType,
+			qualifiedName: queue.qualifiedName,
+			counts: counts,
+			isPaused,
+			metrics: {
+				completed: metrics_completed,
+				failed: metrics_failed,
+			},
+			db: {
+				version: db.redis_version,
+				mode: db.redis_mode,
+				runId: db.run_id,
+				processId: db.process_id,
+				port: parseInt(db.tcp_port),
+				os: db.os,
+				uptime: parseInt(db.uptime_in_seconds),
+				memory: {
+					total: parseInt(db.total_system_memory) || parseInt(db.maxmemory),
+					used: parseInt(db.used_memory),
+					fragmentationRatio: parseInt(db.mem_fragmentation_ratio),
+					peak: parseInt(db.used_memory_peak),
+				},
+				clients: {
+					connected: parseInt(db.connected_clients),
+					blocked: parseInt(db.blocked_clients),
+				},
+			},
+		};
+	}
 }

packages/backend/src/queue/QueueProcessorService.ts

@@ -44,7 +44,7 @@ import { BakeBufferedReactionsProcessorService } from './processors/BakeBuffered
 import { CleanProcessorService } from './processors/CleanProcessorService.js';
 import { AggregateRetentionProcessorService } from './processors/AggregateRetentionProcessorService.js';
 import { QueueLoggerService } from './QueueLoggerService.js';
-import { QUEUE, baseQueueOptions } from './const.js';
+import { QUEUE, baseWorkerOptions } from './const.js';
 
 // ref. https://github.com/misskey-dev/misskey/pull/7635#issue-971097019
 function httpRelatedBackoff(attemptsMade: number) {
@@ -175,7 +175,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return processer(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.SYSTEM),
+				...baseWorkerOptions(this.config, QUEUE.SYSTEM),
 				autorun: false,
 			});
 
@@ -232,7 +232,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return processer(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.DB),
+				...baseWorkerOptions(this.config, QUEUE.DB),
 				autorun: false,
 			});
 
@@ -264,7 +264,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return this.deliverProcessorService.process(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.DELIVER),
+				...baseWorkerOptions(this.config, QUEUE.DELIVER),
 				autorun: false,
 				concurrency: this.config.deliverJobConcurrency ?? 128,
 				limiter: {
@@ -304,7 +304,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return this.inboxProcessorService.process(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.INBOX),
+				...baseWorkerOptions(this.config, QUEUE.INBOX),
 				autorun: false,
 				concurrency: this.config.inboxJobConcurrency ?? 16,
 				limiter: {
@@ -344,7 +344,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return this.userWebhookDeliverProcessorService.process(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.USER_WEBHOOK_DELIVER),
+				...baseWorkerOptions(this.config, QUEUE.USER_WEBHOOK_DELIVER),
 				autorun: false,
 				concurrency: 64,
 				limiter: {
@@ -384,7 +384,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return this.systemWebhookDeliverProcessorService.process(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.SYSTEM_WEBHOOK_DELIVER),
+				...baseWorkerOptions(this.config, QUEUE.SYSTEM_WEBHOOK_DELIVER),
 				autorun: false,
 				concurrency: 16,
 				limiter: {
@@ -434,7 +434,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return processer(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.RELATIONSHIP),
+				...baseWorkerOptions(this.config, QUEUE.RELATIONSHIP),
 				autorun: false,
 				concurrency: this.config.relationshipJobConcurrency ?? 16,
 				limiter: {
@@ -479,7 +479,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return processer(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.OBJECT_STORAGE),
+				...baseWorkerOptions(this.config, QUEUE.OBJECT_STORAGE),
 				autorun: false,
 				concurrency: 16,
 			});
@@ -512,7 +512,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 					return this.endedPollNotificationProcessorService.process(job);
 				}
 			}, {
-				...baseQueueOptions(this.config, QUEUE.ENDED_POLL_NOTIFICATION),
+				...baseWorkerOptions(this.config, QUEUE.ENDED_POLL_NOTIFICATION),
 				autorun: false,
 			});
 		}

packages/backend/src/queue/const.ts

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { MetricsTime } from 'bullmq';
 import { Config } from '@/config.js';
 import type * as Bull from 'bullmq';
 
@@ -27,3 +28,12 @@ export function baseQueueOptions(config: Config, queueName: typeof QUEUE[keyof t
 		prefix: config.redisForJobQueue.prefix ? `${config.redisForJobQueue.prefix}:queue:${queueName}` : `queue:${queueName}`,
 	};
 }
+
+export function baseWorkerOptions(config: Config, queueName: typeof QUEUE[keyof typeof QUEUE]): Bull.WorkerOptions {
+	return {
+		...baseQueueOptions(config, queueName),
+		metrics: {
+			maxDataPoints: MetricsTime.ONE_WEEK,
+		},
+	};
+}

packages/backend/src/server/api/endpoint-list.ts

@@ -67,8 +67,14 @@ export * as 'admin/promo/create' from './endpoints/admin/promo/create.js';
 export * as 'admin/queue/clear' from './endpoints/admin/queue/clear.js';
 export * as 'admin/queue/deliver-delayed' from './endpoints/admin/queue/deliver-delayed.js';
 export * as 'admin/queue/inbox-delayed' from './endpoints/admin/queue/inbox-delayed.js';
-export * as 'admin/queue/promote' from './endpoints/admin/queue/promote.js';
+export * as 'admin/queue/retry-job' from './endpoints/admin/queue/retry-job.js';
+export * as 'admin/queue/remove-job' from './endpoints/admin/queue/remove-job.js';
+export * as 'admin/queue/show-job' from './endpoints/admin/queue/show-job.js';
+export * as 'admin/queue/promote-jobs' from './endpoints/admin/queue/promote-jobs.js';
+export * as 'admin/queue/jobs' from './endpoints/admin/queue/jobs.js';
 export * as 'admin/queue/stats' from './endpoints/admin/queue/stats.js';
+export * as 'admin/queue/queues' from './endpoints/admin/queue/queues.js';
+export * as 'admin/queue/queue-stats' from './endpoints/admin/queue/queue-stats.js';
 export * as 'admin/relays/add' from './endpoints/admin/relays/add.js';
 export * as 'admin/relays/list' from './endpoints/admin/relays/list.js';
 export * as 'admin/relays/remove' from './endpoints/admin/relays/remove.js';

packages/backend/src/server/api/endpoints/admin/queue/clear.ts

@@ -19,10 +19,10 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
-		type: { type: 'string', enum: QUEUE_TYPES },
+		queue: { type: 'string', enum: QUEUE_TYPES },
-		state: { type: 'string', enum: ['*', 'wait', 'delayed'] },
+		state: { type: 'string', enum: ['*', 'completed', 'wait', 'active', 'paused', 'prioritized', 'delayed', 'failed'] },
 	},
-	required: ['type', 'state'],
+	required: ['queue', 'state'],
 } as const;
 
 @Injectable()
@@ -32,7 +32,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			this.queueService.clearQueue(ps.type, ps.state);
+			this.queueService.queueClear(ps.queue, ps.state);
 
 			this.moderationLogService.log(me, 'clearQueue');
 		});

packages/backend/src/server/api/endpoints/admin/queue/jobs.ts

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QUEUE_TYPES, QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'read:admin:queue',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		queue: { type: 'string', enum: QUEUE_TYPES },
+		state: { type: 'array', items: { type: 'string', enum: ['active', 'wait', 'delayed', 'completed', 'failed'] } },
+		search: { type: 'string' },
+	},
+	required: ['queue', 'state'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private queueService: QueueService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			return this.queueService.queueGetJobs(ps.queue, ps.state, ps.search);
+		});
+	}
+}

packages/backend/src/server/api/endpoints/admin/queue/promote-jobs.ts

@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QUEUE_TYPES, QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'write:admin:queue',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		queue: { type: 'string', enum: QUEUE_TYPES },
+	},
+	required: ['queue'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private moderationLogService: ModerationLogService,
+		private queueService: QueueService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			this.queueService.queuePromoteJobs(ps.queue);
+
+			this.moderationLogService.log(me, 'promoteQueue');
+		});
+	}
+}

packages/backend/src/server/api/endpoints/admin/queue/promote.ts

@@ -1,77 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-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,
-	kind: 'write:admin:queue',
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		type: { type: 'string', enum: ['deliver', 'inbox'] },
-	},
-	required: ['type'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	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];
-						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];
-						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;
-			}
-
-			this.moderationLogService.log(me, 'promoteQueue');
-		});
-	}
-}

packages/backend/src/server/api/endpoints/admin/queue/queue-stats.ts

@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QUEUE_TYPES, QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'read:admin:queue',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		queue: { type: 'string', enum: QUEUE_TYPES },
+	},
+	required: ['queue'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private queueService: QueueService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			return this.queueService.queueGetQueue(ps.queue);
+		});
+	}
+}

packages/backend/src/server/api/endpoints/admin/queue/queues.ts

@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QUEUE_TYPES, QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'read:admin:queue',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private queueService: QueueService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			return this.queueService.queueGetQueues();
+		});
+	}
+}

packages/backend/src/server/api/endpoints/admin/queue/remove-job.ts

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QUEUE_TYPES, QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'write:admin:queue',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		queue: { type: 'string', enum: QUEUE_TYPES },
+		jobId: { type: 'string' },
+	},
+	required: ['queue', 'jobId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private moderationLogService: ModerationLogService,
+		private queueService: QueueService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			this.queueService.queueRemoveJob(ps.queue, ps.jobId);
+		});
+	}
+}

packages/backend/src/server/api/endpoints/admin/queue/retry-job.ts

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QUEUE_TYPES, QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'write:admin:queue',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		queue: { type: 'string', enum: QUEUE_TYPES },
+		jobId: { type: 'string' },
+	},
+	required: ['queue', 'jobId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private moderationLogService: ModerationLogService,
+		private queueService: QueueService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			this.queueService.queueRetryJob(ps.queue, ps.jobId);
+		});
+	}
+}

packages/backend/src/server/api/endpoints/admin/queue/show-job.ts

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { QUEUE_TYPES, QueueService } from '@/core/QueueService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'read:admin:queue',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		queue: { type: 'string', enum: QUEUE_TYPES },
+		jobId: { type: 'string' },
+	},
+	required: ['queue', 'jobId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private moderationLogService: ModerationLogService,
+		private queueService: QueueService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			return this.queueService.queueGetJob(ps.queue, ps.jobId);
+		});
+	}
+}

packages/frontend/src/components/MkCode.vue

@@ -12,8 +12,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #fallback>
 			<MkLoading/>
 		</template>
-		<XCode v-if="show && lang" :code="code" :lang="lang"/>
+		<XCode v-if="show && lang" class="_selectable" :code="code" :lang="lang"/>
-		<pre v-else-if="show" :class="$style.codeBlockFallbackRoot"><code :class="$style.codeBlockFallbackCode">{{ code }}</code></pre>
+		<pre v-else-if="show" class="_selectable" :class="$style.codeBlockFallbackRoot"><code :class="$style.codeBlockFallbackCode">{{ code }}</code></pre>
 		<button v-else :class="$style.codePlaceholderRoot" @click="show = true">
 			<div :class="$style.codePlaceholderContainer">
 				<div><i class="ti ti-code"></i> {{ i18n.ts.code }}</div>
@@ -70,11 +70,9 @@ function copy() {
 .codeBlockFallbackRoot {
 	display: block;
 	overflow-wrap: anywhere;
-	background: var(--MI_THEME-bg);
 	padding: 1em;
-	margin: .5em 0;
+	margin: 0;
 	overflow: auto;
-	border-radius: 8px;
 }
 
 .codeBlockFallbackCode {

packages/frontend/src/components/MkFolder.vue

@@ -38,15 +38,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 			>
 				<KeepAlive>
 					<div v-show="opened">
-						<MkSpacer v-if="withSpacer" :marginMin="spacerMin" :marginMax="spacerMax">
+						<MkStickyContainer>
-							<slot></slot>
+							<template #header>
-						</MkSpacer>
+								<div v-if="$slots.header" :class="$style.inBodyHeader">
-						<div v-else>
+									<slot name="header"></slot>
-							<slot></slot>
+								</div>
-						</div>
+							</template>
-						<div v-if="$slots.footer" :class="$style.footer">
+
-							<slot name="footer"></slot>
+							<MkSpacer v-if="withSpacer" :marginMin="spacerMin" :marginMax="spacerMax">
-						</div>
+								<slot></slot>
+							</MkSpacer>
+							<div v-else>
+								<slot></slot>
+							</div>
+
+							<template #footer>
+								<div v-if="$slots.footer" :class="$style.inBodyFooter">
+									<slot name="footer"></slot>
+								</div>
+							</template>
+						</MkStickyContainer>
 					</div>
 				</KeepAlive>
 			</Transition>
@@ -230,14 +241,21 @@ onMounted(() => {
 
 	&.bgSame {
 		background: var(--MI_THEME-bg);
+
+		.inBodyHeader {
+			background: color(from var(--MI_THEME-bg) srgb r g b / 0.75);
+		}
 	}
 }
 
-.footer {
+.inBodyHeader {
-	position: sticky !important;
+	background: color(from var(--MI_THEME-panel) srgb r g b / 0.75);
-	z-index: 1;
+	-webkit-backdrop-filter: var(--MI-blur, blur(15px));
-	bottom: var(--MI-stickyBottom, 0px);
+	backdrop-filter: var(--MI-blur, blur(15px));
-	left: 0;
+	border-bottom: solid 0.5px var(--MI_THEME-divider);
+}
+
+.inBodyFooter {
 	padding: 12px;
 	background: color(from var(--MI_THEME-bg) srgb r g b / 0.5);
 	-webkit-backdrop-filter: var(--MI-blur, blur(15px));

packages/frontend/src/components/MkTabs.vue

@@ -0,0 +1,235 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.tabs">
+	<div :class="$style.tabsInner">
+		<button
+			v-for="t in tabs" :ref="(el) => tabRefs[t.key] = (el as HTMLElement)" v-tooltip.noDelay="t.title"
+			class="_button" :class="[$style.tab, { [$style.active]: t.key != null && t.key === props.tab, [$style.animate]: prefer.s.animation }]"
+			@mousedown="(ev) => onTabMousedown(t, ev)" @click="(ev) => onTabClick(t, ev)"
+		>
+			<div :class="$style.tabInner">
+				<i v-if="t.icon" :class="[$style.tabIcon, t.icon]"></i>
+				<div
+					v-if="!t.iconOnly || (!prefer.s.animation && t.key === tab)"
+					:class="$style.tabTitle"
+				>
+					{{ t.title }}
+				</div>
+				<Transition
+					v-else mode="in-out" @enter="enter" @afterEnter="afterEnter" @leave="leave"
+					@afterLeave="afterLeave"
+				>
+					<div v-show="t.key === tab" :class="[$style.tabTitle, $style.animate]">{{ t.title }}</div>
+				</Transition>
+			</div>
+		</button>
+	</div>
+	<div
+		ref="tabHighlightEl"
+		:class="[$style.tabHighlight, { [$style.animate]: prefer.s.animation }]"
+	></div>
+</div>
+</template>
+
+<script lang="ts">
+export type Tab = {
+	key: string;
+	onClick?: (ev: MouseEvent) => void;
+} & (
+	| {
+		iconOnly?: false;
+		title: string;
+		icon?: string;
+	}
+	| {
+		iconOnly: true;
+		icon: string;
+	}
+);
+</script>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, onUnmounted, useTemplateRef, watch } from 'vue';
+import { prefer } from '@/preferences.js';
+
+const props = withDefaults(defineProps<{
+	tabs?: Tab[];
+	tab?: string;
+}>(), {
+	tabs: () => ([] as Tab[]),
+});
+
+const emit = defineEmits<{
+	(ev: 'update:tab', key: string);
+	(ev: 'tabClick', key: string);
+}>();
+
+const tabHighlightEl = useTemplateRef('tabHighlightEl');
+const tabRefs: Record<string, HTMLElement | null> = {};
+
+function onTabMousedown(tab: Tab, ev: MouseEvent): void {
+	// ユーザビリティの観点からmousedown時にはonClickは呼ばない
+	if (tab.key) {
+		emit('update:tab', tab.key);
+	}
+}
+
+function onTabClick(t: Tab, ev: MouseEvent): void {
+	emit('tabClick', t.key);
+
+	if (t.onClick) {
+		ev.preventDefault();
+		ev.stopPropagation();
+		t.onClick(ev);
+	}
+
+	if (t.key) {
+		emit('update:tab', t.key);
+	}
+}
+
+function renderTab() {
+	const tabEl = props.tab ? tabRefs[props.tab] : undefined;
+	if (tabEl && tabHighlightEl.value && tabHighlightEl.value.parentElement) {
+		// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
+		// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
+		const parentRect = tabHighlightEl.value.parentElement.getBoundingClientRect();
+		const rect = tabEl.getBoundingClientRect();
+		tabHighlightEl.value.style.width = rect.width + 'px';
+		tabHighlightEl.value.style.left = (rect.left - parentRect.left + tabHighlightEl.value.parentElement.scrollLeft) + 'px';
+	}
+}
+
+let entering = false;
+
+async function enter(el: Element) {
+	if (!(el instanceof HTMLElement)) return;
+	entering = true;
+	const elementWidth = el.getBoundingClientRect().width;
+	el.style.width = '0';
+	el.style.paddingLeft = '0';
+	el.offsetWidth; // reflow
+	el.style.width = `${elementWidth}px`;
+	el.style.paddingLeft = '';
+	nextTick(() => {
+		entering = false;
+	});
+
+	window.setTimeout(renderTab, 170);
+}
+
+function afterEnter(el: Element) {
+	if (!(el instanceof HTMLElement)) return;
+	// element.style.width = '';
+}
+
+async function leave(el: Element) {
+	if (!(el instanceof HTMLElement)) return;
+	const elementWidth = el.getBoundingClientRect().width;
+	el.style.width = `${elementWidth}px`;
+	el.style.paddingLeft = '';
+	el.offsetWidth; // reflow
+	el.style.width = '0';
+	el.style.paddingLeft = '0';
+}
+
+function afterLeave(el: Element) {
+	if (!(el instanceof HTMLElement)) return;
+	el.style.width = '';
+}
+
+onMounted(() => {
+	watch([() => props.tab, () => props.tabs], () => {
+		nextTick(() => {
+			if (entering) return;
+			renderTab();
+		});
+	}, {
+		immediate: true,
+	});
+});
+
+onUnmounted(() => {
+});
+</script>
+
+<style lang="scss" module>
+.tabs {
+	--height: 40px;
+
+	display: block;
+	position: relative;
+	margin: 0;
+	height: var(--height);
+	font-size: 85%;
+	overflow-x: auto;
+	overflow-y: hidden;
+	scrollbar-width: none;
+
+	&::-webkit-scrollbar {
+		display: none;
+	}
+}
+
+.tabsInner {
+	display: inline-block;
+	height: var(--height);
+	white-space: nowrap;
+}
+
+.tab {
+	display: inline-block;
+	position: relative;
+	padding: 0 10px;
+	height: 100%;
+	font-weight: normal;
+	opacity: 0.7;
+
+	&:hover {
+		opacity: 1;
+	}
+
+	&.active {
+		opacity: 1;
+	}
+
+	&.animate {
+		transition: opacity 0.2s ease;
+	}
+}
+
+.tabInner {
+	display: flex;
+	align-items: center;
+}
+
+.tabIcon + .tabTitle {
+	padding-left: 4px;
+}
+
+.tabTitle {
+	overflow: hidden;
+
+	&.animate {
+		transition: width .15s linear, padding-left .15s linear;
+	}
+}
+
+.tabHighlight {
+	position: absolute;
+	bottom: 0;
+	height: 3px;
+	background: var(--MI_THEME-accent);
+	border-radius: 999px;
+	transition: none;
+	pointer-events: none;
+
+	&.animate {
+		transition: width 0.15s ease, left 0.15s ease;
+	}
+}
+</style>

packages/frontend/src/components/MkTl.vue

@@ -0,0 +1,173 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.items">
+	<template v-for="(item, i) in items" :key="item.id">
+		<div :class="$style.left">
+			<slot v-if="item.type === 'event'" name="left" :event="item.data" :timestamp="item.timestamp" :delta="item.delta"></slot>
+		</div>
+		<div :class="[$style.center, item.type === 'date' ? $style.date : '']">
+			<div :class="$style.centerLine"></div>
+			<div :class="$style.centerPoint"></div>
+		</div>
+		<div :class="$style.right">
+			<slot v-if="item.type === 'event'" name="right" :event="item.data" :timestamp="item.timestamp" :delta="item.delta"></slot>
+			<div v-else :class="$style.dateLabel"><i class="ti ti-chevron-up"></i> {{ item.prevText }}</div>
+		</div>
+	</template>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+
+const props = defineProps<{
+	events: {
+		id: string;
+		timestamp: number;
+		data: any;
+	}[];
+}>();
+
+const events = computed(() => {
+	return props.events.toSorted((a, b) => b.timestamp - a.timestamp);
+});
+
+function getDateText(dateInstance: Date) {
+	const year = dateInstance.getFullYear();
+	const month = dateInstance.getMonth() + 1;
+	const date = dateInstance.getDate();
+	const hour = dateInstance.getHours();
+	return `${year.toString()}/${month.toString()}/${date.toString()} ${hour.toString().padStart(2, '0')}:00:00`;
+}
+
+const items = computed<({
+	id: string;
+	type: 'event';
+	timestamp: number;
+	delta: number;
+	data: any;
+} | {
+	id: string;
+	type: 'date';
+	prev: Date;
+	prevText: string;
+	next: Date | null;
+	nextText: string;
+})[]>(() => {
+		const results = [];
+		for (let i = 0; i < events.value.length; i++) {
+			const item = events.value[i];
+
+			const date = new Date(item.timestamp);
+			const nextDate = events.value[i + 1] ? new Date(events.value[i + 1].timestamp) : null;
+
+			results.push({
+				id: item.id,
+				type: 'event',
+				timestamp: item.timestamp,
+				delta: i === events.value.length - 1 ? 0 : item.timestamp - events.value[i + 1].timestamp,
+				data: item.data,
+			});
+
+			if (
+				i !== events.value.length - 1 &&
+				nextDate != null && (
+					date.getFullYear() !== nextDate.getFullYear() ||
+					date.getMonth() !== nextDate.getMonth() ||
+					date.getDate() !== nextDate.getDate() ||
+					date.getHours() !== nextDate.getHours()
+				)
+			) {
+				results.push({
+					id: `date-${item.id}`,
+					type: 'date',
+					prev: date,
+					prevText: getDateText(date),
+					next: nextDate,
+					nextText: getDateText(nextDate),
+				});
+			}
+		}
+		return results;
+	});
+</script>
+
+<style lang="scss" module>
+.root {
+
+}
+
+.items {
+	display: grid;
+	grid-template-columns: max-content 18px 1fr;
+	gap: 0 8px;
+}
+
+.item {
+}
+
+.center {
+	position: relative;
+
+	&.date {
+		.centerPoint::before {
+			position: absolute;
+			content: "";
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			width: 7px;
+			height: 7px;
+			background: var(--MI_THEME-bg);
+			border-radius: 50%;
+		}
+	}
+}
+
+.centerLine {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	margin: auto;
+	width: 3px;
+	height: 100%;
+	background: color-mix(in srgb, var(--MI_THEME-accent), var(--MI_THEME-bg) 75%);
+}
+.centerPoint {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	width: 13px;
+	height: 13px;
+	background: color-mix(in srgb, var(--MI_THEME-accent), var(--MI_THEME-bg) 75%);
+	border-radius: 50%;
+}
+
+.left {
+	min-width: 0;
+	align-self: center;
+	justify-self: right;
+}
+
+.right {
+	min-width: 0;
+	align-self: center;
+}
+
+.dateLabel {
+	opacity: 0.7;
+	font-size: 90%;
+	padding: 4px;
+	margin: 8px 0;
+}
+</style>

packages/frontend/src/pages/admin/_header_.vue

@@ -1,296 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div ref="el" class="fdidabkc" :style="{ background: bg }" @click="onClick">
-	<template v-if="pageMetadata">
-		<div class="titleContainer" @click="showTabsPopup">
-			<i v-if="pageMetadata.icon" class="icon" :class="pageMetadata.icon"></i>
-
-			<div class="title">
-				<div class="title">{{ pageMetadata.title }}</div>
-			</div>
-		</div>
-		<div class="tabs">
-			<button v-for="tab in tabs" :ref="(el) => tabRefs[tab.key] = el" v-tooltip.noDelay="tab.title" class="tab _button" :class="{ active: tab.key != null && tab.key === props.tab }" @mousedown="(ev) => onTabMousedown(tab, ev)" @click="(ev) => onTabClick(tab, ev)">
-				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-				<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
-			</button>
-			<div ref="tabHighlightEl" class="highlight"></div>
-		</div>
-	</template>
-	<div class="buttons right">
-		<template v-if="actions">
-			<template v-for="action in actions">
-				<MkButton v-if="action.asFullButton" class="fullButton" primary :disabled="action.disabled" @click.stop="action.handler"><i :class="action.icon" style="margin-right: 6px;"></i>{{ action.text }}</MkButton>
-				<button v-else v-tooltip.noDelay="action.text" class="_button button" :class="{ highlighted: action.highlighted }" :disabled="action.disabled" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
-			</template>
-		</template>
-	</div>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, useTemplateRef, watch, nextTick, inject } from 'vue';
-import tinycolor from 'tinycolor2';
-import { scrollToTop } from '@@/js/scroll.js';
-import { popupMenu } from '@/os.js';
-import MkButton from '@/components/MkButton.vue';
-import { globalEvents } from '@/events.js';
-import { DI } from '@/di.js';
-
-type Tab = {
-	key?: string | null;
-	title: string;
-	icon?: string;
-	iconOnly?: boolean;
-	onClick?: (ev: MouseEvent) => void;
-};
-
-const props = defineProps<{
-	tabs?: Tab[];
-	tab?: string;
-	actions?: {
-		text: string;
-		icon: string;
-		asFullButton?: boolean;
-		disabled?: boolean;
-		handler: (ev: MouseEvent) => void;
-	}[];
-	thin?: boolean;
-}>();
-
-const emit = defineEmits<{
-	(ev: 'update:tab', key: string);
-}>();
-
-const pageMetadata = inject(DI.pageMetadata, ref(null));
-
-const el = useTemplateRef('el');
-const tabHighlightEl = useTemplateRef('tabHighlightEl');
-const tabRefs = {};
-const bg = ref<string | null>(null);
-const height = ref(0);
-const hasTabs = computed(() => {
-	return props.tabs && props.tabs.length > 0;
-});
-
-const showTabsPopup = (ev: MouseEvent) => {
-	if (!hasTabs.value) return;
-	ev.preventDefault();
-	ev.stopPropagation();
-	const menu = props.tabs.map(tab => ({
-		text: tab.title,
-		icon: tab.icon,
-		active: tab.key != null && tab.key === props.tab,
-		action: (ev) => {
-			onTabClick(tab, ev);
-		},
-	}));
-	popupMenu(menu, ev.currentTarget ?? ev.target);
-};
-
-const preventDrag = (ev: TouchEvent) => {
-	ev.stopPropagation();
-};
-
-const onClick = () => {
-	scrollToTop(el.value, { behavior: 'smooth' });
-};
-
-function onTabMousedown(tab: Tab, ev: MouseEvent): void {
-	// ユーザビリティの観点からmousedown時にはonClickは呼ばない
-	if (tab.key) {
-		emit('update:tab', tab.key);
-	}
-}
-
-function onTabClick(tab: Tab, ev: MouseEvent): void {
-	if (tab.onClick) {
-		ev.preventDefault();
-		ev.stopPropagation();
-		tab.onClick(ev);
-	}
-	if (tab.key) {
-		emit('update:tab', tab.key);
-	}
-}
-
-const calcBg = () => {
-	const rawBg = pageMetadata.value.bg ?? 'var(--MI_THEME-bg)';
-	const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(window.document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
-	tinyBg.setAlpha(0.85);
-	bg.value = tinyBg.toRgbString();
-};
-
-onMounted(() => {
-	calcBg();
-	globalEvents.on('themeChanging', calcBg);
-
-	watch(() => [props.tab, props.tabs], () => {
-		nextTick(() => {
-			const tabEl = tabRefs[props.tab];
-			if (tabEl && tabHighlightEl.value) {
-				// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
-				// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
-				const parentRect = tabEl.parentElement.getBoundingClientRect();
-				const rect = tabEl.getBoundingClientRect();
-				tabHighlightEl.value.style.width = rect.width + 'px';
-				tabHighlightEl.value.style.left = (rect.left - parentRect.left) + 'px';
-			}
-		});
-	}, {
-		immediate: true,
-	});
-});
-
-onUnmounted(() => {
-	globalEvents.off('themeChanging', calcBg);
-});
-</script>
-
-<style lang="scss" scoped>
-.fdidabkc {
-	--height: 60px;
-	display: flex;
-	width: 100%;
-	-webkit-backdrop-filter: var(--MI-blur, blur(15px));
-	backdrop-filter: var(--MI-blur, blur(15px));
-
-	> .buttons {
-		--margin: 8px;
-		display: flex;
-    align-items: center;
-		height: var(--height);
-		margin: 0 var(--margin);
-
-		&.right {
-			margin-left: auto;
-		}
-
-		&:empty {
-			width: var(--height);
-		}
-
-		> .button {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			height: calc(var(--height) - (var(--margin) * 2));
-			width: calc(var(--height) - (var(--margin) * 2));
-			box-sizing: border-box;
-			position: relative;
-			border-radius: 5px;
-
-			&:hover {
-				background: rgba(0, 0, 0, 0.05);
-			}
-
-			&.highlighted {
-				color: var(--MI_THEME-accent);
-			}
-		}
-
-		> .fullButton {
-			& + .fullButton {
-				margin-left: 12px;
-			}
-		}
-	}
-
-	> .titleContainer {
-		display: flex;
-		align-items: center;
-		max-width: 400px;
-		overflow: auto;
-		white-space: nowrap;
-		text-align: left;
-		font-weight: bold;
-		flex-shrink: 0;
-		margin-left: 24px;
-
-		> .avatar {
-			$size: 32px;
-			display: inline-block;
-			width: $size;
-			height: $size;
-			vertical-align: bottom;
-			margin: 0 8px;
-			pointer-events: none;
-		}
-
-		> .icon {
-			margin-right: 8px;
-			width: 16px;
-			text-align: center;
-		}
-
-		> .title {
-			min-width: 0;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			line-height: 1.1;
-
-			> .subtitle {
-				opacity: 0.6;
-				font-size: 0.8em;
-				font-weight: normal;
-				white-space: nowrap;
-				overflow: hidden;
-				text-overflow: ellipsis;
-
-				&.activeTab {
-					text-align: center;
-
-					> .chevron {
-						display: inline-block;
-						margin-left: 6px;
-					}
-				}
-			}
-		}
-	}
-
-	> .tabs {
-		position: relative;
-		margin-left: 16px;
-		font-size: 0.8em;
-		overflow: auto;
-		white-space: nowrap;
-
-		> .tab {
-			display: inline-block;
-			position: relative;
-			padding: 0 10px;
-			height: 100%;
-			font-weight: normal;
-			opacity: 0.7;
-
-			&:hover {
-				opacity: 1;
-			}
-
-			&.active {
-				opacity: 1;
-			}
-
-			> .icon + .title {
-				margin-left: 8px;
-			}
-		}
-
-		> .highlight {
-			position: absolute;
-			bottom: 0;
-			height: 3px;
-			background: var(--MI_THEME-accent);
-			border-radius: 999px;
-			transition: all 0.2s ease;
-			pointer-events: none;
-		}
-	}
-}
-</style>

packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue

@@ -4,11 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header>
-		<XHeader :actions="headerActions" :tabs="headerTabs"/>
-	</template>
-
 	<MkSpacer :contentMax="900">
 		<div :class="$style.root" class="_gaps_m">
 			<div :class="$style.addButton">
@@ -41,14 +37,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script setup lang="ts">
 import { entities } from 'misskey-js';
 import { computed, defineAsyncComponent, onMounted, ref } from 'vue';
 import XRecipient from './notification-recipient.item.vue';
-import XHeader from '@/pages/admin/_header_.vue';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';

packages/frontend/src/pages/admin/abuses.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="900">
 		<div :class="$style.root" class="_gaps">
 			<div :class="$style.subMenus" class="_gaps">
@@ -55,12 +54,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkPagination>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { computed, useTemplateRef, ref } from 'vue';
-import XHeader from './_header_.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import XAbuseReport from '@/components/MkAbuseReport.vue';

packages/frontend/src/pages/admin/ads.vue

@@ -4,10 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header>
-		<XHeader :actions="headerActions" :tabs="headerTabs"/>
-	</template>
 	<MkSpacer :contentMax="900">
 		<MkSelect v-model="filterType" :class="$style.input" @update:modelValue="filterItems">
 			<template #label>{{ i18n.ts.state }}</template>
@@ -81,13 +78,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkButton>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
 import * as Misskey from 'misskey-js';
-import XHeader from './_header_.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';

packages/frontend/src/pages/admin/announcements.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="900">
 		<div class="_gaps">
 			<MkInfo>{{ i18n.ts._announcement.shouldNotBeUsedToPresentPermanentInfo }}</MkInfo>
@@ -81,12 +80,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</template>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, watch } from 'vue';
-import XHeader from './_header_.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';

packages/frontend/src/pages/admin/branding.vue

@@ -4,109 +4,106 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
-		<template #header><XHeader :tabs="headerTabs"/></template>
+		<FormSuspense :p="init">
-		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
+			<div class="_gaps_m">
-			<FormSuspense :p="init">
+				<MkInput v-model="iconUrl" type="url">
-				<div class="_gaps_m">
+					<template #prefix><i class="ti ti-link"></i></template>
-					<MkInput v-model="iconUrl" type="url">
+					<template #label>{{ i18n.ts._serverSettings.iconUrl }}</template>
-						<template #prefix><i class="ti ti-link"></i></template>
+				</MkInput>
-						<template #label>{{ i18n.ts._serverSettings.iconUrl }}</template>
-					</MkInput>
 
-					<MkInput v-model="app192IconUrl" type="url">
+				<MkInput v-model="app192IconUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts._serverSettings.iconUrl }} (App/192px)</template>
+					<template #label>{{ i18n.ts._serverSettings.iconUrl }} (App/192px)</template>
-						<template #caption>
+					<template #caption>
-							<div>{{ i18n.tsx._serverSettings.appIconDescription({ host: instance.name ?? host }) }}</div>
+						<div>{{ i18n.tsx._serverSettings.appIconDescription({ host: instance.name ?? host }) }}</div>
-							<div>({{ i18n.ts._serverSettings.appIconUsageExample }})</div>
+						<div>({{ i18n.ts._serverSettings.appIconUsageExample }})</div>
-							<div>{{ i18n.ts._serverSettings.appIconStyleRecommendation }}</div>
+						<div>{{ i18n.ts._serverSettings.appIconStyleRecommendation }}</div>
-							<div><strong>{{ i18n.tsx._serverSettings.appIconResolutionMustBe({ resolution: '192x192px' }) }}</strong></div>
+						<div><strong>{{ i18n.tsx._serverSettings.appIconResolutionMustBe({ resolution: '192x192px' }) }}</strong></div>
-						</template>
+					</template>
-					</MkInput>
+				</MkInput>
 
-					<MkInput v-model="app512IconUrl" type="url">
+				<MkInput v-model="app512IconUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts._serverSettings.iconUrl }} (App/512px)</template>
+					<template #label>{{ i18n.ts._serverSettings.iconUrl }} (App/512px)</template>
-						<template #caption>
+					<template #caption>
-							<div>{{ i18n.tsx._serverSettings.appIconDescription({ host: instance.name ?? host }) }}</div>
+						<div>{{ i18n.tsx._serverSettings.appIconDescription({ host: instance.name ?? host }) }}</div>
-							<div>({{ i18n.ts._serverSettings.appIconUsageExample }})</div>
+						<div>({{ i18n.ts._serverSettings.appIconUsageExample }})</div>
-							<div>{{ i18n.ts._serverSettings.appIconStyleRecommendation }}</div>
+						<div>{{ i18n.ts._serverSettings.appIconStyleRecommendation }}</div>
-							<div><strong>{{ i18n.tsx._serverSettings.appIconResolutionMustBe({ resolution: '512x512px' }) }}</strong></div>
+						<div><strong>{{ i18n.tsx._serverSettings.appIconResolutionMustBe({ resolution: '512x512px' }) }}</strong></div>
-						</template>
+					</template>
-					</MkInput>
+				</MkInput>
 
-					<MkInput v-model="bannerUrl" type="url">
+				<MkInput v-model="bannerUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts.bannerUrl }}</template>
+					<template #label>{{ i18n.ts.bannerUrl }}</template>
-					</MkInput>
+				</MkInput>
 
-					<MkInput v-model="backgroundImageUrl" type="url">
+				<MkInput v-model="backgroundImageUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
+					<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
-					</MkInput>
+				</MkInput>
 
-					<MkInput v-model="notFoundImageUrl" type="url">
+				<MkInput v-model="notFoundImageUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts.notFoundDescription }}</template>
+					<template #label>{{ i18n.ts.notFoundDescription }}</template>
-					</MkInput>
+				</MkInput>
 
-					<MkInput v-model="infoImageUrl" type="url">
+				<MkInput v-model="infoImageUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts.nothing }}</template>
+					<template #label>{{ i18n.ts.nothing }}</template>
-					</MkInput>
+				</MkInput>
 
-					<MkInput v-model="serverErrorImageUrl" type="url">
+				<MkInput v-model="serverErrorImageUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts.somethingHappened }}</template>
+					<template #label>{{ i18n.ts.somethingHappened }}</template>
-					</MkInput>
+				</MkInput>
 
-					<MkColorInput v-model="themeColor">
+				<MkColorInput v-model="themeColor">
-						<template #label>{{ i18n.ts.themeColor }}</template>
+					<template #label>{{ i18n.ts.themeColor }}</template>
-					</MkColorInput>
+				</MkColorInput>
 
-					<MkTextarea v-model="defaultLightTheme">
+				<MkTextarea v-model="defaultLightTheme">
-						<template #label>{{ i18n.ts.instanceDefaultLightTheme }}</template>
+					<template #label>{{ i18n.ts.instanceDefaultLightTheme }}</template>
-						<template #caption>{{ i18n.ts.instanceDefaultThemeDescription }}</template>
+					<template #caption>{{ i18n.ts.instanceDefaultThemeDescription }}</template>
-					</MkTextarea>
+				</MkTextarea>
 
-					<MkTextarea v-model="defaultDarkTheme">
+				<MkTextarea v-model="defaultDarkTheme">
-						<template #label>{{ i18n.ts.instanceDefaultDarkTheme }}</template>
+					<template #label>{{ i18n.ts.instanceDefaultDarkTheme }}</template>
-						<template #caption>{{ i18n.ts.instanceDefaultThemeDescription }}</template>
+					<template #caption>{{ i18n.ts.instanceDefaultThemeDescription }}</template>
-					</MkTextarea>
+				</MkTextarea>
 
-					<MkInput v-model="repositoryUrl" type="url">
+				<MkInput v-model="repositoryUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts.repositoryUrl }}</template>
+					<template #label>{{ i18n.ts.repositoryUrl }}</template>
-					</MkInput>
+				</MkInput>
 
-					<MkInput v-model="feedbackUrl" type="url">
+				<MkInput v-model="feedbackUrl" type="url">
-						<template #prefix><i class="ti ti-link"></i></template>
+					<template #prefix><i class="ti ti-link"></i></template>
-						<template #label>{{ i18n.ts.feedbackUrl }}</template>
+					<template #label>{{ i18n.ts.feedbackUrl }}</template>
-					</MkInput>
+				</MkInput>
 
-					<MkTextarea v-model="manifestJsonOverride">
+				<MkTextarea v-model="manifestJsonOverride">
-						<template #label>{{ i18n.ts._serverSettings.manifestJsonOverride }}</template>
+					<template #label>{{ i18n.ts._serverSettings.manifestJsonOverride }}</template>
-					</MkTextarea>
+				</MkTextarea>
-				</div>
-			</FormSuspense>
-		</MkSpacer>
-		<template #footer>
-			<div :class="$style.footer">
-				<MkSpacer :contentMax="700" :marginMin="16" :marginMax="16">
-					<MkButton primary rounded @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
-				</MkSpacer>
 			</div>
-		</template>
+		</FormSuspense>
-	</MkStickyContainer>
+	</MkSpacer>
-</div>
+	<template #footer>
+		<div :class="$style.footer">
+			<MkSpacer :contentMax="700" :marginMin="16" :marginMax="16">
+				<MkButton primary rounded @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
+			</MkSpacer>
+		</div>
+	</template>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
 import JSON5 from 'json5';
-import XHeader from './_header_.vue';
+import { host } from '@@/js/config.js';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 import FormSuspense from '@/components/form/suspense.vue';
@@ -117,7 +114,6 @@ import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
 import MkButton from '@/components/MkButton.vue';
 import MkColorInput from '@/components/MkColorInput.vue';
-import { host } from '@@/js/config.js';
 
 const iconUrl = ref<string | null>(null);
 const app192IconUrl = ref<string | null>(null);

packages/frontend/src/pages/admin/email-settings.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :tabs="headerTabs">
-	<template #header><XHeader :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<FormSuspense :p="init">
 			<div class="_gaps_m">
@@ -60,12 +59,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkSpacer>
 		</div>
 	</template>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import XHeader from './_header_.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkInput from '@/components/MkInput.vue';
 import FormInfo from '@/components/MkInfo.vue';

packages/frontend/src/pages/admin/external-services.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<FormSuspense :p="init">
 			<div class="_gaps_m">
@@ -38,12 +37,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</FormSuspense>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import XHeader from './_header_.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkSwitch from '@/components/MkSwitch.vue';

packages/frontend/src/pages/admin/federation-job-queue.chart.vue

@@ -50,8 +50,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { markRaw, onMounted, onUnmounted, ref, useTemplateRef } from 'vue';
 import * as Misskey from 'misskey-js';
-import XChart from './queue.chart.chart.vue';
+import XChart from './federation-job-queue.chart.chart.vue';
-import type { ApQueueDomain } from '@/pages/admin/queue.vue';
+import type { ApQueueDomain } from '@/pages/admin/federation-job-queue.vue';
 import number from '@/filters/number.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { useStream } from '@/stream.js';

packages/frontend/src/pages/admin/federation-job-queue.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<XQueue v-if="tab === 'deliver'" domain="deliver"/>
 		<XQueue v-else-if="tab === 'inbox'" domain="inbox"/>
@@ -15,13 +14,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkButton danger @click="clear"><i class="ti ti-trash"></i> {{ i18n.ts.clearQueue }}</MkButton>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import XQueue from './queue.chart.vue';
+import XQueue from './federation-job-queue.chart.vue';
-import XHeader from './_header_.vue';
 import type { Ref } from 'vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
@@ -40,7 +38,7 @@ function clear() {
 	}).then(({ canceled }) => {
 		if (canceled) return;
 
-		os.apiWithDialog('admin/queue/clear', { type: tab.value, state: '*' });
+		os.apiWithDialog('admin/queue/clear', { queue: tab.value, state: '*' });
 	});
 }
 
@@ -52,7 +50,7 @@ function promoteAllQueues() {
 	}).then(({ canceled }) => {
 		if (canceled) return;
 
-		os.apiWithDialog('admin/queue/promote', { type: tab.value });
+		os.apiWithDialog('admin/queue/promote-jobs', { queue: tab.value });
 	});
 }
 
@@ -67,7 +65,7 @@ const headerTabs = computed(() => [{
 }]);
 
 definePage(() => ({
-	title: i18n.ts.jobQueue,
+	title: i18n.ts.federationJobs,
 	icon: 'ti ti-clock-play',
 }));
 </script>

packages/frontend/src/pages/admin/federation.vue

@@ -4,63 +4,59 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="900">
-		<template #header><XHeader :actions="headerActions"/></template>
+		<div class="_gaps">
-		<MkSpacer :contentMax="900">
+			<div>
-			<div class="_gaps">
+				<MkInput v-model="host" :debounce="true" class="">
-				<div>
+					<template #prefix><i class="ti ti-search"></i></template>
-					<MkInput v-model="host" :debounce="true" class="">
+					<template #label>{{ i18n.ts.host }}</template>
-						<template #prefix><i class="ti ti-search"></i></template>
+				</MkInput>
-						<template #label>{{ i18n.ts.host }}</template>
+				<FormSplit style="margin-top: var(--MI-margin);">
-					</MkInput>
+					<MkSelect v-model="state">
-					<FormSplit style="margin-top: var(--MI-margin);">
+						<template #label>{{ i18n.ts.state }}</template>
-						<MkSelect v-model="state">
+						<option value="all">{{ i18n.ts.all }}</option>
-							<template #label>{{ i18n.ts.state }}</template>
+						<option value="federating">{{ i18n.ts.federating }}</option>
-							<option value="all">{{ i18n.ts.all }}</option>
+						<option value="subscribing">{{ i18n.ts.subscribing }}</option>
-							<option value="federating">{{ i18n.ts.federating }}</option>
+						<option value="publishing">{{ i18n.ts.publishing }}</option>
-							<option value="subscribing">{{ i18n.ts.subscribing }}</option>
+						<option value="suspended">{{ i18n.ts.suspended }}</option>
-							<option value="publishing">{{ i18n.ts.publishing }}</option>
+						<option value="blocked">{{ i18n.ts.blocked }}</option>
-							<option value="suspended">{{ i18n.ts.suspended }}</option>
+						<option value="silenced">{{ i18n.ts.silence }}</option>
-							<option value="blocked">{{ i18n.ts.blocked }}</option>
+						<option value="notResponding">{{ i18n.ts.notResponding }}</option>
-							<option value="silenced">{{ i18n.ts.silence }}</option>
+					</MkSelect>
-							<option value="notResponding">{{ i18n.ts.notResponding }}</option>
+					<MkSelect v-model="sort">
-						</MkSelect>
+						<template #label>{{ i18n.ts.sort }}</template>
-						<MkSelect v-model="sort">
+						<option value="+pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.descendingOrder }})</option>
-							<template #label>{{ i18n.ts.sort }}</template>
+						<option value="-pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="+notes">{{ i18n.ts.notes }} ({{ i18n.ts.descendingOrder }})</option>
-							<option value="-pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="-notes">{{ i18n.ts.notes }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+notes">{{ i18n.ts.notes }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="+users">{{ i18n.ts.users }} ({{ i18n.ts.descendingOrder }})</option>
-							<option value="-notes">{{ i18n.ts.notes }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="-users">{{ i18n.ts.users }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+users">{{ i18n.ts.users }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="+following">{{ i18n.ts.following }} ({{ i18n.ts.descendingOrder }})</option>
-							<option value="-users">{{ i18n.ts.users }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="-following">{{ i18n.ts.following }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+following">{{ i18n.ts.following }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="+followers">{{ i18n.ts.followers }} ({{ i18n.ts.descendingOrder }})</option>
-							<option value="-following">{{ i18n.ts.following }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="-followers">{{ i18n.ts.followers }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+followers">{{ i18n.ts.followers }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="+firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.descendingOrder }})</option>
-							<option value="-followers">{{ i18n.ts.followers }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="-firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.ascendingOrder }})</option>
-							<option value="+firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.descendingOrder }})</option>
+					</MkSelect>
-							<option value="-firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.ascendingOrder }})</option>
+				</FormSplit>
-						</MkSelect>
-					</FormSplit>
-				</div>
-
-				<MkPagination v-slot="{items}" ref="instances" :key="host + state" :pagination="pagination">
-					<div :class="$style.instances">
-						<MkA v-for="instance in items" :key="instance.id" v-tooltip.mfm="`Status: ${getStatus(instance)}`" :class="$style.instance" :to="`/instance-info/${instance.host}`">
-							<MkInstanceCardMini :instance="instance"/>
-						</MkA>
-					</div>
-				</MkPagination>
 			</div>
-		</MkSpacer>
+
-	</MkStickyContainer>
+			<MkPagination v-slot="{items}" ref="instances" :key="host + state" :pagination="pagination">
-</div>
+				<div :class="$style.instances">
+					<MkA v-for="instance in items" :key="instance.id" v-tooltip.mfm="`Status: ${getStatus(instance)}`" :class="$style.instance" :to="`/instance-info/${instance.host}`">
+						<MkInstanceCardMini :instance="instance"/>
+					</MkA>
+				</div>
+			</MkPagination>
+		</div>
+	</MkSpacer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import * as Misskey from 'misskey-js';
 import { computed, ref } from 'vue';
-import XHeader from './_header_.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import MkPagination from '@/components/MkPagination.vue';

packages/frontend/src/pages/admin/files.vue

@@ -4,40 +4,36 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="900">
-		<template #header><XHeader :actions="headerActions"/></template>
+		<div class="_gaps">
-		<MkSpacer :contentMax="900">
+			<div class="inputs" style="display: flex; gap: var(--MI-margin); flex-wrap: wrap;">
-			<div class="_gaps">
+				<MkSelect v-model="origin" style="margin: 0; flex: 1;">
-				<div class="inputs" style="display: flex; gap: var(--MI-margin); flex-wrap: wrap;">
+					<template #label>{{ i18n.ts.instance }}</template>
-					<MkSelect v-model="origin" style="margin: 0; flex: 1;">
+					<option value="combined">{{ i18n.ts.all }}</option>
-						<template #label>{{ i18n.ts.instance }}</template>
+					<option value="local">{{ i18n.ts.local }}</option>
-						<option value="combined">{{ i18n.ts.all }}</option>
+					<option value="remote">{{ i18n.ts.remote }}</option>
-						<option value="local">{{ i18n.ts.local }}</option>
+				</MkSelect>
-						<option value="remote">{{ i18n.ts.remote }}</option>
+				<MkInput v-model="searchHost" :debounce="true" type="search" style="margin: 0; flex: 1;" :disabled="pagination.params.origin === 'local'">
-					</MkSelect>
+					<template #label>{{ i18n.ts.host }}</template>
-					<MkInput v-model="searchHost" :debounce="true" type="search" style="margin: 0; flex: 1;" :disabled="pagination.params.origin === 'local'">
+				</MkInput>
-						<template #label>{{ i18n.ts.host }}</template>
-					</MkInput>
-				</div>
-				<div class="inputs" style="display: flex; gap: var(--MI-margin); flex-wrap: wrap;">
-					<MkInput v-model="userId" :debounce="true" type="search" style="margin: 0; flex: 1;">
-						<template #label>User ID</template>
-					</MkInput>
-					<MkInput v-model="type" :debounce="true" type="search" style="margin: 0; flex: 1;">
-						<template #label>MIME type</template>
-					</MkInput>
-				</div>
-				<MkFileListForAdmin :pagination="pagination" :viewMode="viewMode"/>
 			</div>
-		</MkSpacer>
+			<div class="inputs" style="display: flex; gap: var(--MI-margin); flex-wrap: wrap;">
-	</MkStickyContainer>
+				<MkInput v-model="userId" :debounce="true" type="search" style="margin: 0; flex: 1;">
-</div>
+					<template #label>User ID</template>
+				</MkInput>
+				<MkInput v-model="type" :debounce="true" type="search" style="margin: 0; flex: 1;">
+					<template #label>MIME type</template>
+				</MkInput>
+			</div>
+			<MkFileListForAdmin :pagination="pagination" :viewMode="viewMode"/>
+		</div>
+	</MkSpacer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import XHeader from './_header_.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';

packages/frontend/src/pages/admin/index.vue

@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</MkSpacer>
 	</div>
-	<div v-if="!(narrow && currentPage?.route.name == null)" class="main">
+	<div v-if="!(narrow && currentPage?.route.name == null)" class="main _pageContainer" style="height: 100%;">
 		<NestedRouterView/>
 	</div>
 </div>
@@ -138,11 +138,16 @@ const menuDef = computed<SuperMenuDef[]>(() => [{
 		text: i18n.ts.federation,
 		to: '/admin/federation',
 		active: currentPage.value?.route.name === 'federation',
+	}, {
+		icon: 'ti ti-clock-play',
+		text: i18n.ts.federationJobs,
+		to: '/admin/federation-job-queue',
+		active: currentPage.value?.route.name === 'federationJobQueue',
 	}, {
 		icon: 'ti ti-clock-play',
 		text: i18n.ts.jobQueue,
-		to: '/admin/queue',
+		to: '/admin/job-queue',
-		active: currentPage.value?.route.name === 'queue',
+		active: currentPage.value?.route.name === 'jobQueue',
 	}, {
 		icon: 'ti ti-cloud',
 		text: i18n.ts.files,
@@ -329,6 +334,8 @@ defineExpose({
 
 <style lang="scss" scoped>
 .hiyeyicy {
+	height: 100%;
+
 	&.wide {
 		display: flex;
 		margin: 0 auto;

packages/frontend/src/pages/admin/invites.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div class="_gaps_m">
 			<MkFolder :expanded="false">
@@ -51,12 +50,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkPagination>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref, useTemplateRef } from 'vue';
-import XHeader from './_header_.vue';
 import type { Paging } from '@/components/MkPagination.vue';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';

packages/frontend/src/pages/admin/job-queue.chart.vue

@@ -0,0 +1,127 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<canvas ref="chartEl"></canvas>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, useTemplateRef, watch } from 'vue';
+import { Chart } from 'chart.js';
+import { store } from '@/store.js';
+import { useChartTooltip } from '@/use/use-chart-tooltip.js';
+import { chartVLine } from '@/utility/chart-vline.js';
+import { alpha } from '@/utility/color.js';
+import { initChart } from '@/utility/init-chart.js';
+
+initChart();
+
+const props = defineProps<{
+	dataSet: {
+		completed: number[];
+		failed: number[];
+	};
+	aspectRatio?: number;
+}>();
+
+const chartEl = useTemplateRef('chartEl');
+
+const { handler: externalTooltipHandler } = useChartTooltip();
+
+let chartInstance: Chart;
+
+function setData() {
+	if (chartInstance == null) return;
+	chartInstance.data.labels = [];
+	for (let i = 0; i < Math.max(props.dataSet.completed.length, props.dataSet.failed.length); i++) {
+		chartInstance.data.labels.push('');
+	}
+	chartInstance.data.datasets[0].data = props.dataSet.completed;
+	chartInstance.data.datasets[1].data = props.dataSet.failed;
+	chartInstance.update();
+}
+
+watch(() => props.dataSet, () => {
+	setData();
+});
+
+onMounted(() => {
+	const vLineColor = store.s.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+
+	chartInstance = new Chart(chartEl.value, {
+		type: 'line',
+		data: {
+			labels: [],
+			datasets: [{
+				label: 'Completed',
+				pointRadius: 0,
+				tension: 0.3,
+				borderWidth: 2,
+				borderJoinStyle: 'round',
+				borderColor: '#4caf50',
+				backgroundColor: alpha('#4caf50', 0.2),
+				fill: true,
+				data: [],
+			}, {
+				label: 'Failed',
+				pointRadius: 0,
+				tension: 0.3,
+				borderWidth: 2,
+				borderJoinStyle: 'round',
+				borderColor: '#ff0000',
+				backgroundColor: alpha('#ff0000', 0.2),
+				fill: true,
+				data: [],
+			}],
+		},
+		options: {
+			aspectRatio: props.aspectRatio ?? 2.5,
+			layout: {
+				padding: {
+					left: 0,
+					right: 0,
+					top: 0,
+					bottom: 0,
+				},
+			},
+			scales: {
+				x: {
+					grid: {
+						display: true,
+					},
+					ticks: {
+						display: false,
+						maxTicksLimit: 10,
+					},
+				},
+				y: {
+					min: 0,
+					grid: {
+					},
+				},
+			},
+			interaction: {
+				intersect: false,
+			},
+			plugins: {
+				legend: {
+					display: false,
+				},
+				tooltip: {
+					enabled: false,
+					mode: 'index',
+					animation: {
+						duration: 0,
+					},
+					external: externalTooltipHandler,
+				},
+			},
+		},
+		plugins: [chartVLine(vLineColor)],
+	});
+
+	setData();
+});
+</script>

packages/frontend/src/pages/admin/job-queue.job.vue

@@ -0,0 +1,280 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkFolder>
+	<template #label>
+		<span v-if="job.opts.repeat != null" style="margin-right: 1em;">&lt;repeat&gt;</span>
+		<span v-else style="margin-right: 1em;">#{{ job.id }}</span>
+		<span>{{ job.name }}</span>
+	</template>
+	<template #suffix>
+		<MkTime :time="job.finishedOn ?? job.processedOn ?? job.timestamp" mode="relative"/>
+		<span v-if="job.progress != null && job.progress > 0" style="margin-left: 1em;">{{ Math.floor(job.progress * 100) }}%</span>
+		<span v-if="job.opts.attempts != null && job.opts.attempts > 0 && job.attempts > 1" style="margin-left: 1em; color: var(--MI_THEME-warn); font-variant-numeric: diagonal-fractions;">{{ job.attempts }}/{{ job.opts.attempts }}</span>
+		<span v-if="job.isFailed && job.finishedOn != null" style="margin-left: 1em; color: var(--MI_THEME-error)"><i class="ti ti-circle-x"></i></span>
+		<span v-else-if="job.isFailed" style="margin-left: 1em; color: var(--MI_THEME-warn)"><i class="ti ti-alert-triangle"></i></span>
+		<span v-else-if="job.finishedOn != null" style="margin-left: 1em; color: var(--MI_THEME-success)"><i class="ti ti-check"></i></span>
+		<span v-else-if="job.delay != null && job.delay != 0" style="margin-left: 1em;"><i class="ti ti-clock"></i></span>
+		<span v-else-if="job.processedOn != null" style="margin-left: 1em; color: var(--MI_THEME-success)"><i class="ti ti-player-play"></i></span>
+	</template>
+	<template #header>
+		<MkTabs
+			v-model:tab="tab"
+			:tabs="[{
+					key: 'info',
+					title: 'Info',
+					icon: 'ti ti-info-circle',
+				}, {
+					key: 'timeline',
+					title: 'Timeline',
+					icon: 'ti ti-timeline-event',
+				}, {
+					key: 'data',
+					title: 'Data',
+					icon: 'ti ti-package',
+				}, ...(canEdit ? [{
+					key: 'dataEdit',
+					title: 'Data (edit)',
+					icon: 'ti ti-package',
+				}] : []),
+				...(job.returnValue != null ? [{
+					key: 'result',
+					title: 'Result',
+					icon: 'ti ti-check',
+				}] : []),
+				...(job.stacktrace.length > 0 ? [{
+					key: 'error',
+					title: 'Error',
+					icon: 'ti ti-alert-triangle',
+				}] : []), {
+					key: 'logs',
+					title: 'Logs',
+					icon: 'ti ti-logs',
+				}]"
+		/>
+	</template>
+	<template #footer>
+		<div class="_buttons">
+			<MkButton rounded @click="copyRaw()"><i class="ti ti-copy"></i> Copy raw</MkButton>
+			<MkButton rounded @click="refresh()"><i class="ti ti-reload"></i> Refresh view</MkButton>
+			<MkButton rounded @click="promoteJob()"><i class="ti ti-player-track-next"></i> Promote</MkButton>
+			<MkButton rounded @click="moveJob"><i class="ti ti-arrow-right"></i> Move to</MkButton>
+			<MkButton danger rounded style="margin-left: auto;" @click="removeJob()"><i class="ti ti-trash"></i> Remove</MkButton>
+		</div>
+	</template>
+
+	<div v-if="tab === 'info'" class="_gaps_s">
+		<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); gap: 12px;">
+			<MkKeyValue>
+				<template #key>ID</template>
+				<template #value>{{ job.id }}</template>
+			</MkKeyValue>
+			<MkKeyValue>
+				<template #key>Created at</template>
+				<template #value><MkTime :time="job.timestamp" mode="detail"/></template>
+			</MkKeyValue>
+			<MkKeyValue v-if="job.processedOn != null">
+				<template #key>Processed at</template>
+				<template #value><MkTime :time="job.processedOn" mode="detail"/></template>
+			</MkKeyValue>
+			<MkKeyValue v-if="job.finishedOn != null">
+				<template #key>Finished at</template>
+				<template #value><MkTime :time="job.finishedOn" mode="detail"/></template>
+			</MkKeyValue>
+			<MkKeyValue v-if="job.processedOn != null && job.finishedOn != null">
+				<template #key>Spent</template>
+				<template #value>{{ job.finishedOn - job.processedOn }}ms</template>
+			</MkKeyValue>
+			<MkKeyValue v-if="job.failedReason != null">
+				<template #key>Failed reason</template>
+				<template #value><i style="color: var(--MI_THEME-error)" class="ti ti-alert-triangle"></i> {{ job.failedReason }}</template>
+			</MkKeyValue>
+			<MkKeyValue v-if="job.opts.attempts != null && job.opts.attempts > 0">
+				<template #key>Attempts</template>
+				<template #value>{{ job.attempts }} of {{ job.opts.attempts }}</template>
+			</MkKeyValue>
+			<MkKeyValue v-if="job.progress != null && job.progress > 0">
+				<template #key>Progress</template>
+				<template #value>{{ Math.floor(job.progress * 100) }}%</template>
+			</MkKeyValue>
+		</div>
+		<MkFolder :withSpacer="false">
+			<template #label>Options</template>
+			<MkCode :code="JSON5.stringify(job.opts, null, '\t')" lang="js"/>
+		</MkFolder>
+	</div>
+	<div v-else-if="tab === 'timeline'">
+		<MkTl :events="timeline">
+			<template #left="{ event }">
+				<div>
+					<template v-if="event.type === 'finished'">
+						<template v-if="job.isFailed">
+							<b>Finished</b> <i class="ti ti-circle-x" style="color: var(--MI_THEME-error);"></i>
+						</template>
+						<template v-else>
+							<b>Finished</b> <i class="ti ti-check" style="color: var(--MI_THEME-success);"></i>
+						</template>
+					</template>
+					<template v-else-if="event.type === 'processed'">
+						<b>Processed</b> <i class="ti ti-player-play"></i>
+					</template>
+					<template v-else-if="event.type === 'attempt'">
+						<b>Attempt #{{ event.attempt }}</b> <i class="ti ti-alert-triangle" style="color: var(--MI_THEME-warn);"></i>
+					</template>
+					<template v-else-if="event.type === 'created'">
+						<b>Created</b> <i class="ti ti-plus"></i>
+					</template>
+				</div>
+			</template>
+			<template #right="{ event, timestamp, delta }">
+				<div style="margin: 8px 0;">
+					<template v-if="event.type === 'attempt'">
+						<div>at ?</div>
+					</template>
+					<template v-else>
+						<div>at <MkTime :time="timestamp" mode="detail"/></div>
+						<div style="font-size: 90%; opacity: 0.7;">{{ timestamp }} (+{{ msSMH(delta) }})</div>
+					</template>
+				</div>
+			</template>
+		</MkTl>
+	</div>
+	<div v-else-if="tab === 'data'">
+		<MkCode :code="JSON5.stringify(job.data, null, '\t')" lang="js"/>
+	</div>
+	<div v-else-if="tab === 'dataEdit'" class="_gaps_s">
+		<MkCodeEditor v-model="editData" lang="json5"></MkCodeEditor>
+		<MkButton><i class="ti ti-device-floppy"></i> Update</MkButton>
+	</div>
+	<div v-else-if="tab === 'result'">
+		<MkCode :code="job.returnValue"/>
+	</div>
+	<div v-else-if="tab === 'error'" class="_gaps_s">
+		<MkCode v-for="log in job.stacktrace" :code="log" lang="stacktrace"/>
+	</div>
+</MkFolder>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, watch } from 'vue';
+import JSON5 from 'json5';
+import type { Ref } from 'vue';
+import * as os from '@/os.js';
+import { i18n } from '@/i18n.js';
+import MkButton from '@/components/MkButton.vue';
+import { misskeyApi } from '@/utility/misskey-api.js';
+import MkTabs from '@/components/MkTabs.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import MkCode from '@/components/MkCode.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
+import MkCodeEditor from '@/components/MkCodeEditor.vue';
+import MkTl from '@/components/MkTl.vue';
+import kmg from '@/filters/kmg.js';
+import bytes from '@/filters/bytes.js';
+import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
+
+function msSMH(v: number | null) {
+	if (v == null) return 'N/A';
+	if (v === 0) return '0';
+	const suffixes = ['ms', 's', 'm', 'h'];
+	const isMinus = v < 0;
+	if (isMinus) v = -v;
+	const i = Math.floor(Math.log(v) / Math.log(1000));
+	const value = v / Math.pow(1000, i);
+	const suffix = suffixes[i];
+	return `${isMinus ? '-' : ''}${value.toFixed(1)}${suffix}`;
+}
+
+const props = defineProps<{
+	job: any;
+	queueType: string;
+}>();
+
+const emit = defineEmits<{
+	(ev: 'needRefresh'): void,
+}>();
+
+const tab = ref('info');
+const editData = ref(JSON5.stringify(props.job.data, null, '\t'));
+const canEdit = true;
+const timeline = computed(() => {
+	const events = [{
+		id: 'created',
+		timestamp: props.job.timestamp,
+		data: {
+			type: 'created',
+		},
+	}];
+	if (props.job.attempts > 1) {
+		for (let i = 1; i < props.job.attempts; i++) {
+			events.push({
+				id: `attempt-${i}`,
+				timestamp: props.job.timestamp + i,
+				data: {
+					type: 'attempt',
+					attempt: i,
+				},
+			});
+		}
+	}
+	if (props.job.processedOn != null) {
+		events.push({
+			id: 'processed',
+			timestamp: props.job.processedOn,
+			data: {
+				type: 'processed',
+			},
+		});
+	}
+	if (props.job.finishedOn != null) {
+		events.push({
+			id: 'finished',
+			timestamp: props.job.finishedOn,
+			data: {
+				type: 'finished',
+			},
+		});
+	}
+	return events;
+});
+
+async function promoteJob() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		title: i18n.ts.areYouSure,
+	});
+	if (canceled) return;
+
+	os.apiWithDialog('admin/queue/retry-job', { queue: props.queueType, jobId: props.job.id });
+}
+
+async function removeJob() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		title: i18n.ts.areYouSure,
+	});
+	if (canceled) return;
+
+	os.apiWithDialog('admin/queue/remove-job', { queue: props.queueType, jobId: props.job.id });
+}
+
+function moveJob() {
+	// TODO
+}
+
+function refresh() {
+	emit('needRefresh');
+}
+
+function copyRaw() {
+	const raw = JSON.stringify(props.job, null, '\t');
+	copyToClipboard(raw);
+}
+</script>
+
+<style lang="scss" module>
+
+</style>

packages/frontend/src/pages/admin/job-queue.vue

@@ -0,0 +1,370 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<PageWithHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs">
+	<MkSpacer>
+		<div v-if="tab === '-'" class="_gaps">
+			<div :class="$style.queues">
+				<div v-for="q in queueInfos" :key="q.name" :class="$style.queue" @click="tab = q.name">
+					<div style="display: flex; align-items: center; font-weight: bold;"><i class="ti ti-http-que" style="margin-right: 0.5em;"></i>{{ q.name }}<i v-if="!q.isPaused" style="color: var(--MI_THEME-success); margin-left: auto;" class="ti ti-player-play"></i></div>
+					<div :class="$style.queueCounts">
+						<MkKeyValue>
+							<template #key>Active</template>
+							<template #value>{{ kmg(q.counts.active, 2) }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Delayed</template>
+							<template #value>{{ kmg(q.counts.delayed, 2) }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Waiting</template>
+							<template #value>{{ kmg(q.counts.waiting, 2) }}</template>
+						</MkKeyValue>
+					</div>
+					<XChart :dataSet="{ completed: q.metrics.completed.data, failed: q.metrics.failed.data }"/>
+				</div>
+			</div>
+		</div>
+		<div v-else-if="queueInfo" class="_gaps">
+			<MkFolder :defaultOpen="true">
+				<template #label>Overview: {{ tab }}</template>
+				<template #icon><i class="ti ti-http-que"></i></template>
+				<template #suffix>#{{ queueInfo.db.processId }}:{{ queueInfo.db.port }} / {{ queueInfo.db.runId }}</template>
+				<template #caption>{{ queueInfo.qualifiedName }}</template>
+				<template #footer>
+					<div class="_buttons">
+						<MkButton rounded @click="promoteAllJobs"><i class="ti ti-player-track-next"></i> Promote all jobs</MkButton>
+						<MkButton rounded @click="createJob"><i class="ti ti-plus"></i> Add job</MkButton>
+						<MkButton v-if="queueInfo.isPaused" rounded @click="resumeQueue"><i class="ti ti-player-play"></i> Resume queue</MkButton>
+						<MkButton v-else rounded danger @click="pauseQueue"><i class="ti ti-player-pause"></i> Pause queue</MkButton>
+						<MkButton rounded danger @click="clearQueue"><i class="ti ti-trash"></i> Empty queue</MkButton>
+					</div>
+				</template>
+
+				<div class="_gaps">
+					<XChart :dataSet="{ completed: queueInfo.metrics.completed.data, failed: queueInfo.metrics.failed.data }" :aspectRatio="5"/>
+					<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 12px;">
+						<MkKeyValue>
+							<template #key>Active</template>
+							<template #value>{{ kmg(queueInfo.counts.active, 2) }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Delayed</template>
+							<template #value>{{ kmg(queueInfo.counts.delayed, 2) }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Waiting</template>
+							<template #value>{{ kmg(queueInfo.counts.waiting, 2) }}</template>
+						</MkKeyValue>
+					</div>
+					<hr>
+					<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 12px;">
+						<MkKeyValue>
+							<template #key>Clients: Connected</template>
+							<template #value>{{ queueInfo.db.clients.connected }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Clients: Blocked</template>
+							<template #value>{{ queueInfo.db.clients.blocked }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Memory: Peak</template>
+							<template #value>{{ bytes(queueInfo.db.memory.peak, 1) }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Memory: Total</template>
+							<template #value>{{ bytes(queueInfo.db.memory.total, 1) }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Memory: Used</template>
+							<template #value>{{ bytes(queueInfo.db.memory.used, 1) }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>Uptime</template>
+							<template #value>{{ queueInfo.db.uptime }}</template>
+						</MkKeyValue>
+					</div>
+				</div>
+			</MkFolder>
+
+			<MkFolder :defaultOpen="true" :withSpacer="false">
+				<template #label>Jobs: {{ tab }}</template>
+				<template #icon><i class="ti ti-list-check"></i></template>
+				<template #suffix>&lt;A:{{ kmg(queueInfo.counts.active, 2) }}&gt; &lt;D:{{ kmg(queueInfo.counts.delayed, 2) }}&gt; &lt;W:{{ kmg(queueInfo.counts.waiting, 2) }}&gt;</template>
+				<template #header>
+					<MkTabs
+						v-model:tab="jobState"
+						:class="$style.jobsTabs" :tabs="[{
+							key: 'all',
+							title: 'All',
+							icon: 'ti ti-code-asterisk',
+						}, {
+							key: 'latest',
+							title: 'Latest',
+							icon: 'ti ti-logs',
+						}, {
+							key: 'completed',
+							title: 'Completed',
+							icon: 'ti ti-check',
+						}, {
+							key: 'failed',
+							title: 'Failed',
+							icon: 'ti ti-circle-x',
+						}, {
+							key: 'active',
+							title: 'Active',
+							icon: 'ti ti-player-play',
+						}, {
+							key: 'delayed',
+							title: 'Delayed',
+							icon: 'ti ti-clock',
+						}, {
+							key: 'wait',
+							title: 'Waiting',
+							icon: 'ti ti-hourglass-high',
+						}, {
+							key: 'paused',
+							title: 'Paused',
+							icon: 'ti ti-player-pause',
+						}]"
+					/>
+				</template>
+				<template #footer>
+					<div class="_buttons">
+						<MkButton rounded @click="fetchJobs()"><i class="ti ti-reload"></i> Refresh view</MkButton>
+						<MkButton rounded danger style="margin-left: auto;" @click="removeJobs"><i class="ti ti-trash"></i> Remove jobs</MkButton>
+					</div>
+				</template>
+
+				<MkSpacer>
+					<MkInput
+						v-model="searchQuery"
+						:placeholder="i18n.ts.search"
+						type="search"
+						style="margin-bottom: 16px;"
+					>
+						<template #prefix><i class="ti ti-search"></i></template>
+					</MkInput>
+
+					<MkLoading v-if="jobsFetching"/>
+					<MkTl
+						v-else
+						:events="jobs.map((job) => ({
+							id: job.id,
+							timestamp: job.finishedOn ?? job.processedOn ?? job.timestamp,
+							data: job,
+						}))"
+						class="_monospace"
+					>
+						<template #right="{ event: job }">
+							<XJob :job="job" :queueType="tab" style="margin: 4px 0;" @needRefresh="refreshJob(job.id)"/>
+						</template>
+					</MkTl>
+				</MkSpacer>
+			</MkFolder>
+		</div>
+	</MkSpacer>
+</PageWithHeader>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, watch } from 'vue';
+import JSON5 from 'json5';
+import { debounce } from 'throttle-debounce';
+import { useInterval } from '@@/js/use-interval.js';
+import XChart from './job-queue.chart.vue';
+import XJob from './job-queue.job.vue';
+import type { Ref } from 'vue';
+import * as os from '@/os.js';
+import { i18n } from '@/i18n.js';
+import { definePage } from '@/page.js';
+import MkButton from '@/components/MkButton.vue';
+import { misskeyApi } from '@/utility/misskey-api.js';
+import MkTabs from '@/components/MkTabs.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import MkCode from '@/components/MkCode.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
+import MkTl from '@/components/MkTl.vue';
+import kmg from '@/filters/kmg.js';
+import MkInput from '@/components/MkInput.vue';
+import bytes from '@/filters/bytes.js';
+import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
+
+const QUEUE_TYPES = [
+	'system',
+	'endedPollNotification',
+	'deliver',
+	'inbox',
+	'db',
+	'relationship',
+	'objectStorage',
+	'userWebhookDeliver',
+	'systemWebhookDeliver',
+] as const;
+
+const tab: Ref<typeof QUEUE_TYPES[number] | '-'> = ref('-');
+const jobState = ref('all');
+const jobs = ref([]);
+const jobsFetching = ref(true);
+const queueInfos = ref([]);
+const queueInfo = ref();
+const searchQuery = ref('');
+
+async function fetchQueues() {
+	if (tab.value !== '-') return;
+	queueInfos.value = await misskeyApi('admin/queue/queues');
+}
+
+async function fetchCurrentQueue() {
+	if (tab.value === '-') return;
+	queueInfo.value = await misskeyApi('admin/queue/queue-stats', { queue: tab.value });
+}
+
+async function fetchJobs() {
+	jobsFetching.value = true;
+	const state = jobState.value;
+	jobs.value = await misskeyApi('admin/queue/jobs', {
+		queue: tab.value,
+		state: state === 'all' ? ['completed', 'failed', 'active', 'delayed', 'wait'] : state === 'latest' ? ['completed', 'failed'] : [state],
+		search: searchQuery.value.trim() === '' ? undefined : searchQuery.value,
+	}).then(res => {
+		if (state === 'all') {
+			res.sort((a, b) => (a.processedOn ?? a.timestamp) > (b.processedOn ?? b.timestamp) ? -1 : 1);
+		} else if (state === 'latest') {
+			res.sort((a, b) => a.processedOn > b.processedOn ? -1 : 1);
+		} else if (state === 'delayed') {
+			res.sort((a, b) => (a.processedOn ?? a.timestamp) > (b.processedOn ?? b.timestamp) ? -1 : 1);
+		}
+		return res;
+	});
+	jobsFetching.value = false;
+}
+
+watch([tab], async () => {
+	if (tab.value === '-') {
+		fetchQueues();
+	} else {
+		fetchCurrentQueue();
+		fetchJobs();
+	}
+}, { immediate: true });
+
+watch([jobState], () => {
+	fetchJobs();
+});
+
+const search = debounce(1000, () => {
+	fetchJobs();
+});
+
+watch([searchQuery], () => {
+	search();
+});
+
+useInterval(() => {
+	if (tab.value === '-') {
+		fetchQueues();
+	} else {
+		fetchCurrentQueue();
+	}
+}, 1000 * 10, {
+	immediate: false,
+	afterMounted: true,
+});
+
+async function clearQueue() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		title: i18n.ts.areYouSure,
+	});
+	if (canceled) return;
+
+	os.apiWithDialog('admin/queue/clear', { queue: tab.value, state: '*' });
+
+	fetchCurrentQueue();
+	fetchJobs();
+}
+
+async function promoteAllJobs() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		title: i18n.ts.areYouSure,
+	});
+	if (canceled) return;
+
+	os.apiWithDialog('admin/queue/promote-jobs', { queue: tab.value });
+
+	fetchCurrentQueue();
+	fetchJobs();
+}
+
+async function removeJobs() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		title: i18n.ts.areYouSure,
+	});
+	if (canceled) return;
+
+	os.apiWithDialog('admin/queue/clear', { queue: tab.value, state: jobState.value });
+
+	fetchCurrentQueue();
+	fetchJobs();
+}
+
+async function refreshJob(jobId: string) {
+	const newJob = await misskeyApi('admin/queue/show-job', { queue: tab.value, jobId });
+	const index = jobs.value.findIndex((job) => job.id === jobId);
+	if (index !== -1) {
+		jobs.value[index] = newJob;
+	}
+}
+
+const headerActions = computed(() => []);
+
+const headerTabs = computed(() =>
+	[{
+		key: '-',
+		title: i18n.ts.overview,
+		icon: 'ti ti-dashboard',
+	}].concat(QUEUE_TYPES.map((t) => ({
+		key: t,
+		title: t,
+	}))),
+);
+
+definePage(() => ({
+	title: i18n.ts.jobQueue,
+	icon: 'ti ti-clock-play',
+	needWideArea: true,
+}));
+</script>
+
+<style lang="scss" module>
+.queues {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
+	gap: 14px;
+}
+
+.queue {
+	padding: 14px 18px;
+	background-color: var(--MI_THEME-panel);
+	border-radius: 8px;
+	cursor: pointer;
+}
+
+.queueCounts {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
+	gap: 8px;
+	font-size: 85%;
+	margin: 6px 0;
+}
+
+.jobsTabs {
+
+}
+</style>

packages/frontend/src/pages/admin/moderation.vue

@@ -4,131 +4,127 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
-		<template #header><XHeader :tabs="headerTabs"/></template>
+		<FormSuspense :p="init">
-		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
+			<div class="_gaps_m">
-			<FormSuspense :p="init">
+				<MkSwitch :modelValue="enableRegistration" @update:modelValue="onChange_enableRegistration">
-				<div class="_gaps_m">
+					<template #label>{{ i18n.ts._serverSettings.openRegistration }}</template>
-					<MkSwitch :modelValue="enableRegistration" @update:modelValue="onChange_enableRegistration">
+					<template #caption>
-						<template #label>{{ i18n.ts._serverSettings.openRegistration }}</template>
+						<div>{{ i18n.ts._serverSettings.thisSettingWillAutomaticallyOffWhenModeratorsInactive }}</div>
-						<template #caption>
+						<div><i class="ti ti-alert-triangle" style="color: var(--MI_THEME-warn);"></i> {{ i18n.ts._serverSettings.openRegistrationWarning }}</div>
-							<div>{{ i18n.ts._serverSettings.thisSettingWillAutomaticallyOffWhenModeratorsInactive }}</div>
+					</template>
-							<div><i class="ti ti-alert-triangle" style="color: var(--MI_THEME-warn);"></i> {{ i18n.ts._serverSettings.openRegistrationWarning }}</div>
+				</MkSwitch>
-						</template>
-					</MkSwitch>
 
-					<MkSwitch v-model="emailRequiredForSignup" @change="onChange_emailRequiredForSignup">
+				<MkSwitch v-model="emailRequiredForSignup" @change="onChange_emailRequiredForSignup">
-						<template #label>{{ i18n.ts.emailRequiredForSignup }}</template>
+					<template #label>{{ i18n.ts.emailRequiredForSignup }}</template>
-					</MkSwitch>
+				</MkSwitch>
 
-					<FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink>
+				<FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-lock-star"></i></template>
+					<template #icon><i class="ti ti-lock-star"></i></template>
-						<template #label>{{ i18n.ts.preservedUsernames }}</template>
+					<template #label>{{ i18n.ts.preservedUsernames }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="preservedUsernames">
+						<MkTextarea v-model="preservedUsernames">
-								<template #caption>{{ i18n.ts.preservedUsernamesDescription }}</template>
+							<template #caption>{{ i18n.ts.preservedUsernamesDescription }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_preservedUsernames">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_preservedUsernames">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-message-exclamation"></i></template>
+					<template #icon><i class="ti ti-message-exclamation"></i></template>
-						<template #label>{{ i18n.ts.sensitiveWords }}</template>
+					<template #label>{{ i18n.ts.sensitiveWords }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="sensitiveWords">
+						<MkTextarea v-model="sensitiveWords">
-								<template #caption>{{ i18n.ts.sensitiveWordsDescription }}<br>{{ i18n.ts.sensitiveWordsDescription2 }}</template>
+							<template #caption>{{ i18n.ts.sensitiveWordsDescription }}<br>{{ i18n.ts.sensitiveWordsDescription2 }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_sensitiveWords">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_sensitiveWords">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-message-x"></i></template>
+					<template #icon><i class="ti ti-message-x"></i></template>
-						<template #label>{{ i18n.ts.prohibitedWords }}</template>
+					<template #label>{{ i18n.ts.prohibitedWords }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="prohibitedWords">
+						<MkTextarea v-model="prohibitedWords">
-								<template #caption>{{ i18n.ts.prohibitedWordsDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
+							<template #caption>{{ i18n.ts.prohibitedWordsDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_prohibitedWords">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_prohibitedWords">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-user-x"></i></template>
+					<template #icon><i class="ti ti-user-x"></i></template>
-						<template #label>{{ i18n.ts.prohibitedWordsForNameOfUser }}</template>
+					<template #label>{{ i18n.ts.prohibitedWordsForNameOfUser }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="prohibitedWordsForNameOfUser">
+						<MkTextarea v-model="prohibitedWordsForNameOfUser">
-								<template #caption>{{ i18n.ts.prohibitedWordsForNameOfUserDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
+							<template #caption>{{ i18n.ts.prohibitedWordsForNameOfUserDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_prohibitedWordsForNameOfUser">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_prohibitedWordsForNameOfUser">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-eye-off"></i></template>
+					<template #icon><i class="ti ti-eye-off"></i></template>
-						<template #label>{{ i18n.ts.hiddenTags }}</template>
+					<template #label>{{ i18n.ts.hiddenTags }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="hiddenTags">
+						<MkTextarea v-model="hiddenTags">
-								<template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
+							<template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_hiddenTags">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_hiddenTags">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-eye-off"></i></template>
+					<template #icon><i class="ti ti-eye-off"></i></template>
-						<template #label>{{ i18n.ts.silencedInstances }}</template>
+					<template #label>{{ i18n.ts.silencedInstances }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="silencedHosts">
+						<MkTextarea v-model="silencedHosts">
-								<template #caption>{{ i18n.ts.silencedInstancesDescription }}</template>
+							<template #caption>{{ i18n.ts.silencedInstancesDescription }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_silencedHosts">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_silencedHosts">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-eye-off"></i></template>
+					<template #icon><i class="ti ti-eye-off"></i></template>
-						<template #label>{{ i18n.ts.mediaSilencedInstances }}</template>
+					<template #label>{{ i18n.ts.mediaSilencedInstances }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="mediaSilencedHosts">
+						<MkTextarea v-model="mediaSilencedHosts">
-								<template #caption>{{ i18n.ts.mediaSilencedInstancesDescription }}</template>
+							<template #caption>{{ i18n.ts.mediaSilencedInstancesDescription }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_mediaSilencedHosts">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_mediaSilencedHosts">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
 
-					<MkFolder>
+				<MkFolder>
-						<template #icon><i class="ti ti-ban"></i></template>
+					<template #icon><i class="ti ti-ban"></i></template>
-						<template #label>{{ i18n.ts.blockedInstances }}</template>
+					<template #label>{{ i18n.ts.blockedInstances }}</template>
 
-						<div class="_gaps">
+					<div class="_gaps">
-							<MkTextarea v-model="blockedHosts">
+						<MkTextarea v-model="blockedHosts">
-								<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
+							<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
-							</MkTextarea>
+						</MkTextarea>
-							<MkButton primary @click="save_blockedHosts">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary @click="save_blockedHosts">{{ i18n.ts.save }}</MkButton>
-						</div>
+					</div>
-					</MkFolder>
+				</MkFolder>
-				</div>
+			</div>
-			</FormSuspense>
+		</FormSuspense>
-		</MkSpacer>
+	</MkSpacer>
-	</MkStickyContainer>
+</PageWithHeader>
-</div>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import XHeader from './_header_.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';

packages/frontend/src/pages/admin/modlog.ModLog.vue

@@ -84,7 +84,48 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span v-else-if="log.type === 'deleteChatRoom'">: @{{ log.info.room.name }}</span>
 	</template>
 	<template #icon>
-		<MkAvatar :user="log.user" :class="$style.avatar"/>
+		<i v-if="log.type === 'updateServerSettings'" class="ti ti-settings"></i>
+		<i v-else-if="log.type === 'updateUserNote'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'suspend'" class="ti ti-user-x"></i>
+		<i v-else-if="log.type === 'unsuspend'" class="ti ti-user-check"></i>
+		<i v-else-if="log.type === 'resetPassword'" class="ti ti-key"></i>
+		<i v-else-if="log.type === 'assignRole'" class="ti ti-user-plus"></i>
+		<i v-else-if="log.type === 'unassignRole'" class="ti ti-user-minus"></i>
+		<i v-else-if="log.type === 'createRole'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateRole'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteRole'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'addCustomEmoji'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateCustomEmoji'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteCustomEmoji'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'markSensitiveDriveFile'" class="ti ti-eye-exclamation"></i>
+		<i v-else-if="log.type === 'unmarkSensitiveDriveFile'" class="ti ti-eye"></i>
+		<i v-else-if="log.type === 'suspendRemoteInstance'" class="ti ti-x"></i>
+		<i v-else-if="log.type === 'unsuspendRemoteInstance'" class="ti ti-check"></i>
+		<i v-else-if="log.type === 'createGlobalAnnouncement'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateGlobalAnnouncement'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteGlobalAnnouncement'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'createUserAnnouncement'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateUserAnnouncement'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteUserAnnouncement'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'deleteNote'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'deleteDriveFile'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'createAd'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateAd'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteAd'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'createAvatarDecoration'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateAvatarDecoration'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteAvatarDecoration'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'createSystemWebhook'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateSystemWebhook'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteSystemWebhook'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'createAbuseReportNotificationRecipient'" class="ti ti-plus"></i>
+		<i v-else-if="log.type === 'updateAbuseReportNotificationRecipient'" class="ti ti-pencil"></i>
+		<i v-else-if="log.type === 'deleteAbuseReportNotificationRecipient'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'deleteAccount'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'deletePage'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'deleteFlash'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'deleteGalleryPost'" class="ti ti-trash"></i>
+		<i v-else-if="log.type === 'deleteChatRoom'" class="ti ti-trash"></i>
 	</template>
 	<template #suffix>
 		<MkTime :time="log.createdAt"/>
@@ -199,11 +240,6 @@ const props = defineProps<{
 </script>
 
 <style lang="scss" module>
-.avatar {
-	width: 18px;
-	height: 18px;
-}
-
 .diff {
 	background: #fff;
 	color: #000;

packages/frontend/src/pages/admin/modlog.vue

@@ -4,10 +4,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="900">
-		<div>
+		<div class="_gaps">
 			<div style="display: flex; gap: var(--MI-margin); flex-wrap: wrap;">
 				<MkSelect v-model="type" style="margin: 0; flex: 1;">
 					<template #label>{{ i18n.ts.type }}</template>
@@ -19,41 +18,68 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkInput>
 			</div>
 
-			<MkPagination v-slot="{items}" ref="logs" :pagination="pagination" style="margin-top: var(--MI-margin);">
+			<MkTl :events="timeline">
-				<MkDateSeparatedList v-slot="{ item }" :items="items" :noGap="false" style="--MI-margin: 8px;">
+				<template #left="{ event }">
-					<XModLog :key="item.id" :log="item"/>
+					<div>
-				</MkDateSeparatedList>
+						<MkAvatar :user="event.user" style="width: 24px; height: 24px;"/>
-			</MkPagination>
+					</div>
+				</template>
+				<template #right="{ event, timestamp, delta }">
+					<div style="margin: 4px 0;">
+						<XModLog :key="event.id" :log="event"/>
+					</div>
+				</template>
+			</MkTl>
+
+			<MkButton primary rounded style="margin: 0 auto;" @click="fetchMore">{{ i18n.ts.loadMore }}</MkButton>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
-import { computed, useTemplateRef, ref } from 'vue';
+import { computed, useTemplateRef, ref, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import XHeader from './_header_.vue';
 import XModLog from './modlog.ModLog.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import MkInput from '@/components/MkInput.vue';
-import MkPagination from '@/components/MkPagination.vue';
+import MkTl from '@/components/MkTl.vue';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
-import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
+import { misskeyApi } from '@/utility/misskey-api.js';
-
+import MkButton from '@/components/MkButton.vue';
-const logs = useTemplateRef('logs');
 
 const type = ref<string | null>(null);
 const moderatorId = ref('');
 
-const pagination = {
+const timeline = ref([]);
-	endpoint: 'admin/show-moderation-logs' as const,
+
-	limit: 30,
+watch([type, moderatorId], async () => {
-	params: computed(() => ({
+	const res = await misskeyApi('admin/show-moderation-logs', {
 		type: type.value,
 		userId: moderatorId.value === '' ? null : moderatorId.value,
-	})),
+	});
-};
+	timeline.value = res.map(x => ({
+		id: x.id,
+		timestamp: x.createdAt,
+		data: x,
+	}));
+}, { immediate: true });
+
+function fetchMore() {
+	const last = timeline.value[timeline.value.length - 1];
+	misskeyApi('admin/show-moderation-logs', {
+		type: type.value,
+		userId: moderatorId.value === '' ? null : moderatorId.value,
+		untilId: last.id,
+	}).then(res => {
+		timeline.value.push(...res.map(x => ({
+			id: x.id,
+			timestamp: x.createdAt,
+			data: x,
+		})));
+	});
+}
 
 const headerActions = computed(() => []);
 

packages/frontend/src/pages/admin/object-storage.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :tabs="headerTabs">
-	<template #header><XHeader :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<FormSuspense :p="init">
 			<div class="_gaps_m">
@@ -79,12 +78,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkSpacer>
 		</div>
 	</template>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import XHeader from './_header_.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkInput from '@/components/MkInput.vue';
 import FormSuspense from '@/components/form/suspense.vue';

packages/frontend/src/pages/admin/performance.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<div class="_gaps">
 			<div class="_panel" style="padding: 16px;">
@@ -104,12 +103,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkFolder>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import XHeader from './_header_.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { fetchInstance } from '@/instance.js';

packages/frontend/src/pages/admin/relays.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div class="_gaps">
 			<div v-for="relay in relays" :key="relay.inbox" class="relaycxt _panel" style="padding: 16px;">
@@ -20,13 +19,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
 import * as Misskey from 'misskey-js';
-import XHeader from './_header_.vue';
 import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';

packages/frontend/src/pages/admin/roles.edit.vue

@@ -4,28 +4,24 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="600" :marginMin="16" :marginMax="32">
-		<template #header><XHeader :tabs="headerTabs"/></template>
+		<XEditor v-if="data" v-model="data"/>
-		<MkSpacer :contentMax="600" :marginMin="16" :marginMax="32">
+	</MkSpacer>
-			<XEditor v-if="data" v-model="data"/>
+	<template #footer>
-		</MkSpacer>
+		<div :class="$style.footer">
-		<template #footer>
+			<MkSpacer :contentMax="600" :marginMin="16" :marginMax="16">
-			<div :class="$style.footer">
+				<MkButton primary rounded @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
-				<MkSpacer :contentMax="600" :marginMin="16" :marginMax="16">
+			</MkSpacer>
-					<MkButton primary rounded @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
+		</div>
-				</MkSpacer>
+	</template>
-			</div>
+</PageWithHeader>
-		</template>
-	</MkStickyContainer>
-</div>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { v4 as uuid } from 'uuid';
-import XHeader from './_header_.vue';
 import XEditor from './roles.editor.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';

packages/frontend/src/pages/admin/roles.role.vue

@@ -4,66 +4,62 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="700">
-		<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
+		<div class="_gaps">
-		<MkSpacer :contentMax="700">
+			<div class="_buttons">
-			<div class="_gaps">
+				<MkButton primary rounded @click="edit"><i class="ti ti-pencil"></i> {{ i18n.ts.edit }}</MkButton>
-				<div class="_buttons">
+				<MkButton danger rounded @click="del"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
-					<MkButton primary rounded @click="edit"><i class="ti ti-pencil"></i> {{ i18n.ts.edit }}</MkButton>
+			</div>
-					<MkButton danger rounded @click="del"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+			<MkFolder>
-				</div>
+				<template #icon><i class="ti ti-info-circle"></i></template>
-				<MkFolder>
+				<template #label>{{ i18n.ts.info }}</template>
-					<template #icon><i class="ti ti-info-circle"></i></template>
+				<XEditor :modelValue="role" readonly/>
-					<template #label>{{ i18n.ts.info }}</template>
+			</MkFolder>
-					<XEditor :modelValue="role" readonly/>
+			<MkFolder v-if="role.target === 'manual'" defaultOpen>
-				</MkFolder>
+				<template #icon><i class="ti ti-users"></i></template>
-				<MkFolder v-if="role.target === 'manual'" defaultOpen>
+				<template #label>{{ i18n.ts.users }}</template>
-					<template #icon><i class="ti ti-users"></i></template>
+				<template #suffix>{{ role.usersCount }}</template>
-					<template #label>{{ i18n.ts.users }}</template>
+				<div class="_gaps">
-					<template #suffix>{{ role.usersCount }}</template>
+					<MkButton primary rounded @click="assign"><i class="ti ti-plus"></i> {{ i18n.ts.assign }}</MkButton>
-					<div class="_gaps">
-						<MkButton primary rounded @click="assign"><i class="ti ti-plus"></i> {{ i18n.ts.assign }}</MkButton>
 
-						<MkPagination :pagination="usersPagination">
+					<MkPagination :pagination="usersPagination">
-							<template #empty>
+						<template #empty>
-								<div class="_fullinfo">
+							<div class="_fullinfo">
-									<img :src="infoImageUrl" draggable="false"/>
+								<img :src="infoImageUrl" draggable="false"/>
-									<div>{{ i18n.ts.noUsers }}</div>
+								<div>{{ i18n.ts.noUsers }}</div>
-								</div>
+							</div>
-							</template>
+						</template>
 
-							<template #default="{ items }">
+						<template #default="{ items }">
-								<div class="_gaps_s">
+							<div class="_gaps_s">
-									<div v-for="item in items" :key="item.user.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedItems.includes(item.id) }]">
+								<div v-for="item in items" :key="item.user.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedItems.includes(item.id) }]">
-										<div :class="$style.userItemMain">
+									<div :class="$style.userItemMain">
-											<MkA :class="$style.userItemMainBody" :to="`/admin/user/${item.user.id}`">
+										<MkA :class="$style.userItemMainBody" :to="`/admin/user/${item.user.id}`">
-												<MkUserCardMini :user="item.user"/>
+											<MkUserCardMini :user="item.user"/>
-											</MkA>
+										</MkA>
-											<button class="_button" :class="$style.userToggle" @click="toggleItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
+										<button class="_button" :class="$style.userToggle" @click="toggleItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
-											<button class="_button" :class="$style.unassign" @click="unassign(item.user, $event)"><i class="ti ti-x"></i></button>
+										<button class="_button" :class="$style.unassign" @click="unassign(item.user, $event)"><i class="ti ti-x"></i></button>
-										</div>
+									</div>
-										<div v-if="expandedItems.includes(item.id)" :class="$style.userItemSub">
+									<div v-if="expandedItems.includes(item.id)" :class="$style.userItemSub">
-											<div>Assigned: <MkTime :time="item.createdAt" mode="detail"/></div>
+										<div>Assigned: <MkTime :time="item.createdAt" mode="detail"/></div>
-											<div v-if="item.expiresAt">Period: {{ new Date(item.expiresAt).toLocaleString() }}</div>
+										<div v-if="item.expiresAt">Period: {{ new Date(item.expiresAt).toLocaleString() }}</div>
-											<div v-else>Period: {{ i18n.ts.indefinitely }}</div>
+										<div v-else>Period: {{ i18n.ts.indefinitely }}</div>
-										</div>
 									</div>
 								</div>
-							</template>
+							</div>
-						</MkPagination>
+						</template>
-					</div>
+					</MkPagination>
-				</MkFolder>
+				</div>
-				<MkInfo v-else>{{ i18n.ts._role.isConditionalRole }}</MkInfo>
+			</MkFolder>
-			</div>
+			<MkInfo v-else>{{ i18n.ts._role.isConditionalRole }}</MkInfo>
-		</MkSpacer>
+		</div>
-	</MkStickyContainer>
+	</MkSpacer>
-</div>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { computed, reactive, ref } from 'vue';
-import XHeader from './_header_.vue';
 import XEditor from './roles.editor.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import * as os from '@/os.js';

packages/frontend/src/pages/admin/roles.vue

@@ -4,296 +4,292 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="700">
-		<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
+		<div class="_gaps">
-		<MkSpacer :contentMax="700">
+			<MkFolder>
-			<div class="_gaps">
+				<template #label>{{ i18n.ts._role.baseRole }}</template>
-				<MkFolder>
+				<template #footer>
-					<template #label>{{ i18n.ts._role.baseRole }}</template>
+					<MkButton primary rounded @click="updateBaseRole">{{ i18n.ts.save }}</MkButton>
-					<template #footer>
+				</template>
-						<MkButton primary rounded @click="updateBaseRole">{{ i18n.ts.save }}</MkButton>
-					</template>
-					<div class="_gaps_s">
-						<MkInput v-model="baseRoleQ" type="search">
-							<template #prefix><i class="ti ti-search"></i></template>
-						</MkInput>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.rateLimitFactor, 'rateLimitFactor'])">
-							<template #label>{{ i18n.ts._role._options.rateLimitFactor }}</template>
-							<template #suffix>{{ Math.floor(policies.rateLimitFactor * 100) }}%</template>
-							<MkRange :modelValue="policies.rateLimitFactor * 100" :min="30" :max="300" :step="10" :textConverter="(v) => `${v}%`" @update:modelValue="v => policies.rateLimitFactor = (v / 100)">
-								<template #caption>{{ i18n.ts._role._options.descriptionOfRateLimitFactor }}</template>
-							</MkRange>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.gtlAvailable, 'gtlAvailable'])">
-							<template #label>{{ i18n.ts._role._options.gtlAvailable }}</template>
-							<template #suffix>{{ policies.gtlAvailable ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.gtlAvailable">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.ltlAvailable, 'ltlAvailable'])">
-							<template #label>{{ i18n.ts._role._options.ltlAvailable }}</template>
-							<template #suffix>{{ policies.ltlAvailable ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.ltlAvailable">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canPublicNote, 'canPublicNote'])">
-							<template #label>{{ i18n.ts._role._options.canPublicNote }}</template>
-							<template #suffix>{{ policies.canPublicNote ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canPublicNote">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.chatAvailability, 'chatAvailability'])">
-							<template #label>{{ i18n.ts._role._options.chatAvailability }}</template>
-							<template #suffix>{{ policies.chatAvailability === 'available' ? i18n.ts.yes : policies.chatAvailability === 'readonly' ? i18n.ts.readonly : i18n.ts.no }}</template>
-							<MkSelect v-model="policies.chatAvailability">
-								<template #label>{{ i18n.ts.enable }}</template>
-								<option value="available">{{ i18n.ts.enabled }}</option>
-								<option value="readonly">{{ i18n.ts.readonly }}</option>
-								<option value="unavailable">{{ i18n.ts.disabled }}</option>
-							</MkSelect>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.mentionMax, 'mentionLimit'])">
-							<template #label>{{ i18n.ts._role._options.mentionMax }}</template>
-							<template #suffix>{{ policies.mentionLimit }}</template>
-							<MkInput v-model="policies.mentionLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canInvite, 'canInvite'])">
-							<template #label>{{ i18n.ts._role._options.canInvite }}</template>
-							<template #suffix>{{ policies.canInvite ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canInvite">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.inviteLimit, 'inviteLimit'])">
-							<template #label>{{ i18n.ts._role._options.inviteLimit }}</template>
-							<template #suffix>{{ policies.inviteLimit }}</template>
-							<MkInput v-model="policies.inviteLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.inviteLimitCycle, 'inviteLimitCycle'])">
-							<template #label>{{ i18n.ts._role._options.inviteLimitCycle }}</template>
-							<template #suffix>{{ policies.inviteLimitCycle + i18n.ts._time.minute }}</template>
-							<MkInput v-model="policies.inviteLimitCycle" type="number">
-								<template #suffix>{{ i18n.ts._time.minute }}</template>
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.inviteExpirationTime, 'inviteExpirationTime'])">
-							<template #label>{{ i18n.ts._role._options.inviteExpirationTime }}</template>
-							<template #suffix>{{ policies.inviteExpirationTime + i18n.ts._time.minute }}</template>
-							<MkInput v-model="policies.inviteExpirationTime" type="number">
-								<template #suffix>{{ i18n.ts._time.minute }}</template>
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canManageAvatarDecorations, 'canManageAvatarDecorations'])">
-							<template #label>{{ i18n.ts._role._options.canManageAvatarDecorations }}</template>
-							<template #suffix>{{ policies.canManageAvatarDecorations ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canManageAvatarDecorations">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canManageCustomEmojis, 'canManageCustomEmojis'])">
-							<template #label>{{ i18n.ts._role._options.canManageCustomEmojis }}</template>
-							<template #suffix>{{ policies.canManageCustomEmojis ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canManageCustomEmojis">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canSearchNotes, 'canSearchNotes'])">
-							<template #label>{{ i18n.ts._role._options.canSearchNotes }}</template>
-							<template #suffix>{{ policies.canSearchNotes ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canSearchNotes">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canSearchNotes'])">
-							<template #label>{{ i18n.ts._role._options.canUseTranslator }}</template>
-							<template #suffix>{{ policies.canUseTranslator ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canUseTranslator">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.driveCapacity, 'driveCapacityMb'])">
-							<template #label>{{ i18n.ts._role._options.driveCapacity }}</template>
-							<template #suffix>{{ policies.driveCapacityMb }}MB</template>
-							<MkInput v-model="policies.driveCapacityMb" type="number">
-								<template #suffix>MB</template>
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.alwaysMarkNsfw, 'alwaysMarkNsfw'])">
-							<template #label>{{ i18n.ts._role._options.alwaysMarkNsfw }}</template>
-							<template #suffix>{{ policies.alwaysMarkNsfw ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.alwaysMarkNsfw">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUpdateBioMedia, 'canUpdateBioMedia'])">
-							<template #label>{{ i18n.ts._role._options.canUpdateBioMedia }}</template>
-							<template #suffix>{{ policies.canUpdateBioMedia ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canUpdateBioMedia">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.pinMax, 'pinLimit'])">
-							<template #label>{{ i18n.ts._role._options.pinMax }}</template>
-							<template #suffix>{{ policies.pinLimit }}</template>
-							<MkInput v-model="policies.pinLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.antennaMax, 'antennaLimit'])">
-							<template #label>{{ i18n.ts._role._options.antennaMax }}</template>
-							<template #suffix>{{ policies.antennaLimit }}</template>
-							<MkInput v-model="policies.antennaLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.wordMuteMax, 'wordMuteLimit'])">
-							<template #label>{{ i18n.ts._role._options.wordMuteMax }}</template>
-							<template #suffix>{{ policies.wordMuteLimit }}</template>
-							<MkInput v-model="policies.wordMuteLimit" type="number">
-								<template #suffix>chars</template>
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.webhookMax, 'webhookLimit'])">
-							<template #label>{{ i18n.ts._role._options.webhookMax }}</template>
-							<template #suffix>{{ policies.webhookLimit }}</template>
-							<MkInput v-model="policies.webhookLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.clipMax, 'clipLimit'])">
-							<template #label>{{ i18n.ts._role._options.clipMax }}</template>
-							<template #suffix>{{ policies.clipLimit }}</template>
-							<MkInput v-model="policies.clipLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.noteEachClipsMax, 'noteEachClipsLimit'])">
-							<template #label>{{ i18n.ts._role._options.noteEachClipsMax }}</template>
-							<template #suffix>{{ policies.noteEachClipsLimit }}</template>
-							<MkInput v-model="policies.noteEachClipsLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.userListMax, 'userListLimit'])">
-							<template #label>{{ i18n.ts._role._options.userListMax }}</template>
-							<template #suffix>{{ policies.userListLimit }}</template>
-							<MkInput v-model="policies.userListLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.userEachUserListsMax, 'userEachUserListsLimit'])">
-							<template #label>{{ i18n.ts._role._options.userEachUserListsMax }}</template>
-							<template #suffix>{{ policies.userEachUserListsLimit }}</template>
-							<MkInput v-model="policies.userEachUserListsLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canHideAds, 'canHideAds'])">
-							<template #label>{{ i18n.ts._role._options.canHideAds }}</template>
-							<template #suffix>{{ policies.canHideAds ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canHideAds">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.avatarDecorationLimit, 'avatarDecorationLimit'])">
-							<template #label>{{ i18n.ts._role._options.avatarDecorationLimit }}</template>
-							<template #suffix>{{ policies.avatarDecorationLimit }}</template>
-							<MkInput v-model="avatarDecorationLimit" type="number" :min="0" :max="16" @update:modelValue="updateAvatarDecorationLimit">
-							</MkInput>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportAntennas, 'canImportAntennas'])">
-							<template #label>{{ i18n.ts._role._options.canImportAntennas }}</template>
-							<template #suffix>{{ policies.canImportAntennas ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canImportAntennas">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportBlocking, 'canImportBlocking'])">
-							<template #label>{{ i18n.ts._role._options.canImportBlocking }}</template>
-							<template #suffix>{{ policies.canImportBlocking ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canImportBlocking">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportFollowing, 'canImportFollowing'])">
-							<template #label>{{ i18n.ts._role._options.canImportFollowing }}</template>
-							<template #suffix>{{ policies.canImportFollowing ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canImportFollowing">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportMuting, 'canImportMuting'])">
-							<template #label>{{ i18n.ts._role._options.canImportMuting }}</template>
-							<template #suffix>{{ policies.canImportMuting ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canImportMuting">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportUserLists, 'canImportUserList'])">
-							<template #label>{{ i18n.ts._role._options.canImportUserLists }}</template>
-							<template #suffix>{{ policies.canImportUserLists ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canImportUserLists">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-					</div>
-				</MkFolder>
-				<MkButton primary rounded @click="create"><i class="ti ti-plus"></i> {{ i18n.ts._role.new }}</MkButton>
 				<div class="_gaps_s">
-					<MkFoldableSection>
+					<MkInput v-model="baseRoleQ" type="search">
-						<template #header>{{ i18n.ts._role.manualRoles }}</template>
+						<template #prefix><i class="ti ti-search"></i></template>
-						<div class="_gaps_s">
+					</MkInput>
-							<MkRolePreview v-for="role in roles.filter(x => x.target === 'manual')" :key="role.id" :role="role" :forModeration="true"/>
+
-						</div>
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.rateLimitFactor, 'rateLimitFactor'])">
-					</MkFoldableSection>
+						<template #label>{{ i18n.ts._role._options.rateLimitFactor }}</template>
-					<MkFoldableSection>
+						<template #suffix>{{ Math.floor(policies.rateLimitFactor * 100) }}%</template>
-						<template #header>{{ i18n.ts._role.conditionalRoles }}</template>
+						<MkRange :modelValue="policies.rateLimitFactor * 100" :min="30" :max="300" :step="10" :textConverter="(v) => `${v}%`" @update:modelValue="v => policies.rateLimitFactor = (v / 100)">
-						<div class="_gaps_s">
+							<template #caption>{{ i18n.ts._role._options.descriptionOfRateLimitFactor }}</template>
-							<MkRolePreview v-for="role in roles.filter(x => x.target === 'conditional')" :key="role.id" :role="role" :forModeration="true"/>
+						</MkRange>
-						</div>
+					</MkFolder>
-					</MkFoldableSection>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.gtlAvailable, 'gtlAvailable'])">
+						<template #label>{{ i18n.ts._role._options.gtlAvailable }}</template>
+						<template #suffix>{{ policies.gtlAvailable ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.gtlAvailable">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.ltlAvailable, 'ltlAvailable'])">
+						<template #label>{{ i18n.ts._role._options.ltlAvailable }}</template>
+						<template #suffix>{{ policies.ltlAvailable ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.ltlAvailable">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canPublicNote, 'canPublicNote'])">
+						<template #label>{{ i18n.ts._role._options.canPublicNote }}</template>
+						<template #suffix>{{ policies.canPublicNote ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canPublicNote">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.chatAvailability, 'chatAvailability'])">
+						<template #label>{{ i18n.ts._role._options.chatAvailability }}</template>
+						<template #suffix>{{ policies.chatAvailability === 'available' ? i18n.ts.yes : policies.chatAvailability === 'readonly' ? i18n.ts.readonly : i18n.ts.no }}</template>
+						<MkSelect v-model="policies.chatAvailability">
+							<template #label>{{ i18n.ts.enable }}</template>
+							<option value="available">{{ i18n.ts.enabled }}</option>
+							<option value="readonly">{{ i18n.ts.readonly }}</option>
+							<option value="unavailable">{{ i18n.ts.disabled }}</option>
+						</MkSelect>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.mentionMax, 'mentionLimit'])">
+						<template #label>{{ i18n.ts._role._options.mentionMax }}</template>
+						<template #suffix>{{ policies.mentionLimit }}</template>
+						<MkInput v-model="policies.mentionLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canInvite, 'canInvite'])">
+						<template #label>{{ i18n.ts._role._options.canInvite }}</template>
+						<template #suffix>{{ policies.canInvite ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canInvite">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.inviteLimit, 'inviteLimit'])">
+						<template #label>{{ i18n.ts._role._options.inviteLimit }}</template>
+						<template #suffix>{{ policies.inviteLimit }}</template>
+						<MkInput v-model="policies.inviteLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.inviteLimitCycle, 'inviteLimitCycle'])">
+						<template #label>{{ i18n.ts._role._options.inviteLimitCycle }}</template>
+						<template #suffix>{{ policies.inviteLimitCycle + i18n.ts._time.minute }}</template>
+						<MkInput v-model="policies.inviteLimitCycle" type="number">
+							<template #suffix>{{ i18n.ts._time.minute }}</template>
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.inviteExpirationTime, 'inviteExpirationTime'])">
+						<template #label>{{ i18n.ts._role._options.inviteExpirationTime }}</template>
+						<template #suffix>{{ policies.inviteExpirationTime + i18n.ts._time.minute }}</template>
+						<MkInput v-model="policies.inviteExpirationTime" type="number">
+							<template #suffix>{{ i18n.ts._time.minute }}</template>
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canManageAvatarDecorations, 'canManageAvatarDecorations'])">
+						<template #label>{{ i18n.ts._role._options.canManageAvatarDecorations }}</template>
+						<template #suffix>{{ policies.canManageAvatarDecorations ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canManageAvatarDecorations">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canManageCustomEmojis, 'canManageCustomEmojis'])">
+						<template #label>{{ i18n.ts._role._options.canManageCustomEmojis }}</template>
+						<template #suffix>{{ policies.canManageCustomEmojis ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canManageCustomEmojis">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canSearchNotes, 'canSearchNotes'])">
+						<template #label>{{ i18n.ts._role._options.canSearchNotes }}</template>
+						<template #suffix>{{ policies.canSearchNotes ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canSearchNotes">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canSearchNotes'])">
+						<template #label>{{ i18n.ts._role._options.canUseTranslator }}</template>
+						<template #suffix>{{ policies.canUseTranslator ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canUseTranslator">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.driveCapacity, 'driveCapacityMb'])">
+						<template #label>{{ i18n.ts._role._options.driveCapacity }}</template>
+						<template #suffix>{{ policies.driveCapacityMb }}MB</template>
+						<MkInput v-model="policies.driveCapacityMb" type="number">
+							<template #suffix>MB</template>
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.alwaysMarkNsfw, 'alwaysMarkNsfw'])">
+						<template #label>{{ i18n.ts._role._options.alwaysMarkNsfw }}</template>
+						<template #suffix>{{ policies.alwaysMarkNsfw ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.alwaysMarkNsfw">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canUpdateBioMedia, 'canUpdateBioMedia'])">
+						<template #label>{{ i18n.ts._role._options.canUpdateBioMedia }}</template>
+						<template #suffix>{{ policies.canUpdateBioMedia ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canUpdateBioMedia">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.pinMax, 'pinLimit'])">
+						<template #label>{{ i18n.ts._role._options.pinMax }}</template>
+						<template #suffix>{{ policies.pinLimit }}</template>
+						<MkInput v-model="policies.pinLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.antennaMax, 'antennaLimit'])">
+						<template #label>{{ i18n.ts._role._options.antennaMax }}</template>
+						<template #suffix>{{ policies.antennaLimit }}</template>
+						<MkInput v-model="policies.antennaLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.wordMuteMax, 'wordMuteLimit'])">
+						<template #label>{{ i18n.ts._role._options.wordMuteMax }}</template>
+						<template #suffix>{{ policies.wordMuteLimit }}</template>
+						<MkInput v-model="policies.wordMuteLimit" type="number">
+							<template #suffix>chars</template>
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.webhookMax, 'webhookLimit'])">
+						<template #label>{{ i18n.ts._role._options.webhookMax }}</template>
+						<template #suffix>{{ policies.webhookLimit }}</template>
+						<MkInput v-model="policies.webhookLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.clipMax, 'clipLimit'])">
+						<template #label>{{ i18n.ts._role._options.clipMax }}</template>
+						<template #suffix>{{ policies.clipLimit }}</template>
+						<MkInput v-model="policies.clipLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.noteEachClipsMax, 'noteEachClipsLimit'])">
+						<template #label>{{ i18n.ts._role._options.noteEachClipsMax }}</template>
+						<template #suffix>{{ policies.noteEachClipsLimit }}</template>
+						<MkInput v-model="policies.noteEachClipsLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.userListMax, 'userListLimit'])">
+						<template #label>{{ i18n.ts._role._options.userListMax }}</template>
+						<template #suffix>{{ policies.userListLimit }}</template>
+						<MkInput v-model="policies.userListLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.userEachUserListsMax, 'userEachUserListsLimit'])">
+						<template #label>{{ i18n.ts._role._options.userEachUserListsMax }}</template>
+						<template #suffix>{{ policies.userEachUserListsLimit }}</template>
+						<MkInput v-model="policies.userEachUserListsLimit" type="number">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canHideAds, 'canHideAds'])">
+						<template #label>{{ i18n.ts._role._options.canHideAds }}</template>
+						<template #suffix>{{ policies.canHideAds ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canHideAds">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.avatarDecorationLimit, 'avatarDecorationLimit'])">
+						<template #label>{{ i18n.ts._role._options.avatarDecorationLimit }}</template>
+						<template #suffix>{{ policies.avatarDecorationLimit }}</template>
+						<MkInput v-model="avatarDecorationLimit" type="number" :min="0" :max="16" @update:modelValue="updateAvatarDecorationLimit">
+						</MkInput>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportAntennas, 'canImportAntennas'])">
+						<template #label>{{ i18n.ts._role._options.canImportAntennas }}</template>
+						<template #suffix>{{ policies.canImportAntennas ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canImportAntennas">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportBlocking, 'canImportBlocking'])">
+						<template #label>{{ i18n.ts._role._options.canImportBlocking }}</template>
+						<template #suffix>{{ policies.canImportBlocking ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canImportBlocking">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportFollowing, 'canImportFollowing'])">
+						<template #label>{{ i18n.ts._role._options.canImportFollowing }}</template>
+						<template #suffix>{{ policies.canImportFollowing ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canImportFollowing">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportMuting, 'canImportMuting'])">
+						<template #label>{{ i18n.ts._role._options.canImportMuting }}</template>
+						<template #suffix>{{ policies.canImportMuting ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canImportMuting">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
+
+					<MkFolder v-if="matchQuery([i18n.ts._role._options.canImportUserLists, 'canImportUserList'])">
+						<template #label>{{ i18n.ts._role._options.canImportUserLists }}</template>
+						<template #suffix>{{ policies.canImportUserLists ? i18n.ts.yes : i18n.ts.no }}</template>
+						<MkSwitch v-model="policies.canImportUserLists">
+							<template #label>{{ i18n.ts.enable }}</template>
+						</MkSwitch>
+					</MkFolder>
 				</div>
+			</MkFolder>
+			<MkButton primary rounded @click="create"><i class="ti ti-plus"></i> {{ i18n.ts._role.new }}</MkButton>
+			<div class="_gaps_s">
+				<MkFoldableSection>
+					<template #header>{{ i18n.ts._role.manualRoles }}</template>
+					<div class="_gaps_s">
+						<MkRolePreview v-for="role in roles.filter(x => x.target === 'manual')" :key="role.id" :role="role" :forModeration="true"/>
+					</div>
+				</MkFoldableSection>
+				<MkFoldableSection>
+					<template #header>{{ i18n.ts._role.conditionalRoles }}</template>
+					<div class="_gaps_s">
+						<MkRolePreview v-for="role in roles.filter(x => x.target === 'conditional')" :key="role.id" :role="role" :forModeration="true"/>
+					</div>
+				</MkFoldableSection>
 			</div>
-		</MkSpacer>
+		</div>
-	</MkStickyContainer>
+	</MkSpacer>
-</div>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { computed, reactive, ref } from 'vue';
 import { ROLE_POLICIES } from '@@/js/const.js';
-import XHeader from './_header_.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import MkSwitch from '@/components/MkSwitch.vue';

packages/frontend/src/pages/admin/security.vue

@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<div class="_gaps_m">
 			<XBotProtection/>
@@ -117,13 +116,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkFolder>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
 import XBotProtection from './bot-protection.vue';
-import XHeader from './_header_.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import MkRadios from '@/components/MkRadios.vue';
 import MkSwitch from '@/components/MkSwitch.vue';

packages/frontend/src/pages/admin/server-rules.vue

@@ -4,45 +4,41 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
-		<template #header><XHeader :tabs="headerTabs"/></template>
+		<div class="_gaps_m">
-		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
+			<div>{{ i18n.ts._serverRules.description }}</div>
-			<div class="_gaps_m">
+			<Sortable
-				<div>{{ i18n.ts._serverRules.description }}</div>
+				v-model="serverRules"
-				<Sortable
+				class="_gaps_m"
-					v-model="serverRules"
+				:itemKey="(_, i) => i"
-					class="_gaps_m"
+				:animation="150"
-					:itemKey="(_, i) => i"
+				:handle="'.' + $style.itemHandle"
-					:animation="150"
+				@start="e => e.item.classList.add('active')"
-					:handle="'.' + $style.itemHandle"
+				@end="e => e.item.classList.remove('active')"
-					@start="e => e.item.classList.add('active')"
+			>
-					@end="e => e.item.classList.remove('active')"
+				<template #item="{element,index}">
-				>
+					<div :class="$style.item">
-					<template #item="{element,index}">
+						<div :class="$style.itemHeader">
-						<div :class="$style.item">
+							<div :class="$style.itemNumber" v-text="String(index + 1)"/>
-							<div :class="$style.itemHeader">
+							<span :class="$style.itemHandle"><i class="ti ti-menu"/></span>
-								<div :class="$style.itemNumber" v-text="String(index + 1)"/>
+							<button class="_button" :class="$style.itemRemove" @click="remove(index)"><i class="ti ti-x"></i></button>
-								<span :class="$style.itemHandle"><i class="ti ti-menu"/></span>
-								<button class="_button" :class="$style.itemRemove" @click="remove(index)"><i class="ti ti-x"></i></button>
-							</div>
-							<MkInput v-model="serverRules[index]"/>
 						</div>
-					</template>
+						<MkInput v-model="serverRules[index]"/>
-				</Sortable>
+					</div>
-				<div :class="$style.commands">
+				</template>
-					<MkButton rounded @click="serverRules.push('')"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
+			</Sortable>
-					<MkButton primary rounded @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
+			<div :class="$style.commands">
-				</div>
+				<MkButton rounded @click="serverRules.push('')"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
+				<MkButton primary rounded @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
 			</div>
-		</MkSpacer>
+		</div>
-	</MkStickyContainer>
+	</MkSpacer>
-</div>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent, ref, computed } from 'vue';
-import XHeader from './_header_.vue';
 import * as os from '@/os.js';
 import { fetchInstance, instance } from '@/instance.js';
 import { i18n } from '@/i18n.js';

packages/frontend/src/pages/admin/settings.vue

@@ -4,262 +4,258 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
-		<template #header><XHeader :tabs="headerTabs"/></template>
+		<div class="_gaps_m">
-		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
+			<MkFolder :defaultOpen="true">
-			<div class="_gaps_m">
+				<template #icon><i class="ti ti-info-circle"></i></template>
-				<MkFolder :defaultOpen="true">
+				<template #label>{{ i18n.ts.info }}</template>
-					<template #icon><i class="ti ti-info-circle"></i></template>
+				<template v-if="infoForm.modified.value" #footer>
-					<template #label>{{ i18n.ts.info }}</template>
+					<MkFormFooter :form="infoForm"/>
-					<template v-if="infoForm.modified.value" #footer>
+				</template>
-						<MkFormFooter :form="infoForm"/>
-					</template>
 
-					<div class="_gaps">
+				<div class="_gaps">
-						<MkInput v-model="infoForm.state.name">
+					<MkInput v-model="infoForm.state.name">
-							<template #label>{{ i18n.ts.instanceName }}<span v-if="infoForm.modifiedStates.name" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #label>{{ i18n.ts.instanceName }}<span v-if="infoForm.modifiedStates.name" class="_modified">{{ i18n.ts.modified }}</span></template>
-						</MkInput>
+					</MkInput>
 
-						<MkInput v-model="infoForm.state.shortName">
+					<MkInput v-model="infoForm.state.shortName">
-							<template #label>{{ i18n.ts._serverSettings.shortName }} ({{ i18n.ts.optional }})<span v-if="infoForm.modifiedStates.shortName" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #label>{{ i18n.ts._serverSettings.shortName }} ({{ i18n.ts.optional }})<span v-if="infoForm.modifiedStates.shortName" class="_modified">{{ i18n.ts.modified }}</span></template>
-							<template #caption>{{ i18n.ts._serverSettings.shortNameDescription }}</template>
+						<template #caption>{{ i18n.ts._serverSettings.shortNameDescription }}</template>
-						</MkInput>
+					</MkInput>
 
-						<MkTextarea v-model="infoForm.state.description">
+					<MkTextarea v-model="infoForm.state.description">
-							<template #label>{{ i18n.ts.instanceDescription }}<span v-if="infoForm.modifiedStates.description" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #label>{{ i18n.ts.instanceDescription }}<span v-if="infoForm.modifiedStates.description" class="_modified">{{ i18n.ts.modified }}</span></template>
-						</MkTextarea>
-
-						<FormSplit :minWidth="300">
-							<MkInput v-model="infoForm.state.maintainerName">
-								<template #label>{{ i18n.ts.maintainerName }}<span v-if="infoForm.modifiedStates.maintainerName" class="_modified">{{ i18n.ts.modified }}</span></template>
-							</MkInput>
-
-							<MkInput v-model="infoForm.state.maintainerEmail" type="email">
-								<template #label>{{ i18n.ts.maintainerEmail }}<span v-if="infoForm.modifiedStates.maintainerEmail" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #prefix><i class="ti ti-mail"></i></template>
-							</MkInput>
-						</FormSplit>
-
-						<MkInput v-model="infoForm.state.tosUrl" type="url">
-							<template #label>{{ i18n.ts.tosUrl }}<span v-if="infoForm.modifiedStates.tosUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
-							<template #prefix><i class="ti ti-link"></i></template>
-						</MkInput>
-
-						<MkInput v-model="infoForm.state.privacyPolicyUrl" type="url">
-							<template #label>{{ i18n.ts.privacyPolicyUrl }}<span v-if="infoForm.modifiedStates.privacyPolicyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
-							<template #prefix><i class="ti ti-link"></i></template>
-						</MkInput>
-
-						<MkInput v-model="infoForm.state.inquiryUrl" type="url">
-							<template #label>{{ i18n.ts._serverSettings.inquiryUrl }}<span v-if="infoForm.modifiedStates.inquiryUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
-							<template #caption>{{ i18n.ts._serverSettings.inquiryUrlDescription }}</template>
-							<template #prefix><i class="ti ti-link"></i></template>
-						</MkInput>
-
-						<MkInput v-model="infoForm.state.repositoryUrl" type="url">
-							<template #label>{{ i18n.ts.repositoryUrl }}<span v-if="infoForm.modifiedStates.repositoryUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
-							<template #caption>{{ i18n.ts.repositoryUrlDescription }}</template>
-							<template #prefix><i class="ti ti-link"></i></template>
-						</MkInput>
-
-						<MkInfo v-if="!instance.providesTarball && !infoForm.state.repositoryUrl" warn>
-							{{ i18n.ts.repositoryUrlOrTarballRequired }}
-						</MkInfo>
-
-						<MkInput v-model="infoForm.state.impressumUrl" type="url">
-							<template #label>{{ i18n.ts.impressumUrl }}<span v-if="infoForm.modifiedStates.impressumUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
-							<template #caption>{{ i18n.ts.impressumDescription }}</template>
-							<template #prefix><i class="ti ti-link"></i></template>
-						</MkInput>
-					</div>
-				</MkFolder>
-
-				<MkFolder>
-					<template #icon><i class="ti ti-user-star"></i></template>
-					<template #label>{{ i18n.ts.pinnedUsers }}</template>
-					<template v-if="pinnedUsersForm.modified.value" #footer>
-						<MkFormFooter :form="pinnedUsersForm"/>
-					</template>
-
-					<MkTextarea v-model="pinnedUsersForm.state.pinnedUsers">
-						<template #label>{{ i18n.ts.pinnedUsers }}<span v-if="pinnedUsersForm.modifiedStates.pinnedUsers" class="_modified">{{ i18n.ts.modified }}</span></template>
-						<template #caption>{{ i18n.ts.pinnedUsersDescription }}</template>
 					</MkTextarea>
-				</MkFolder>
 
-				<MkFolder>
+					<FormSplit :minWidth="300">
-					<template #icon><i class="ti ti-cloud"></i></template>
+						<MkInput v-model="infoForm.state.maintainerName">
-					<template #label>{{ i18n.ts.files }}</template>
+							<template #label>{{ i18n.ts.maintainerName }}<span v-if="infoForm.modifiedStates.maintainerName" class="_modified">{{ i18n.ts.modified }}</span></template>
-					<template v-if="filesForm.modified.value" #footer>
+						</MkInput>
-						<MkFormFooter :form="filesForm"/>
+
+						<MkInput v-model="infoForm.state.maintainerEmail" type="email">
+							<template #label>{{ i18n.ts.maintainerEmail }}<span v-if="infoForm.modifiedStates.maintainerEmail" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #prefix><i class="ti ti-mail"></i></template>
+						</MkInput>
+					</FormSplit>
+
+					<MkInput v-model="infoForm.state.tosUrl" type="url">
+						<template #label>{{ i18n.ts.tosUrl }}<span v-if="infoForm.modifiedStates.tosUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #prefix><i class="ti ti-link"></i></template>
+					</MkInput>
+
+					<MkInput v-model="infoForm.state.privacyPolicyUrl" type="url">
+						<template #label>{{ i18n.ts.privacyPolicyUrl }}<span v-if="infoForm.modifiedStates.privacyPolicyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #prefix><i class="ti ti-link"></i></template>
+					</MkInput>
+
+					<MkInput v-model="infoForm.state.inquiryUrl" type="url">
+						<template #label>{{ i18n.ts._serverSettings.inquiryUrl }}<span v-if="infoForm.modifiedStates.inquiryUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #caption>{{ i18n.ts._serverSettings.inquiryUrlDescription }}</template>
+						<template #prefix><i class="ti ti-link"></i></template>
+					</MkInput>
+
+					<MkInput v-model="infoForm.state.repositoryUrl" type="url">
+						<template #label>{{ i18n.ts.repositoryUrl }}<span v-if="infoForm.modifiedStates.repositoryUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #caption>{{ i18n.ts.repositoryUrlDescription }}</template>
+						<template #prefix><i class="ti ti-link"></i></template>
+					</MkInput>
+
+					<MkInfo v-if="!instance.providesTarball && !infoForm.state.repositoryUrl" warn>
+						{{ i18n.ts.repositoryUrlOrTarballRequired }}
+					</MkInfo>
+
+					<MkInput v-model="infoForm.state.impressumUrl" type="url">
+						<template #label>{{ i18n.ts.impressumUrl }}<span v-if="infoForm.modifiedStates.impressumUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #caption>{{ i18n.ts.impressumDescription }}</template>
+						<template #prefix><i class="ti ti-link"></i></template>
+					</MkInput>
+				</div>
+			</MkFolder>
+
+			<MkFolder>
+				<template #icon><i class="ti ti-user-star"></i></template>
+				<template #label>{{ i18n.ts.pinnedUsers }}</template>
+				<template v-if="pinnedUsersForm.modified.value" #footer>
+					<MkFormFooter :form="pinnedUsersForm"/>
+				</template>
+
+				<MkTextarea v-model="pinnedUsersForm.state.pinnedUsers">
+					<template #label>{{ i18n.ts.pinnedUsers }}<span v-if="pinnedUsersForm.modifiedStates.pinnedUsers" class="_modified">{{ i18n.ts.modified }}</span></template>
+					<template #caption>{{ i18n.ts.pinnedUsersDescription }}</template>
+				</MkTextarea>
+			</MkFolder>
+
+			<MkFolder>
+				<template #icon><i class="ti ti-cloud"></i></template>
+				<template #label>{{ i18n.ts.files }}</template>
+				<template v-if="filesForm.modified.value" #footer>
+					<MkFormFooter :form="filesForm"/>
+				</template>
+
+				<div class="_gaps">
+					<MkSwitch v-model="filesForm.state.cacheRemoteFiles">
+						<template #label>{{ i18n.ts.cacheRemoteFiles }}<span v-if="filesForm.modifiedStates.cacheRemoteFiles" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #caption>{{ i18n.ts.cacheRemoteFilesDescription }}{{ i18n.ts.youCanCleanRemoteFilesCache }}</template>
+					</MkSwitch>
+
+					<template v-if="filesForm.state.cacheRemoteFiles">
+						<MkSwitch v-model="filesForm.state.cacheRemoteSensitiveFiles">
+							<template #label>{{ i18n.ts.cacheRemoteSensitiveFiles }}<span v-if="filesForm.modifiedStates.cacheRemoteSensitiveFiles" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #caption>{{ i18n.ts.cacheRemoteSensitiveFilesDescription }}</template>
+						</MkSwitch>
 					</template>
+				</div>
+			</MkFolder>
 
-					<div class="_gaps">
+			<MkFolder>
-						<MkSwitch v-model="filesForm.state.cacheRemoteFiles">
+				<template #icon><i class="ti ti-world-cog"></i></template>
-							<template #label>{{ i18n.ts.cacheRemoteFiles }}<span v-if="filesForm.modifiedStates.cacheRemoteFiles" class="_modified">{{ i18n.ts.modified }}</span></template>
+				<template #label>ServiceWorker</template>
-							<template #caption>{{ i18n.ts.cacheRemoteFilesDescription }}{{ i18n.ts.youCanCleanRemoteFilesCache }}</template>
+				<template v-if="serviceWorkerForm.modified.value" #footer>
+					<MkFormFooter :form="serviceWorkerForm"/>
+				</template>
+
+				<div class="_gaps">
+					<MkSwitch v-model="serviceWorkerForm.state.enableServiceWorker">
+						<template #label>{{ i18n.ts.enableServiceworker }}<span v-if="serviceWorkerForm.modifiedStates.enableServiceWorker" class="_modified">{{ i18n.ts.modified }}</span></template>
+						<template #caption>{{ i18n.ts.serviceworkerInfo }}</template>
+					</MkSwitch>
+
+					<template v-if="serviceWorkerForm.state.enableServiceWorker">
+						<MkInput v-model="serviceWorkerForm.state.swPublicKey">
+							<template #label>Public key<span v-if="serviceWorkerForm.modifiedStates.swPublicKey" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #prefix><i class="ti ti-key"></i></template>
+						</MkInput>
+
+						<MkInput v-model="serviceWorkerForm.state.swPrivateKey">
+							<template #label>Private key<span v-if="serviceWorkerForm.modifiedStates.swPrivateKey" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #prefix><i class="ti ti-key"></i></template>
+						</MkInput>
+					</template>
+				</div>
+			</MkFolder>
+
+			<MkFolder>
+				<template #icon><i class="ti ti-ad"></i></template>
+				<template #label>{{ i18n.ts._ad.adsSettings }}</template>
+				<template v-if="adForm.modified.value" #footer>
+					<MkFormFooter :form="adForm"/>
+				</template>
+
+				<div class="_gaps">
+					<div class="_gaps_s">
+						<MkInput v-model="adForm.state.notesPerOneAd" :min="0" type="number">
+							<template #label>{{ i18n.ts._ad.notesPerOneAd }}<span v-if="adForm.modifiedStates.notesPerOneAd" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #caption>{{ i18n.ts._ad.setZeroToDisable }}</template>
+						</MkInput>
+						<MkInfo v-if="adForm.state.notesPerOneAd > 0 && adForm.state.notesPerOneAd < 20" :warn="true">
+							{{ i18n.ts._ad.adsTooClose }}
+						</MkInfo>
+					</div>
+				</div>
+			</MkFolder>
+
+			<MkFolder>
+				<template #icon><i class="ti ti-world-search"></i></template>
+				<template #label>{{ i18n.ts._urlPreviewSetting.title }}</template>
+				<template v-if="urlPreviewForm.modified.value" #footer>
+					<MkFormFooter :form="urlPreviewForm"/>
+				</template>
+
+				<div class="_gaps">
+					<MkSwitch v-model="urlPreviewForm.state.urlPreviewEnabled">
+						<template #label>{{ i18n.ts._urlPreviewSetting.enable }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewEnabled" class="_modified">{{ i18n.ts.modified }}</span></template>
+					</MkSwitch>
+
+					<template v-if="urlPreviewForm.state.urlPreviewEnabled">
+						<MkSwitch v-model="urlPreviewForm.state.urlPreviewRequireContentLength">
+							<template #label>{{ i18n.ts._urlPreviewSetting.requireContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewRequireContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #caption>{{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}</template>
 						</MkSwitch>
 
-						<template v-if="filesForm.state.cacheRemoteFiles">
+						<MkInput v-model="urlPreviewForm.state.urlPreviewMaximumContentLength" type="number">
-							<MkSwitch v-model="filesForm.state.cacheRemoteSensitiveFiles">
+							<template #label>{{ i18n.ts._urlPreviewSetting.maximumContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewMaximumContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #label>{{ i18n.ts.cacheRemoteSensitiveFiles }}<span v-if="filesForm.modifiedStates.cacheRemoteSensitiveFiles" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #caption>{{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}</template>
-								<template #caption>{{ i18n.ts.cacheRemoteSensitiveFilesDescription }}</template>
+						</MkInput>
-							</MkSwitch>
-						</template>
-					</div>
-				</MkFolder>
 
-				<MkFolder>
+						<MkInput v-model="urlPreviewForm.state.urlPreviewTimeout" type="number">
-					<template #icon><i class="ti ti-world-cog"></i></template>
+							<template #label>{{ i18n.ts._urlPreviewSetting.timeout }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewTimeout" class="_modified">{{ i18n.ts.modified }}</span></template>
-					<template #label>ServiceWorker</template>
+							<template #caption>{{ i18n.ts._urlPreviewSetting.timeoutDescription }}</template>
-					<template v-if="serviceWorkerForm.modified.value" #footer>
+						</MkInput>
-						<MkFormFooter :form="serviceWorkerForm"/>
-					</template>
 
-					<div class="_gaps">
+						<MkInput v-model="urlPreviewForm.state.urlPreviewUserAgent" type="text">
-						<MkSwitch v-model="serviceWorkerForm.state.enableServiceWorker">
+							<template #label>{{ i18n.ts._urlPreviewSetting.userAgent }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewUserAgent" class="_modified">{{ i18n.ts.modified }}</span></template>
-							<template #label>{{ i18n.ts.enableServiceworker }}<span v-if="serviceWorkerForm.modifiedStates.enableServiceWorker" class="_modified">{{ i18n.ts.modified }}</span></template>
+							<template #caption>{{ i18n.ts._urlPreviewSetting.userAgentDescription }}</template>
-							<template #caption>{{ i18n.ts.serviceworkerInfo }}</template>
+						</MkInput>
-						</MkSwitch>
 
-						<template v-if="serviceWorkerForm.state.enableServiceWorker">
+						<div>
-							<MkInput v-model="serviceWorkerForm.state.swPublicKey">
+							<MkInput v-model="urlPreviewForm.state.urlPreviewSummaryProxyUrl" type="text">
-								<template #label>Public key<span v-if="serviceWorkerForm.modifiedStates.swPublicKey" class="_modified">{{ i18n.ts.modified }}</span></template>
+								<template #label>{{ i18n.ts._urlPreviewSetting.summaryProxy }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewSummaryProxyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #prefix><i class="ti ti-key"></i></template>
+								<template #caption>[{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}</template>
 							</MkInput>
 
-							<MkInput v-model="serviceWorkerForm.state.swPrivateKey">
+							<div :class="$style.subCaption">
-								<template #label>Private key<span v-if="serviceWorkerForm.modifiedStates.swPrivateKey" class="_modified">{{ i18n.ts.modified }}</span></template>
+								{{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
-								<template #prefix><i class="ti ti-key"></i></template>
+								<ul style="padding-left: 20px; margin: 4px 0">
-							</MkInput>
+									<li>{{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout</li>
-						</template>
+									<li>{{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit</li>
-					</div>
+									<li>{{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired</li>
-				</MkFolder>
+									<li>{{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent</li>
-
+								</ul>
-				<MkFolder>
-					<template #icon><i class="ti ti-ad"></i></template>
-					<template #label>{{ i18n.ts._ad.adsSettings }}</template>
-					<template v-if="adForm.modified.value" #footer>
-						<MkFormFooter :form="adForm"/>
-					</template>
-
-					<div class="_gaps">
-						<div class="_gaps_s">
-							<MkInput v-model="adForm.state.notesPerOneAd" :min="0" type="number">
-								<template #label>{{ i18n.ts._ad.notesPerOneAd }}<span v-if="adForm.modifiedStates.notesPerOneAd" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #caption>{{ i18n.ts._ad.setZeroToDisable }}</template>
-							</MkInput>
-							<MkInfo v-if="adForm.state.notesPerOneAd > 0 && adForm.state.notesPerOneAd < 20" :warn="true">
-								{{ i18n.ts._ad.adsTooClose }}
-							</MkInfo>
-						</div>
-					</div>
-				</MkFolder>
-
-				<MkFolder>
-					<template #icon><i class="ti ti-world-search"></i></template>
-					<template #label>{{ i18n.ts._urlPreviewSetting.title }}</template>
-					<template v-if="urlPreviewForm.modified.value" #footer>
-						<MkFormFooter :form="urlPreviewForm"/>
-					</template>
-
-					<div class="_gaps">
-						<MkSwitch v-model="urlPreviewForm.state.urlPreviewEnabled">
-							<template #label>{{ i18n.ts._urlPreviewSetting.enable }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewEnabled" class="_modified">{{ i18n.ts.modified }}</span></template>
-						</MkSwitch>
-
-						<template v-if="urlPreviewForm.state.urlPreviewEnabled">
-							<MkSwitch v-model="urlPreviewForm.state.urlPreviewRequireContentLength">
-								<template #label>{{ i18n.ts._urlPreviewSetting.requireContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewRequireContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #caption>{{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}</template>
-							</MkSwitch>
-
-							<MkInput v-model="urlPreviewForm.state.urlPreviewMaximumContentLength" type="number">
-								<template #label>{{ i18n.ts._urlPreviewSetting.maximumContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewMaximumContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #caption>{{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}</template>
-							</MkInput>
-
-							<MkInput v-model="urlPreviewForm.state.urlPreviewTimeout" type="number">
-								<template #label>{{ i18n.ts._urlPreviewSetting.timeout }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewTimeout" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #caption>{{ i18n.ts._urlPreviewSetting.timeoutDescription }}</template>
-							</MkInput>
-
-							<MkInput v-model="urlPreviewForm.state.urlPreviewUserAgent" type="text">
-								<template #label>{{ i18n.ts._urlPreviewSetting.userAgent }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewUserAgent" class="_modified">{{ i18n.ts.modified }}</span></template>
-								<template #caption>{{ i18n.ts._urlPreviewSetting.userAgentDescription }}</template>
-							</MkInput>
-
-							<div>
-								<MkInput v-model="urlPreviewForm.state.urlPreviewSummaryProxyUrl" type="text">
-									<template #label>{{ i18n.ts._urlPreviewSetting.summaryProxy }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewSummaryProxyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
-									<template #caption>[{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}</template>
-								</MkInput>
-
-								<div :class="$style.subCaption">
-									{{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
-									<ul style="padding-left: 20px; margin: 4px 0">
-										<li>{{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout</li>
-										<li>{{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit</li>
-										<li>{{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired</li>
-										<li>{{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent</li>
-									</ul>
-								</div>
 							</div>
-						</template>
+						</div>
-					</div>
-				</MkFolder>
-
-				<MkFolder>
-					<template #icon><i class="ti ti-planet"></i></template>
-					<template #label>{{ i18n.ts.federation }}</template>
-					<template v-if="federationForm.savedState.federation === 'all'" #suffix>{{ i18n.ts.all }}</template>
-					<template v-else-if="federationForm.savedState.federation === 'specified'" #suffix>{{ i18n.ts.specifyHost }}</template>
-					<template v-else-if="federationForm.savedState.federation === 'none'" #suffix>{{ i18n.ts.none }}</template>
-					<template v-if="federationForm.modified.value" #footer>
-						<MkFormFooter :form="federationForm"/>
 					</template>
+				</div>
+			</MkFolder>
 
-					<div class="_gaps">
+			<MkFolder>
-						<MkRadios v-model="federationForm.state.federation">
+				<template #icon><i class="ti ti-planet"></i></template>
-							<template #label>{{ i18n.ts.behavior }}<span v-if="federationForm.modifiedStates.federation" class="_modified">{{ i18n.ts.modified }}</span></template>
+				<template #label>{{ i18n.ts.federation }}</template>
-							<option value="all">{{ i18n.ts.all }}</option>
+				<template v-if="federationForm.savedState.federation === 'all'" #suffix>{{ i18n.ts.all }}</template>
-							<option value="specified">{{ i18n.ts.specifyHost }}</option>
+				<template v-else-if="federationForm.savedState.federation === 'specified'" #suffix>{{ i18n.ts.specifyHost }}</template>
-							<option value="none">{{ i18n.ts.none }}</option>
+				<template v-else-if="federationForm.savedState.federation === 'none'" #suffix>{{ i18n.ts.none }}</template>
-						</MkRadios>
+				<template v-if="federationForm.modified.value" #footer>
+					<MkFormFooter :form="federationForm"/>
+				</template>
 
-						<MkTextarea v-if="federationForm.state.federation === 'specified'" v-model="federationForm.state.federationHosts">
+				<div class="_gaps">
-							<template #label>{{ i18n.ts.federationAllowedHosts }}<span v-if="federationForm.modifiedStates.federationHosts" class="_modified">{{ i18n.ts.modified }}</span></template>
+					<MkRadios v-model="federationForm.state.federation">
-							<template #caption>{{ i18n.ts.federationAllowedHostsDescription }}</template>
+						<template #label>{{ i18n.ts.behavior }}<span v-if="federationForm.modifiedStates.federation" class="_modified">{{ i18n.ts.modified }}</span></template>
-						</MkTextarea>
+						<option value="all">{{ i18n.ts.all }}</option>
-					</div>
+						<option value="specified">{{ i18n.ts.specifyHost }}</option>
-				</MkFolder>
+						<option value="none">{{ i18n.ts.none }}</option>
+					</MkRadios>
 
-				<MkFolder>
+					<MkTextarea v-if="federationForm.state.federation === 'specified'" v-model="federationForm.state.federationHosts">
-					<template #icon><i class="ti ti-ghost"></i></template>
+						<template #label>{{ i18n.ts.federationAllowedHosts }}<span v-if="federationForm.modifiedStates.federationHosts" class="_modified">{{ i18n.ts.modified }}</span></template>
-					<template #label>{{ i18n.ts.proxyAccount }}</template>
+						<template #caption>{{ i18n.ts.federationAllowedHostsDescription }}</template>
-					<template v-if="proxyAccountForm.modified.value" #footer>
+					</MkTextarea>
-						<MkFormFooter :form="proxyAccountForm"/>
+				</div>
-					</template>
+			</MkFolder>
 
-					<div class="_gaps">
+			<MkFolder>
-						<MkInfo>{{ i18n.ts.proxyAccountDescription }}</MkInfo>
+				<template #icon><i class="ti ti-ghost"></i></template>
+				<template #label>{{ i18n.ts.proxyAccount }}</template>
+				<template v-if="proxyAccountForm.modified.value" #footer>
+					<MkFormFooter :form="proxyAccountForm"/>
+				</template>
 
-						<MkTextarea v-model="proxyAccountForm.state.description" :max="500" tall mfmAutocomplete :mfmPreview="true">
+				<div class="_gaps">
-							<template #label>{{ i18n.ts._profile.description }}</template>
+					<MkInfo>{{ i18n.ts.proxyAccountDescription }}</MkInfo>
-							<template #caption>{{ i18n.ts._profile.youCanIncludeHashtags }}</template>
+
-						</MkTextarea>
+					<MkTextarea v-model="proxyAccountForm.state.description" :max="500" tall mfmAutocomplete :mfmPreview="true">
-					</div>
+						<template #label>{{ i18n.ts._profile.description }}</template>
-				</MkFolder>
+						<template #caption>{{ i18n.ts._profile.youCanIncludeHashtags }}</template>
-			</div>
+					</MkTextarea>
-		</MkSpacer>
+				</div>
-	</MkStickyContainer>
+			</MkFolder>
-</div>
+		</div>
+	</MkSpacer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, reactive } from 'vue';
-import XHeader from './_header_.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';

packages/frontend/src/pages/admin/system-webhook.vue

@@ -4,11 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<template #header>
-		<XHeader :actions="headerActions" :tabs="headerTabs"/>
-	</template>
-
 	<MkSpacer :contentMax="900">
 		<div class="_gaps_m">
 			<MkButton primary @click="onCreateWebhookClicked">
@@ -22,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</FormSection>
 		</div>
 	</MkSpacer>
-</MkStickyContainer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
@@ -32,7 +28,6 @@ import XItem from './system-webhook.item.vue';
 import FormSection from '@/components/form/section.vue';
 import { definePage } from '@/page.js';
 import { i18n } from '@/i18n.js';
-import XHeader from '@/pages/admin/_header_.vue';
 import MkButton from '@/components/MkButton.vue';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { showSystemWebhookEditorDialog } from '@/components/MkSystemWebhookEditor.impl.js';

packages/frontend/src/pages/admin/users.vue

@@ -4,64 +4,60 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
+<PageWithHeader :actions="headerActions" :tabs="headerTabs">
-	<MkStickyContainer>
+	<MkSpacer :contentMax="900">
-		<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
+		<div class="_gaps">
-		<MkSpacer :contentMax="900">
+			<div :class="$style.inputs">
-			<div class="_gaps">
+				<MkButton style="margin-left: auto" @click="resetQuery">{{ i18n.ts.reset }}</MkButton>
-				<div :class="$style.inputs">
-					<MkButton style="margin-left: auto" @click="resetQuery">{{ i18n.ts.reset }}</MkButton>
-				</div>
-				<div :class="$style.inputs">
-					<MkSelect v-model="sort" style="flex: 1;">
-						<template #label>{{ i18n.ts.sort }}</template>
-						<option value="-createdAt">{{ i18n.ts.registeredDate }} ({{ i18n.ts.ascendingOrder }})</option>
-						<option value="+createdAt">{{ i18n.ts.registeredDate }} ({{ i18n.ts.descendingOrder }})</option>
-						<option value="-updatedAt">{{ i18n.ts.lastUsed }} ({{ i18n.ts.ascendingOrder }})</option>
-						<option value="+updatedAt">{{ i18n.ts.lastUsed }} ({{ i18n.ts.descendingOrder }})</option>
-					</MkSelect>
-					<MkSelect v-model="state" style="flex: 1;">
-						<template #label>{{ i18n.ts.state }}</template>
-						<option value="all">{{ i18n.ts.all }}</option>
-						<option value="available">{{ i18n.ts.normal }}</option>
-						<option value="admin">{{ i18n.ts.administrator }}</option>
-						<option value="moderator">{{ i18n.ts.moderator }}</option>
-						<option value="suspended">{{ i18n.ts.suspend }}</option>
-					</MkSelect>
-					<MkSelect v-model="origin" style="flex: 1;">
-						<template #label>{{ i18n.ts.instance }}</template>
-						<option value="combined">{{ i18n.ts.all }}</option>
-						<option value="local">{{ i18n.ts.local }}</option>
-						<option value="remote">{{ i18n.ts.remote }}</option>
-					</MkSelect>
-				</div>
-				<div :class="$style.inputs">
-					<MkInput v-model="searchUsername" style="flex: 1;" type="text" :spellcheck="false">
-						<template #prefix>@</template>
-						<template #label>{{ i18n.ts.username }}</template>
-					</MkInput>
-					<MkInput v-model="searchHost" style="flex: 1;" type="text" :spellcheck="false" :disabled="pagination.params.origin === 'local'">
-						<template #prefix>@</template>
-						<template #label>{{ i18n.ts.host }}</template>
-					</MkInput>
-				</div>
-
-				<MkPagination v-slot="{items}" ref="paginationComponent" :pagination="pagination">
-					<div :class="$style.users">
-						<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${dateString(user.updatedAt)}`" :class="$style.user" :to="`/admin/user/${user.id}`">
-							<MkUserCardMini :user="user"/>
-						</MkA>
-					</div>
-				</MkPagination>
 			</div>
-		</MkSpacer>
+			<div :class="$style.inputs">
-	</MkStickyContainer>
+				<MkSelect v-model="sort" style="flex: 1;">
-</div>
+					<template #label>{{ i18n.ts.sort }}</template>
+					<option value="-createdAt">{{ i18n.ts.registeredDate }} ({{ i18n.ts.ascendingOrder }})</option>
+					<option value="+createdAt">{{ i18n.ts.registeredDate }} ({{ i18n.ts.descendingOrder }})</option>
+					<option value="-updatedAt">{{ i18n.ts.lastUsed }} ({{ i18n.ts.ascendingOrder }})</option>
+					<option value="+updatedAt">{{ i18n.ts.lastUsed }} ({{ i18n.ts.descendingOrder }})</option>
+				</MkSelect>
+				<MkSelect v-model="state" style="flex: 1;">
+					<template #label>{{ i18n.ts.state }}</template>
+					<option value="all">{{ i18n.ts.all }}</option>
+					<option value="available">{{ i18n.ts.normal }}</option>
+					<option value="admin">{{ i18n.ts.administrator }}</option>
+					<option value="moderator">{{ i18n.ts.moderator }}</option>
+					<option value="suspended">{{ i18n.ts.suspend }}</option>
+				</MkSelect>
+				<MkSelect v-model="origin" style="flex: 1;">
+					<template #label>{{ i18n.ts.instance }}</template>
+					<option value="combined">{{ i18n.ts.all }}</option>
+					<option value="local">{{ i18n.ts.local }}</option>
+					<option value="remote">{{ i18n.ts.remote }}</option>
+				</MkSelect>
+			</div>
+			<div :class="$style.inputs">
+				<MkInput v-model="searchUsername" style="flex: 1;" type="text" :spellcheck="false">
+					<template #prefix>@</template>
+					<template #label>{{ i18n.ts.username }}</template>
+				</MkInput>
+				<MkInput v-model="searchHost" style="flex: 1;" type="text" :spellcheck="false" :disabled="pagination.params.origin === 'local'">
+					<template #prefix>@</template>
+					<template #label>{{ i18n.ts.host }}</template>
+				</MkInput>
+			</div>
+
+			<MkPagination v-slot="{items}" ref="paginationComponent" :pagination="pagination">
+				<div :class="$style.users">
+					<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${dateString(user.updatedAt)}`" :class="$style.user" :to="`/admin/user/${user.id}`">
+						<MkUserCardMini :user="user"/>
+					</MkA>
+				</div>
+			</MkPagination>
+		</div>
+	</MkSpacer>
+</PageWithHeader>
 </template>
 
 <script lang="ts" setup>
 import { computed, useTemplateRef, ref, watchEffect } from 'vue';
-import XHeader from './_header_.vue';
 import { defaultMemoryStorage } from '@/memory-storage';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';

packages/frontend/src/router.definition.ts

@@ -392,9 +392,13 @@ export const ROUTE_DEF = [{
 		name: 'avatarDecorations',
 		component: page(() => import('@/pages/avatar-decorations.vue')),
 	}, {
-		path: '/queue',
+		path: '/federation-job-queue',
-		name: 'queue',
+		name: 'federationJobQueue',
-		component: page(() => import('@/pages/admin/queue.vue')),
+		component: page(() => import('@/pages/admin/federation-job-queue.vue')),
+	}, {
+		path: '/job-queue',
+		name: 'jobQueue',
+		component: page(() => import('@/pages/admin/job-queue.vue')),
 	}, {
 		path: '/files',
 		name: 'files',

packages/misskey-js/etc/misskey-js.api.md

@@ -267,7 +267,22 @@ type AdminQueueDeliverDelayedResponse = operations['admin___queue___deliver-dela
 type AdminQueueInboxDelayedResponse = operations['admin___queue___inbox-delayed']['responses']['200']['content']['application/json'];
 
 // @public (undocumented)
-type AdminQueuePromoteRequest = operations['admin___queue___promote']['requestBody']['content']['application/json'];
+type AdminQueueJobsRequest = operations['admin___queue___jobs']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type AdminQueuePromoteJobsRequest = operations['admin___queue___promote-jobs']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type AdminQueueQueueStatsRequest = operations['admin___queue___queue-stats']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type AdminQueueRemoveJobRequest = operations['admin___queue___remove-job']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type AdminQueueRetryJobRequest = operations['admin___queue___retry-job']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type AdminQueueShowJobRequest = operations['admin___queue___show-job']['requestBody']['content']['application/json'];
 
 // @public (undocumented)
 type AdminQueueStatsResponse = operations['admin___queue___stats']['responses']['200']['content']['application/json'];
@@ -1531,7 +1546,12 @@ declare namespace entities {
         AdminQueueClearRequest,
         AdminQueueDeliverDelayedResponse,
         AdminQueueInboxDelayedResponse,
-        AdminQueuePromoteRequest,
+        AdminQueueJobsRequest,
+        AdminQueuePromoteJobsRequest,
+        AdminQueueQueueStatsRequest,
+        AdminQueueRemoveJobRequest,
+        AdminQueueRetryJobRequest,
+        AdminQueueShowJobRequest,
         AdminQueueStatsResponse,
         AdminRelaysAddRequest,
         AdminRelaysAddResponse,

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.4.1-alpha.1",
+	"version": "2025.4.1-alpha.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

packages/misskey-js/src/autogen/apiClientJSDoc.ts

@@ -636,12 +636,78 @@ declare module '../api.js' {
       credential?: string | null,
     ): Promise<SwitchCaseResponseType<E, P>>;
 
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    request<E extends 'admin/queue/jobs', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
     /**
      * No description provided.
      * 
      * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
      */
-    request<E extends 'admin/queue/promote', P extends Endpoints[E]['req']>(
+    request<E extends 'admin/queue/promote-jobs', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    request<E extends 'admin/queue/queue-stats', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    request<E extends 'admin/queue/queues', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+     */
+    request<E extends 'admin/queue/remove-job', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+     */
+    request<E extends 'admin/queue/retry-job', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    request<E extends 'admin/queue/show-job', P extends Endpoints[E]['req']>(
       endpoint: E,
       params: P,
       credential?: string | null,

packages/misskey-js/src/autogen/endpoint.ts

@@ -78,7 +78,12 @@ import type {
 	AdminQueueClearRequest,
 	AdminQueueDeliverDelayedResponse,
 	AdminQueueInboxDelayedResponse,
-	AdminQueuePromoteRequest,
+	AdminQueueJobsRequest,
+	AdminQueuePromoteJobsRequest,
+	AdminQueueQueueStatsRequest,
+	AdminQueueRemoveJobRequest,
+	AdminQueueRetryJobRequest,
+	AdminQueueShowJobRequest,
 	AdminQueueStatsResponse,
 	AdminRelaysAddRequest,
 	AdminRelaysAddResponse,
@@ -694,7 +699,13 @@ export type Endpoints = {
 	'admin/queue/clear': { req: AdminQueueClearRequest; res: EmptyResponse };
 	'admin/queue/deliver-delayed': { req: EmptyRequest; res: AdminQueueDeliverDelayedResponse };
 	'admin/queue/inbox-delayed': { req: EmptyRequest; res: AdminQueueInboxDelayedResponse };
-	'admin/queue/promote': { req: AdminQueuePromoteRequest; res: EmptyResponse };
+	'admin/queue/jobs': { req: AdminQueueJobsRequest; res: EmptyResponse };
+	'admin/queue/promote-jobs': { req: AdminQueuePromoteJobsRequest; res: EmptyResponse };
+	'admin/queue/queue-stats': { req: AdminQueueQueueStatsRequest; res: EmptyResponse };
+	'admin/queue/queues': { req: EmptyRequest; res: EmptyResponse };
+	'admin/queue/remove-job': { req: AdminQueueRemoveJobRequest; res: EmptyResponse };
+	'admin/queue/retry-job': { req: AdminQueueRetryJobRequest; res: EmptyResponse };
+	'admin/queue/show-job': { req: AdminQueueShowJobRequest; res: EmptyResponse };
 	'admin/queue/stats': { req: EmptyRequest; res: AdminQueueStatsResponse };
 	'admin/relays/add': { req: AdminRelaysAddRequest; res: AdminRelaysAddResponse };
 	'admin/relays/list': { req: EmptyRequest; res: AdminRelaysListResponse };

packages/misskey-js/src/autogen/entities.ts

@@ -81,7 +81,12 @@ export type AdminPromoCreateRequest = operations['admin___promo___create']['requ
 export type AdminQueueClearRequest = operations['admin___queue___clear']['requestBody']['content']['application/json'];
 export type AdminQueueDeliverDelayedResponse = operations['admin___queue___deliver-delayed']['responses']['200']['content']['application/json'];
 export type AdminQueueInboxDelayedResponse = operations['admin___queue___inbox-delayed']['responses']['200']['content']['application/json'];
-export type AdminQueuePromoteRequest = operations['admin___queue___promote']['requestBody']['content']['application/json'];
+export type AdminQueueJobsRequest = operations['admin___queue___jobs']['requestBody']['content']['application/json'];
+export type AdminQueuePromoteJobsRequest = operations['admin___queue___promote-jobs']['requestBody']['content']['application/json'];
+export type AdminQueueQueueStatsRequest = operations['admin___queue___queue-stats']['requestBody']['content']['application/json'];
+export type AdminQueueRemoveJobRequest = operations['admin___queue___remove-job']['requestBody']['content']['application/json'];
+export type AdminQueueRetryJobRequest = operations['admin___queue___retry-job']['requestBody']['content']['application/json'];
+export type AdminQueueShowJobRequest = operations['admin___queue___show-job']['requestBody']['content']['application/json'];
 export type AdminQueueStatsResponse = operations['admin___queue___stats']['responses']['200']['content']['application/json'];
 export type AdminRelaysAddRequest = operations['admin___relays___add']['requestBody']['content']['application/json'];
 export type AdminRelaysAddResponse = operations['admin___relays___add']['responses']['200']['content']['application/json'];

packages/misskey-js/src/autogen/types.ts

@@ -531,14 +531,68 @@ export type paths = {
      */
     post: operations['admin___queue___inbox-delayed'];
   };
-  '/admin/queue/promote': {
+  '/admin/queue/jobs': {
     /**
-     * admin/queue/promote
+     * admin/queue/jobs
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    post: operations['admin___queue___jobs'];
+  };
+  '/admin/queue/promote-jobs': {
+    /**
+     * admin/queue/promote-jobs
      * @description No description provided.
      *
      * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
      */
-    post: operations['admin___queue___promote'];
+    post: operations['admin___queue___promote-jobs'];
+  };
+  '/admin/queue/queue-stats': {
+    /**
+     * admin/queue/queue-stats
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    post: operations['admin___queue___queue-stats'];
+  };
+  '/admin/queue/queues': {
+    /**
+     * admin/queue/queues
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    post: operations['admin___queue___queues'];
+  };
+  '/admin/queue/remove-job': {
+    /**
+     * admin/queue/remove-job
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+     */
+    post: operations['admin___queue___remove-job'];
+  };
+  '/admin/queue/retry-job': {
+    /**
+     * admin/queue/retry-job
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+     */
+    post: operations['admin___queue___retry-job'];
+  };
+  '/admin/queue/show-job': {
+    /**
+     * admin/queue/show-job
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+     */
+    post: operations['admin___queue___show-job'];
   };
   '/admin/queue/stats': {
     /**
@@ -8809,9 +8863,9 @@ export type operations = {
       content: {
         'application/json': {
           /** @enum {string} */
-          type: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
+          queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
           /** @enum {string} */
-          state: '*' | 'wait' | 'delayed';
+          state: '*' | 'completed' | 'wait' | 'active' | 'paused' | 'prioritized' | 'delayed' | 'failed';
         };
       };
     };
@@ -8945,17 +8999,326 @@ export type operations = {
     };
   };
   /**
-   * admin/queue/promote
+   * admin/queue/jobs
    * @description No description provided.
    *
-   * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+   * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
    */
-  admin___queue___promote: {
+  admin___queue___jobs: {
     requestBody: {
       content: {
         'application/json': {
           /** @enum {string} */
-          type: 'deliver' | 'inbox';
+          queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
+          state: ('active' | 'wait' | 'delayed' | 'completed' | 'failed')[];
+          search?: string;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
+  /**
+   * admin/queue/promote-jobs
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+   */
+  'admin___queue___promote-jobs': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** @enum {string} */
+          queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
+        };
+      };
+    };
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
+  /**
+   * admin/queue/queue-stats
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+   */
+  'admin___queue___queue-stats': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** @enum {string} */
+          queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
+        };
+      };
+    };
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
+  /**
+   * admin/queue/queues
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+   */
+  admin___queue___queues: {
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
+  /**
+   * admin/queue/remove-job
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+   */
+  'admin___queue___remove-job': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** @enum {string} */
+          queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
+          jobId: string;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
+  /**
+   * admin/queue/retry-job
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:admin:queue*
+   */
+  'admin___queue___retry-job': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** @enum {string} */
+          queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
+          jobId: string;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
+  /**
+   * admin/queue/show-job
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *read:admin:queue*
+   */
+  'admin___queue___show-job': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** @enum {string} */
+          queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
+          jobId: string;
         };
       };
     };

pnpm-lock.yaml

@@ -170,6 +170,9 @@ importers:
       '@twemoji/parser':
         specifier: 15.1.1
         version: 15.1.1
+      '@types/redis-info':
+        specifier: 3.0.3
+        version: 3.0.3
       accepts:
         specifier: 1.3.8
         version: 1.3.8
@@ -225,8 +228,8 @@ importers:
         specifier: 0.1.21
         version: 0.1.21
       fastify:
-        specifier: 5.2.2
+        specifier: 5.3.2
-        version: 5.2.2
+        version: 5.3.2
       fastify-raw-body:
         specifier: 5.0.0
         version: 5.0.0
@@ -368,6 +371,9 @@ importers:
       re2:
         specifier: 1.21.4
         version: 1.21.4(patch_hash=018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1)
+      redis-info:
+        specifier: 3.1.0
+        version: 3.1.0
       redis-lock:
         specifier: 0.1.4
         version: 0.1.4
@@ -4462,6 +4468,9 @@ packages:
   '@types/readdir-glob@1.1.1':
     resolution: {integrity: sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ==}
 
+  '@types/redis-info@3.0.3':
+    resolution: {integrity: sha512-VIkNy6JbYI/RLdbPHdm9JQvv6RVld2uE2/6Hdid38Qdq+zvDli2FTpImI8pC5zwp8xS8qVqfzlfyAub8xZEd5g==}
+
   '@types/rename@1.0.7':
     resolution: {integrity: sha512-E9qapfghUGfBMi3jNhsmCKPIp3f2zvNKpaX1BDGLGJNjzpgsZ/RTx7NaNksFjGoJ+r9NvWF1NSM5vVecnNjVmw==}
 
@@ -6598,8 +6607,8 @@ packages:
     resolution: {integrity: sha512-2qfoaQ3BQDhZ1gtbkKZd6n0kKxJISJGM6u/skD9ljdWItAscjXrtZ1lnjr7PavmXX9j4EyCPmBDiIsLn07d5vA==}
     engines: {node: '>= 10'}
 
-  fastify@5.2.2:
+  fastify@5.3.2:
-    resolution: {integrity: sha512-22T/PnhquWozuFXg3Ish4md5ipsF1Nx1mJ9ulLdZPXSk14WFj/wMlyNB/yll9sQOojKRgOIxT2inK3Xpjg5hyw==}
+    resolution: {integrity: sha512-AIPqBgtqBAwkOkrnwesEE+dOyU30dQ4kh7udxeGVR05CRGwubZx+p2H8P0C4cRnQT0+EPK4VGea2DTL2RtWttg==}
 
   fastq@1.17.1:
     resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
@@ -9171,6 +9180,9 @@ packages:
   process-warning@4.0.0:
     resolution: {integrity: sha512-/MyYDxttz7DfGMMHiysAsFE4qF+pQYAA8ziO/3NcRVrQ5fSk+Mns4QZA/oRPFzvcqNoVJXQNWNAsdwBXLUkQKw==}
 
+  process-warning@5.0.0:
+    resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==}
+
   process@0.11.10:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
@@ -9429,6 +9441,9 @@ packages:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
     engines: {node: '>=4'}
 
+  redis-info@3.1.0:
+    resolution: {integrity: sha512-ER4L9Sh/vm63DkIE0bkSjxluQlioBiBgf5w1UuldaW/3vPcecdljVDisZhmnCMvsxHNiARTTDDHGg9cGwTfrKg==}
+
   redis-lock@0.1.4:
     resolution: {integrity: sha512-7/+zu86XVQfJVx1nHTzux5reglDiyUCDwmW7TSlvVezfhH2YLc/Rc8NE0ejQG+8/0lwKzm29/u/4+ogKeLosiA==}
     engines: {node: '>=0.6'}
@@ -9631,6 +9646,9 @@ packages:
   secure-json-parse@3.0.2:
     resolution: {integrity: sha512-H6nS2o8bWfpFEV6U38sOSjS7bTbdgbCGU9wEM6W14P5H0QOsz94KCusifV44GpHDTu2nqZbuDNhTzu+mjDSw1w==}
 
+  secure-json-parse@4.0.0:
+    resolution: {integrity: sha512-dxtLJO6sc35jWidmLxo7ij+Eg48PM/kleBsxpC8QJE0qJICe+KawkDQmvCMZUr9u7WKVHgMW6vy3fQ7zMiFZMA==}
+
   seedrandom@3.0.5:
     resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
 
@@ -14937,6 +14955,8 @@ snapshots:
     dependencies:
       '@types/node': 22.14.0
 
+  '@types/redis-info@3.0.3': {}
+
   '@types/rename@1.0.7': {}
 
   '@types/resolve@1.20.3': {}
@@ -17788,7 +17808,7 @@ snapshots:
       raw-body: 3.0.0
       secure-json-parse: 2.7.0
 
-  fastify@5.2.2:
+  fastify@5.3.2:
     dependencies:
       '@fastify/ajv-compiler': 4.0.0
       '@fastify/error': 4.0.0
@@ -17800,9 +17820,9 @@ snapshots:
       find-my-way: 9.0.1
       light-my-request: 6.0.0
       pino: 9.2.0
-      process-warning: 4.0.0
+      process-warning: 5.0.0
       rfdc: 1.4.1
-      secure-json-parse: 3.0.2
+      secure-json-parse: 4.0.0
       semver: 7.7.1
       toad-cache: 3.7.0
 
@@ -20857,6 +20877,8 @@ snapshots:
 
   process-warning@4.0.0: {}
 
+  process-warning@5.0.0: {}
+
   process@0.11.10: {}
 
   progress@2.0.3:
@@ -21162,6 +21184,10 @@ snapshots:
 
   redis-errors@1.2.0: {}
 
+  redis-info@3.1.0:
+    dependencies:
+      lodash: 4.17.21
+
   redis-lock@0.1.4: {}
 
   redis-parser@3.0.0:
@@ -21408,6 +21434,8 @@ snapshots:
 
   secure-json-parse@3.0.2: {}
 
+  secure-json-parse@4.0.0: {}
+
   seedrandom@3.0.5: {}
 
   seek-bzip@2.0.0: