fix(deps): update [frontend] update dependencies

.config/example.yml

@@ -105,16 +105,6 @@ port: 3000
 # socket: /path/to/misskey.sock
 # chmodSocket: '777'
 
-# Proxy trust settings
-#
-# Changes how the server interpret the origin IP of the request.
-#
-# Any format supported by Fastify is accepted.
-# Default: trust all proxies (i.e. trustProxy: true)
-# See: https://fastify.dev/docs/latest/reference/server/#trustproxy
-#
-# trustProxy: 1
-
 #   ┌──────────────────────────┐
 #───┘ PostgreSQL configuration └────────────────────────────────
 

CHANGELOG.md

@@ -1,28 +1,14 @@
-## 2025.9.1
-
-### NOTE
-- pnpm 10.16.0 が必要です
+## Unreleased
 
 ### General
-- Feat: 予約投稿ができるようになりました
-	- デフォルトで作成可能数は1になっています。適宜ロールのポリシーで設定を行ってください。
-- Enhance: 広告ごとにセンシティブフラグを設定できるようになりました
+-
 
 ### Client
-- Feat: アカウントのQRコードを表示・読み取りできるようになりました
-- Feat: 動画を圧縮してアップロードできるようになりました
-- Enhance: チャットの日本語名称がダイレクトメッセージに戻るとともに、ベータ版機能ではなくなりました
-- Enhance: 画像編集にマスクエフェクト(塗りつぶし、ぼかし、モザイク)を追加
-- Enhance: 画像編集の集中線エフェクトを強化
-- Enhance: ウォーターマークにアカウントのQRコードを追加できるように
-- Enhance: テーマをドラッグ&ドロップできるように
-- Enhance: 絵文字ピッカーのサイズをより大きくできるように
 - Enhance: 時刻計算のための基準値を一か所で管理するようにし、パフォーマンスを向上
-- Fix: iOSで、デバイスがダークモードだと初回読み込み時にエラーになる問題を修正
-- Fix: アクティビティウィジェットのグラフモードが動作しない問題を修正
 
 ### Server
-- Enhance: ユーザーIPを確実に取得できるために設定ファイルにFastifyOptions.trustProxyを追加しました
+-
+
 
 ## 2025.9.0
 

idea/MkAnimatedBg.dotted-ripples.vue

@@ -1,232 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<canvas ref="canvasEl" style="display: block; width: 100%; height: 100%; pointer-events: none;"></canvas>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, onUnmounted, useTemplateRef } from 'vue';
-import isChromatic from 'chromatic/isChromatic';
-import { initShaderProgram } from '@/utility/webgl.js';
-
-const VERTEX_SHADER = `#version 300 es
-in vec2 position;
-out vec2 in_uv;
-
-void main() {
-	in_uv = (position + 1.0) / 2.0;
-	gl_Position = vec4(position, 0.0, 1.0);
-}
-`;
-
-const FRAGMENT_SHADER = `#version 300 es
-precision mediump float;
-
-const float PI = 3.141592653589793;
-const float TWO_PI = 6.283185307179586;
-const float HALF_PI = 1.5707963267948966;
-
-in vec2 in_uv;
-uniform vec2 in_resolution;
-uniform float u_scale;
-uniform float u_time;
-uniform float u_seed;
-uniform float u_angle;
-uniform float u_radius;
-uniform vec3 u_color;
-uniform vec2 u_ripplePositions[16];
-uniform float u_rippleRadiuses[16];
-out vec4 out_color;
-
-float getRipple(vec2 uv) {
-	float strength = 0.0;
-	float thickness = 0.05;
-	for (int i = 0; i < 16; i++) {
-		if (u_rippleRadiuses[i] <= 0.0) continue;
-
-		float d = distance(uv, u_ripplePositions[i]);
-
-		// フチ
-		if (d < u_rippleRadiuses[i] + thickness && d > u_rippleRadiuses[i] - thickness) {
-			float gradate =  abs(d - u_rippleRadiuses[i] + thickness) / thickness;
-			strength += (1.0 - u_rippleRadiuses[i]) * gradate;
-		}
-
-		// 内側
-		if (d < u_rippleRadiuses[i] + thickness) {
-			strength += 0.25 * (1.0 - u_rippleRadiuses[i]);
-		}
-	}
-	return strength;
-}
-
-void main() {
-	float x_ratio = min(in_resolution.x / in_resolution.y, 1.0);
-	float y_ratio = min(in_resolution.y / in_resolution.x, 1.0);
-
-	float angle = -(u_angle * PI);
-	vec2 centeredUv = (in_uv - vec2(0.5, 0.5)) * vec2(x_ratio, y_ratio);
-	vec2 rotatedUV = vec2(
-		centeredUv.x * cos(angle) - centeredUv.y * sin(angle),
-		centeredUv.x * sin(angle) + centeredUv.y * cos(angle)
-	);
-	vec2 uv = rotatedUV;
-
-	float time = u_time * 0.00025;
-
-	float size = 1.0 / u_scale;
-	float size_half = size / 2.0;
-	float modX = mod(uv.x, size);
-	float modY = mod(uv.y, size);
-
-	vec2 pixelated_uv = vec2(
-		(size * (floor((uv.x - 0.5 - size) / size) + 0.5)),
-		(size * (floor((uv.y - 0.5 - size) / size) + 0.5))
-	) + vec2(0.5 + size, 0.5 + size);
-
-	float strength = getRipple(pixelated_uv);
-
-	float opacity = min(max(strength, 0.0), 1.0);
-
-	float threshold = ((u_radius / 2.0) / u_scale);
-	if (length(vec2(modX - size_half, modY - size_half)) < threshold) {
-		out_color = vec4(u_color.r, u_color.g, u_color.b, opacity);
-		//out_color = vec4(1.0);
-		return;
-	}
-
-	// debug
-	//float a = min(max(getRipple(uv), 0.0), 1.0);
-	//out_color = vec4(u_color.r, u_color.g, u_color.b, (opacity + a) / 2.0);
-
-	out_color = vec4(0.0, 0.0, 0.0, 0.0);
-}
-`;
-
-const canvasEl = useTemplateRef('canvasEl');
-
-const props = withDefaults(defineProps<{
-	scale?: number;
-}>(), {
-	scale: 48,
-});
-
-let handle: ReturnType<typeof window['requestAnimationFrame']> | null = null;
-
-onMounted(() => {
-	const canvas = canvasEl.value!;
-	let width = canvas.offsetWidth;
-	let height = canvas.offsetHeight;
-	canvas.width = width;
-	canvas.height = height;
-
-	const maybeGl = canvas.getContext('webgl2', { preserveDrawingBuffer: false, alpha: true, premultipliedAlpha: false, antialias: true });
-	if (maybeGl == null) return;
-
-	const gl = maybeGl;
-
-	const VERTICES = new Float32Array([-1, -1, -1, 1, 1, 1, -1, -1, 1, 1, 1, -1]);
-	const vertexBuffer = gl.createBuffer();
-	gl.bindBuffer(gl.ARRAY_BUFFER, vertexBuffer);
-	gl.bufferData(gl.ARRAY_BUFFER, VERTICES, gl.STATIC_DRAW);
-
-	//gl.clearColor(0.0, 0.0, 0.0, 0.0);
-	//gl.clear(gl.COLOR_BUFFER_BIT);
-
-	const shaderProgram = initShaderProgram(gl, VERTEX_SHADER, FRAGMENT_SHADER);
-
-	gl.useProgram(shaderProgram);
-
-	const positionLocation = gl.getAttribLocation(shaderProgram, 'position');
-	gl.vertexAttribPointer(positionLocation, 2, gl.FLOAT, false, 0, 0);
-	gl.enableVertexAttribArray(positionLocation);
-
-	const in_resolution = gl.getUniformLocation(shaderProgram, 'in_resolution');
-	gl.uniform2fv(in_resolution, [canvas.width, canvas.height]);
-
-	const u_time = gl.getUniformLocation(shaderProgram, 'u_time');
-	const u_seed = gl.getUniformLocation(shaderProgram, 'u_seed');
-	const u_scale = gl.getUniformLocation(shaderProgram, 'u_scale');
-	const u_angle = gl.getUniformLocation(shaderProgram, 'u_angle');
-	const u_radius = gl.getUniformLocation(shaderProgram, 'u_radius');
-	const u_color = gl.getUniformLocation(shaderProgram, 'u_color');
-	gl.uniform1f(u_seed, Math.random() * 1000);
-	gl.uniform1f(u_scale, props.scale);
-	gl.uniform1f(u_angle, 0.0);
-	gl.uniform1f(u_radius, 0.15);
-	gl.uniform3fv(u_color, [0.5, 1.0, 0]);
-
-	if (isChromatic()) {
-		gl.uniform1f(u_time, 0);
-		gl.drawArrays(gl.TRIANGLES, 0, 6);
-	} else {
-		let ripples = [] as { position: [number, number]; startTime: number; }[];
-		const LIFE_TIME = 1000 * 4;
-
-		function render(timeStamp: number) {
-			let sizeChanged = false;
-			if (Math.abs(height - canvas.offsetHeight) > 2) {
-				height = canvas.offsetHeight;
-				canvas.height = height;
-				sizeChanged = true;
-			}
-			if (Math.abs(width - canvas.offsetWidth) > 2) {
-				width = canvas.offsetWidth;
-				canvas.width = width;
-				sizeChanged = true;
-			}
-			if (sizeChanged && gl) {
-				gl.uniform2fv(in_resolution, [width, height]);
-				gl.viewport(0, 0, width, height);
-			}
-
-			gl.uniform1f(u_time, timeStamp);
-
-			if (Math.random() < 0.01 && ripples.length < 16) {
-				ripples.push({ position: [(Math.random() * 2) - 1, (Math.random() * 2) - 1], startTime: timeStamp });
-			}
-
-			for (let i = 0; i < 16; i++) {
-				const o = gl.getUniformLocation(shaderProgram, `u_ripplePositions[${i.toString()}]`);
-				const r = gl.getUniformLocation(shaderProgram, `u_rippleRadiuses[${i.toString()}]`);
-				const ripple = ripples[i];
-				if (ripple == null) {
-					gl.uniform2f(o, 0, 0);
-					gl.uniform1f(r, 0.0);
-					continue;
-				}
-
-				const delta = timeStamp - ripple.startTime;
-
-				gl.uniform2f(o, ripple.position[0], ripple.position[1]);
-				gl.uniform1f(r, delta / LIFE_TIME);
-			}
-
-			ripples = ripples.filter(r => (timeStamp - r.startTime) < LIFE_TIME);
-			if (ripples.length === 0) {
-				ripples.push({ position: [(Math.random() * 2) - 1, (Math.random() * 2) - 1], startTime: timeStamp });
-			}
-
-			gl.drawArrays(gl.TRIANGLES, 0, 6);
-
-			handle = window.requestAnimationFrame(render);
-		}
-
-		handle = window.requestAnimationFrame(render);
-	}
-});
-
-onUnmounted(() => {
-	if (handle) {
-		window.cancelAnimationFrame(handle);
-	}
-
-	// TODO: WebGLリソースの解放
-});
-</script>
-
-<style lang="scss" module>
-</style>

idea/MkAnimatedBg.dotted.vue

@@ -1,190 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<canvas ref="canvasEl" style="display: block; width: 100%; height: 100%; pointer-events: none;"></canvas>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, onUnmounted, useTemplateRef } from 'vue';
-import isChromatic from 'chromatic/isChromatic';
-import { GLSL_LIB_SNOISE, initShaderProgram } from '@/utility/webgl.js';
-
-const VERTEX_SHADER = `#version 300 es
-in vec2 position;
-out vec2 in_uv;
-
-void main() {
-	in_uv = (position + 1.0) / 2.0;
-	gl_Position = vec4(position, 0.0, 1.0);
-}
-`;
-
-const FRAGMENT_SHADER = `#version 300 es
-precision mediump float;
-
-const float PI = 3.141592653589793;
-const float TWO_PI = 6.283185307179586;
-const float HALF_PI = 1.5707963267948966;
-
-${GLSL_LIB_SNOISE}
-
-in vec2 in_uv;
-uniform vec2 in_resolution;
-uniform float u_scale;
-uniform float u_time;
-uniform float u_seed;
-uniform float u_angle;
-uniform float u_radius;
-uniform vec3 u_color;
-out vec4 out_color;
-
-void main() {
-	float x_ratio = min(in_resolution.x / in_resolution.y, 1.0);
-	float y_ratio = min(in_resolution.y / in_resolution.x, 1.0);
-
-	float size = 1.0 / u_scale;
-	float size_half = size / 2.0;
-
-	float angle = -(u_angle * PI);
-	vec2 centeredUv = (in_uv - vec2(0.5, 0.5)) * vec2(x_ratio, y_ratio);
-	vec2 rotatedUV = vec2(
-		centeredUv.x * cos(angle) - centeredUv.y * sin(angle),
-		centeredUv.x * sin(angle) + centeredUv.y * cos(angle)
-	);
-	vec2 uv = rotatedUV;
-
-	float modX = mod(uv.x, size);
-	float modY = mod(uv.y, size);
-
-	vec2 pixelated_uv = vec2(
-		(size * (floor((uv.x - 0.5 - size) / size) + 0.5)),
-		(size * (floor((uv.y - 0.5 - size) / size) + 0.5))
-	) + vec2(0.5 + size, 0.5 + size);
-
-	float time = u_time * 0.00025;
-
-	float noiseAScale = 1.0;
-	float noiseAX = (pixelated_uv.x + u_seed) * (u_scale / noiseAScale);
-	float noiseAY = (pixelated_uv.y + u_seed) * (u_scale / noiseAScale);
-  float noiseA = snoise(vec3(noiseAX, noiseAY, time * 2.0));
-
-	float noiseBScale = 32.0;
-	float noiseBX = (pixelated_uv.x + u_seed) * (u_scale / noiseBScale);
-	float noiseBY = (pixelated_uv.y + u_seed) * (u_scale / noiseBScale);
-  float noiseB = snoise(vec3(noiseBX, noiseBY, time));
-
-	float strength = 0.0;
-	strength += noiseA * 0.2;
-	strength += noiseB * 0.8;
-
-	float opacity = min(max(strength, 0.0), 1.0);
-
-	float threshold = ((u_radius / 2.0) / u_scale);
-	if (length(vec2(modX - size_half, modY - size_half)) < threshold) {
-		out_color = vec4(u_color.r, u_color.g, u_color.b, opacity);
-		return;
-	}
-
-	out_color = vec4(0.0, 0.0, 0.0, 0.0);
-}
-`;
-
-const canvasEl = useTemplateRef('canvasEl');
-
-const props = withDefaults(defineProps<{
-	scale?: number;
-}>(), {
-	scale: 48,
-});
-
-let handle: ReturnType<typeof window['requestAnimationFrame']> | null = null;
-
-onMounted(() => {
-	const canvas = canvasEl.value!;
-	let width = canvas.offsetWidth;
-	let height = canvas.offsetHeight;
-	canvas.width = width;
-	canvas.height = height;
-
-	const maybeGl = canvas.getContext('webgl2', { preserveDrawingBuffer: false, alpha: true, premultipliedAlpha: false, antialias: true });
-	if (maybeGl == null) return;
-
-	const gl = maybeGl;
-
-	const VERTICES = new Float32Array([-1, -1, -1, 1, 1, 1, -1, -1, 1, 1, 1, -1]);
-	const vertexBuffer = gl.createBuffer();
-	gl.bindBuffer(gl.ARRAY_BUFFER, vertexBuffer);
-	gl.bufferData(gl.ARRAY_BUFFER, VERTICES, gl.STATIC_DRAW);
-
-	//gl.clearColor(0.0, 0.0, 0.0, 0.0);
-	//gl.clear(gl.COLOR_BUFFER_BIT);
-
-	const shaderProgram = initShaderProgram(gl, VERTEX_SHADER, FRAGMENT_SHADER);
-
-	gl.useProgram(shaderProgram);
-
-	const positionLocation = gl.getAttribLocation(shaderProgram, 'position');
-	gl.vertexAttribPointer(positionLocation, 2, gl.FLOAT, false, 0, 0);
-	gl.enableVertexAttribArray(positionLocation);
-
-	const in_resolution = gl.getUniformLocation(shaderProgram, 'in_resolution');
-	gl.uniform2fv(in_resolution, [canvas.width, canvas.height]);
-
-	const u_time = gl.getUniformLocation(shaderProgram, 'u_time');
-	const u_seed = gl.getUniformLocation(shaderProgram, 'u_seed');
-	const u_scale = gl.getUniformLocation(shaderProgram, 'u_scale');
-	const u_angle = gl.getUniformLocation(shaderProgram, 'u_angle');
-	const u_radius = gl.getUniformLocation(shaderProgram, 'u_radius');
-	const u_color = gl.getUniformLocation(shaderProgram, 'u_color');
-	gl.uniform1f(u_seed, Math.random() * 1000);
-	gl.uniform1f(u_scale, props.scale);
-	gl.uniform1f(u_angle, 0.0);
-	gl.uniform1f(u_radius, 0.15);
-	gl.uniform3fv(u_color, [0.5, 1.0, 0]);
-
-	if (isChromatic()) {
-		gl.uniform1f(u_time, 0);
-		gl.drawArrays(gl.TRIANGLES, 0, 6);
-	} else {
-		function render(timeStamp: number) {
-			let sizeChanged = false;
-			if (Math.abs(height - canvas.offsetHeight) > 2) {
-				height = canvas.offsetHeight;
-				canvas.height = height;
-				sizeChanged = true;
-			}
-			if (Math.abs(width - canvas.offsetWidth) > 2) {
-				width = canvas.offsetWidth;
-				canvas.width = width;
-				sizeChanged = true;
-			}
-			if (sizeChanged && gl) {
-				gl.uniform2fv(in_resolution, [width, height]);
-				gl.viewport(0, 0, width, height);
-			}
-
-			gl.uniform1f(u_time, timeStamp);
-
-			gl.drawArrays(gl.TRIANGLES, 0, 6);
-
-			handle = window.requestAnimationFrame(render);
-		}
-
-		handle = window.requestAnimationFrame(render);
-	}
-});
-
-onUnmounted(() => {
-	if (handle) {
-		window.cancelAnimationFrame(handle);
-	}
-
-	// TODO: WebGLリソースの解放
-});
-</script>
-
-<style lang="scss" module>
-</style>

locales/en-US.yml

@@ -3194,7 +3194,6 @@ _imageEffector:
     mirror: "Mirror"
     invert: "Invert Colors"
     grayscale: "Grayscale"
-    blur: "Blur"
     colorAdjust: "Color Correction"
     colorClamp: "Color Compression"
     colorClampAdvanced: "Color Compression (Advanced)"
@@ -3210,8 +3209,6 @@ _imageEffector:
     angle: "Angle"
     scale: "Size"
     size: "Size"
-    radius: "Radius"
-    samples: "Samples"
     color: "Color"
     opacity: "Opacity"
     normalize: "Normalize"

locales/index.d.ts

@@ -1030,10 +1030,6 @@ export interface Locale extends ILocale {
      * 処理中
      */
     "processing": string;
-    /**
-     * 準備中
-     */
-    "preprocessing": string;
     /**
      * プレビュー
      */
@@ -1231,7 +1227,7 @@ export interface Locale extends ILocale {
      */
     "noMoreHistory": string;
     /**
-     * メッセージを送る
+     * チャットを始める
      */
     "startChat": string;
     /**
@@ -1931,7 +1927,7 @@ export interface Locale extends ILocale {
      */
     "markAsReadAllUnreadNotes": string;
     /**
-     * すべてのダイレクトメッセージを既読にする
+     * すべてのチャットを既読にする
      */
     "markAsReadAllTalkMessages": string;
     /**
@@ -5286,10 +5282,6 @@ export interface Locale extends ILocale {
      * 下書き
      */
     "draft": string;
-    /**
-     * 下書きと予約投稿
-     */
-    "draftsAndScheduledNotes": string;
     /**
      * リアクションする際に確認する
      */
@@ -5398,14 +5390,6 @@ export interface Locale extends ILocale {
      * チャット
      */
     "chat": string;
-    /**
-     * ダイレクトメッセージ
-     */
-    "directMessage": string;
-    /**
-     * メッセージ
-     */
-    "directMessage_short": string;
     /**
      * 旧設定情報を移行
      */
@@ -5517,14 +5501,6 @@ export interface Locale extends ILocale {
      * 低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。
      */
     "defaultImageCompressionLevel_description": string;
-    /**
-     * デフォルトの圧縮度
-     */
-    "defaultCompressionLevel": string;
-    /**
-     * 低くすると品質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、品質は低下します。
-     */
-    "defaultCompressionLevel_description": string;
     /**
      * 分
      */
@@ -5553,60 +5529,6 @@ export interface Locale extends ILocale {
      * ベータ版の検証にご協力いただきありがとうございます！
      */
     "thankYouForTestingBeta": string;
-    /**
-     * ユーザー指定ノートを作成
-     */
-    "createUserSpecifiedNote": string;
-    /**
-     * 投稿を予約
-     */
-    "schedulePost": string;
-    /**
-     * {x}に投稿を予約します
-     */
-    "scheduleToPostOnX": ParameterizedString<"x">;
-    /**
-     * {x}に投稿が予約されています
-     */
-    "scheduledToPostOnX": ParameterizedString<"x">;
-    /**
-     * 予約
-     */
-    "schedule": string;
-    /**
-     * 予約
-     */
-    "scheduled": string;
-    "_compression": {
-        "_quality": {
-            /**
-             * 高品質
-             */
-            "high": string;
-            /**
-             * 中品質
-             */
-            "medium": string;
-            /**
-             * 低品質
-             */
-            "low": string;
-        };
-        "_size": {
-            /**
-             * サイズ大
-             */
-            "large": string;
-            /**
-             * サイズ中
-             */
-            "medium": string;
-            /**
-             * サイズ小
-             */
-            "small": string;
-        };
-    };
     "_order": {
         /**
          * 新しい順
@@ -5618,10 +5540,6 @@ export interface Locale extends ILocale {
         "oldest": string;
     };
     "_chat": {
-        /**
-         * メッセージ
-         */
-        "messages": string;
         /**
          * まだメッセージはありません
          */
@@ -5631,36 +5549,36 @@ export interface Locale extends ILocale {
          */
         "newMessage": string;
         /**
-         * 個別
+         * 個人チャット
          */
         "individualChat": string;
         /**
-         * 特定ユーザーと個別にメッセージのやりとりができます。
+         * 特定ユーザーとの一対一のチャットができます。
          */
         "individualChat_description": string;
         /**
-         * グループ
+         * ルームチャット
          */
         "roomChat": string;
         /**
-         * 複数人でメッセージのやりとりができます。
-         * また、個別のメッセージを許可していないユーザーとでも、相手が受け入れればやりとりできます。
+         * 複数人でのチャットができます。
+         * また、個人チャットを許可していないユーザーとでも、相手が受け入れればチャットができます。
          */
         "roomChat_description": string;
         /**
-         * グループを作成
+         * ルームを作成
          */
         "createRoom": string;
         /**
-         * ユーザーを招待してメッセージを送信しましょう
+         * ユーザーを招待してチャットを始めましょう
          */
         "inviteUserToChat": string;
         /**
-         * 作成したグループ
+         * 作成したルーム
          */
         "yourRooms": string;
         /**
-         * 参加中のグループ
+         * 参加中のルーム
          */
         "joiningRooms": string;
         /**
@@ -5680,7 +5598,7 @@ export interface Locale extends ILocale {
          */
         "noHistory": string;
         /**
-         * グループはありません
+         * ルームはありません
          */
         "noRooms": string;
         /**
@@ -5700,7 +5618,7 @@ export interface Locale extends ILocale {
          */
         "ignore": string;
         /**
-         * グループから退出
+         * ルームから退出
          */
         "leave": string;
         /**
@@ -5724,35 +5642,35 @@ export interface Locale extends ILocale {
          */
         "newline": string;
         /**
-         * このグループをミュート
+         * このルームをミュート
          */
         "muteThisRoom": string;
         /**
-         * グループを削除
+         * ルームを削除
          */
         "deleteRoom": string;
         /**
-         * このサーバー、またはこのアカウントでダイレクトメッセージは有効化されていません。
+         * このサーバー、またはこのアカウントでチャットは有効化されていません。
          */
         "chatNotAvailableForThisAccountOrServer": string;
         /**
-         * このサーバー、またはこのアカウントでダイレクトメッセージは読み取り専用となっています。新たに書き込んだり、グループを作成・参加したりすることはできません。
+         * このサーバー、またはこのアカウントでチャットは読み取り専用となっています。新たに書き込んだり、チャットルームを作成・参加したりすることはできません。
          */
         "chatIsReadOnlyForThisAccountOrServer": string;
         /**
-         * 相手のアカウントでダイレクトメッセージが使えない状態になっています。
+         * 相手のアカウントでチャット機能が使えない状態になっています。
          */
         "chatNotAvailableInOtherAccount": string;
         /**
-         * このユーザーとのダイレクトメッセージを開始できません
+         * このユーザーとのチャットを開始できません
          */
         "cannotChatWithTheUser": string;
         /**
-         * ダイレクトメッセージが使えない状態になっているか、相手がダイレクトメッセージを開放していません。
+         * チャットが使えない状態になっているか、相手がチャットを開放していません。
          */
         "cannotChatWithTheUser_description": string;
         /**
-         * あなたはこのグループの参加者ではありませんが、招待が届いています。参加するには、招待を承認してください。
+         * あなたはこのルームの参加者ではありませんが、招待が届いています。参加するには、招待を承認してください。
          */
         "youAreNotAMemberOfThisRoomButInvited": string;
         /**
@@ -5760,31 +5678,31 @@ export interface Locale extends ILocale {
          */
         "doYouAcceptInvitation": string;
         /**
-         * ダイレクトメッセージ
+         * チャットする
          */
         "chatWithThisUser": string;
         /**
-         * このユーザーはフォロワーからのみメッセージを受け付けています。
+         * このユーザーはフォロワーからのみチャットを受け付けています。
          */
         "thisUserAllowsChatOnlyFromFollowers": string;
         /**
-         * このユーザーは、このユーザーがフォローしているユーザーからのみメッセージを受け付けています。
+         * このユーザーは、このユーザーがフォローしているユーザーからのみチャットを受け付けています。
          */
         "thisUserAllowsChatOnlyFromFollowing": string;
         /**
-         * このユーザーは相互フォローのユーザーからのみメッセージを受け付けています。
+         * このユーザーは相互フォローのユーザーからのみチャットを受け付けています。
          */
         "thisUserAllowsChatOnlyFromMutualFollowing": string;
         /**
-         * このユーザーは誰からもメッセージを受け付けていません。
+         * このユーザーは誰からもチャットを受け付けていません。
          */
         "thisUserNotAllowedChatAnyone": string;
         /**
-         * メッセージを許可する相手
+         * チャットを許可する相手
          */
         "chatAllowedUsers": string;
         /**
-         * 自分からメッセージを送った相手とはこの設定に関わらずメッセージの送受信が可能です。
+         * 自分からチャットメッセージを送った相手とはこの設定に関わらずチャットが可能です。
          */
         "chatAllowedUsers_note": string;
         "_chatAllowedUsers": {
@@ -7938,7 +7856,7 @@ export interface Locale extends ILocale {
              */
             "canImportUserLists": string;
             /**
-             * ダイレクトメッセージを許可
+             * チャットを許可
              */
             "chatAvailability": string;
             /**
@@ -7957,10 +7875,6 @@ export interface Locale extends ILocale {
              * サーバーサイドのノートの下書きの作成可能数
              */
             "noteDraftLimit": string;
-            /**
-             * 予約投稿の同時作成可能数
-             */
-            "scheduledNoteLimit": string;
             /**
              * ウォーターマーク機能の使用可否
              */
@@ -8792,7 +8706,7 @@ export interface Locale extends ILocale {
              */
             "badge": string;
             /**
-             * メッセージの背景
+             * チャットの背景
              */
             "messageBg": string;
             /**
@@ -8819,7 +8733,7 @@ export interface Locale extends ILocale {
          */
         "reaction": string;
         /**
-         * ダイレクトメッセージ
+         * チャットのメッセージ
          */
         "chatMessage": string;
     };
@@ -9103,11 +9017,11 @@ export interface Locale extends ILocale {
          */
         "write:following": string;
         /**
-         * ダイレクトメッセージを見る
+         * チャットを見る
          */
         "read:messaging": string;
         /**
-         * ダイレクトメッセージを操作する
+         * チャットを操作する
          */
         "write:messaging": string;
         /**
@@ -9399,11 +9313,11 @@ export interface Locale extends ILocale {
          */
         "write:report-abuse": string;
         /**
-         * ダイレクトメッセージを操作する
+         * チャットを操作する
          */
         "write:chat": string;
         /**
-         * ダイレクトメッセージを閲覧する
+         * チャットを閲覧する
          */
         "read:chat": string;
     };
@@ -9629,7 +9543,7 @@ export interface Locale extends ILocale {
          */
         "birthdayFollowings": string;
         /**
-         * ダイレクトメッセージ
+         * チャット
          */
         "chat": string;
     };
@@ -10356,14 +10270,6 @@ export interface Locale extends ILocale {
          * アンケートの結果が出ました
          */
         "pollEnded": string;
-        /**
-         * 予約ノートが投稿されました
-         */
-        "scheduledNotePosted": string;
-        /**
-         * 予約ノートの投稿に失敗しました
-         */
-        "scheduledNotePostFailed": string;
         /**
          * 新しい投稿
          */
@@ -10377,7 +10283,7 @@ export interface Locale extends ILocale {
          */
         "roleAssigned": string;
         /**
-         * ダイレクトメッセージのグループへ招待されました
+         * チャットルームへ招待されました
          */
         "chatRoomInvitationReceived": string;
         /**
@@ -10490,7 +10396,7 @@ export interface Locale extends ILocale {
              */
             "roleAssigned": string;
             /**
-             * ダイレクトメッセージのグループへ招待された
+             * チャットルームへ招待された
              */
             "chatRoomInvitationReceived": string;
             /**
@@ -10672,7 +10578,7 @@ export interface Locale extends ILocale {
              */
             "roleTimeline": string;
             /**
-             * ダイレクトメッセージ
+             * チャット
              */
             "chat": string;
         };
@@ -11039,7 +10945,7 @@ export interface Locale extends ILocale {
          */
         "deleteGalleryPost": string;
         /**
-         * ダイレクトメッセージのグループを削除
+         * チャットルームを削除
          */
         "deleteChatRoom": string;
         /**
@@ -12313,18 +12219,10 @@ export interface Locale extends ILocale {
          * テキスト
          */
         "text": string;
-        /**
-         * 二次元コード
-         */
-        "qr": string;
         /**
          * 位置
          */
         "position": string;
-        /**
-         * マージン
-         */
-        "margin": string;
         /**
          * タイプ
          */
@@ -12381,10 +12279,6 @@ export interface Locale extends ILocale {
          * サブドットの数
          */
         "polkadotSubDotDivisions": string;
-        /**
-         * 空欄にするとアカウントのURLになります
-         */
-        "leaveBlankToAccountUrl": string;
     };
     "_imageEffector": {
         /**
@@ -12424,14 +12318,6 @@ export interface Locale extends ILocale {
              * 白黒
              */
             "grayscale": string;
-            /**
-             * ぼかし
-             */
-            "blur": string;
-            /**
-             * モザイク
-             */
-            "pixelate": string;
             /**
              * 色調補正
              */
@@ -12476,10 +12362,6 @@ export interface Locale extends ILocale {
              * ティアリング
              */
             "tearing": string;
-            /**
-             * 塗りつぶし
-             */
-            "fill": string;
         };
         "_fxProps": {
             /**
@@ -12494,18 +12376,6 @@ export interface Locale extends ILocale {
              * サイズ
              */
             "size": string;
-            /**
-             * 半径
-             */
-            "radius": string;
-            /**
-             * サンプル数
-             */
-            "samples": string;
-            /**
-             * 位置
-             */
-            "offset": string;
             /**
              * 色
              */
@@ -12618,10 +12488,6 @@ export interface Locale extends ILocale {
              * 黒色にする
              */
             "zoomLinesBlack": string;
-            /**
-             * 円形
-             */
-            "circle": string;
         };
     };
     /**
@@ -12681,80 +12547,6 @@ export interface Locale extends ILocale {
          * 下書き一覧
          */
         "listDrafts": string;
-        /**
-         * 投稿予約
-         */
-        "schedule": string;
-        /**
-         * 予約投稿一覧
-         */
-        "listScheduledNotes": string;
-        /**
-         * 予約解除
-         */
-        "cancelSchedule": string;
-    };
-    /**
-     * 二次元コード
-     */
-    "qr": string;
-    "_qr": {
-        /**
-         * 表示
-         */
-        "showTabTitle": string;
-        /**
-         * 読み取る
-         */
-        "readTabTitle": string;
-        /**
-         * {name} {acct}
-         */
-        "shareTitle": ParameterizedString<"name" | "acct">;
-        /**
-         * Fediverseで私をフォローしてください！
-         */
-        "shareText": string;
-        /**
-         * カメラを選択
-         */
-        "chooseCamera": string;
-        /**
-         * ライト選択不可
-         */
-        "cannotToggleFlash": string;
-        /**
-         * ライトをオンにする
-         */
-        "turnOnFlash": string;
-        /**
-         * ライトをオフにする
-         */
-        "turnOffFlash": string;
-        /**
-         * コードリーダーを再開
-         */
-        "startQr": string;
-        /**
-         * コードリーダーを停止
-         */
-        "stopQr": string;
-        /**
-         * QRコードが見つかりません
-         */
-        "noQrCodeFound": string;
-        /**
-         * 端末の画像をスキャン
-         */
-        "scanFile": string;
-        /**
-         * テキスト
-         */
-        "raw": string;
-        /**
-         * MFM
-         */
-        "mfm": string;
     };
 }
 declare const locales: {

locales/ja-JP.yml

@@ -253,7 +253,6 @@ noteDeleteConfirm: "このノートを削除しますか？"
 pinLimitExceeded: "これ以上ピン留めできません"
 done: "完了"
 processing: "処理中"
-preprocessing: "準備中"
 preview: "プレビュー"
 default: "デフォルト"
 defaultValueIs: "デフォルト: {value}"
@@ -303,7 +302,7 @@ uploadNFiles: "{n}個のファイルをアップロード"
 explore: "みつける"
 messageRead: "既読"
 noMoreHistory: "これより過去の履歴はありません"
-startChat: "メッセージを送る"
+startChat: "チャットを始める"
 nUsersRead: "{n}人が読みました"
 agreeTo: "{0}に同意"
 agree: "同意する"
@@ -478,7 +477,7 @@ notFoundDescription: "指定されたURLに該当するページはありませ
 uploadFolder: "既定アップロード先"
 markAsReadAllNotifications: "すべての通知を既読にする"
 markAsReadAllUnreadNotes: "すべての投稿を既読にする"
-markAsReadAllTalkMessages: "すべてのダイレクトメッセージを既読にする"
+markAsReadAllTalkMessages: "すべてのチャットを既読にする"
 help: "ヘルプ"
 inputMessageHere: "ここにメッセージを入力"
 close: "閉じる"
@@ -1317,7 +1316,6 @@ acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします
 federationSpecified: "このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。"
 federationDisabled: "このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。"
 draft: "下書き"
-draftsAndScheduledNotes: "下書きと予約投稿"
 confirmOnReact: "リアクションする際に確認する"
 reactAreYouSure: "\" {emoji} \" をリアクションしますか？"
 markAsSensitiveConfirm: "このメディアをセンシティブとして設定しますか？"
@@ -1345,8 +1343,6 @@ postForm: "投稿フォーム"
 textCount: "文字数"
 information: "情報"
 chat: "チャット"
-directMessage: "ダイレクトメッセージ"
-directMessage_short: "メッセージ"
 migrateOldSettings: "旧設定情報を移行"
 migrateOldSettings_description: "通常これは自動で行われていますが、何らかの理由により上手く移行されなかった場合は手動で移行処理をトリガーできます。現在の設定情報は上書きされます。"
 compress: "圧縮"
@@ -1374,8 +1370,6 @@ redisplayAllTips: "全ての「ヒントとコツ」を再表示"
 hideAllTips: "全ての「ヒントとコツ」を非表示"
 defaultImageCompressionLevel: "デフォルトの画像圧縮度"
 defaultImageCompressionLevel_description: "低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。"
-defaultCompressionLevel: "デフォルトの圧縮度"
-defaultCompressionLevel_description: "低くすると品質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、品質は低下します。"
 inMinutes: "分"
 inDays: "日"
 safeModeEnabled: "セーフモードが有効です"
@@ -1383,70 +1377,53 @@ pluginsAreDisabledBecauseSafeMode: "セーフモードが有効なため、プ
 customCssIsDisabledBecauseSafeMode: "セーフモードが有効なため、カスタムCSSは適用されていません。"
 themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。"
 thankYouForTestingBeta: "ベータ版の検証にご協力いただきありがとうございます！"
-createUserSpecifiedNote: "ユーザー指定ノートを作成"
-schedulePost: "投稿を予約"
-scheduleToPostOnX: "{x}に投稿を予約します"
-scheduledToPostOnX: "{x}に投稿が予約されています"
-schedule: "予約"
-scheduled: "予約"
-
-_compression:
-  _quality:
-    high: "高品質"
-    medium: "中品質"
-    low: "低品質"
-  _size:
-    large: "サイズ大"
-    medium: "サイズ中"
-    small: "サイズ小"
 
 _order:
   newest: "新しい順"
   oldest: "古い順"
 
 _chat:
-  messages: "メッセージ"
   noMessagesYet: "まだメッセージはありません"
   newMessage: "新しいメッセージ"
-  individualChat: "個別"
-  individualChat_description: "特定ユーザーと個別にメッセージのやりとりができます。"
-  roomChat: "グループ"
-  roomChat_description: "複数人でメッセージのやりとりができます。\nまた、個別のメッセージを許可していないユーザーとでも、相手が受け入れればやりとりできます。"
-  createRoom: "グループを作成"
-  inviteUserToChat: "ユーザーを招待してメッセージを送信しましょう"
-  yourRooms: "作成したグループ"
-  joiningRooms: "参加中のグループ"
+  individualChat: "個人チャット"
+  individualChat_description: "特定ユーザーとの一対一のチャットができます。"
+  roomChat: "ルームチャット"
+  roomChat_description: "複数人でのチャットができます。\nまた、個人チャットを許可していないユーザーとでも、相手が受け入れればチャットができます。"
+  createRoom: "ルームを作成"
+  inviteUserToChat: "ユーザーを招待してチャットを始めましょう"
+  yourRooms: "作成したルーム"
+  joiningRooms: "参加中のルーム"
   invitations: "招待"
   noInvitations: "招待はありません"
   history: "履歴"
   noHistory: "履歴はありません"
-  noRooms: "グループはありません"
+  noRooms: "ルームはありません"
   inviteUser: "ユーザーを招待"
   sentInvitations: "送信した招待"
   join: "参加"
   ignore: "無視"
-  leave: "グループから退出"
+  leave: "ルームから退出"
   members: "メンバー"
   searchMessages: "メッセージを検索"
   home: "ホーム"
   send: "送信"
   newline: "改行"
-  muteThisRoom: "このグループをミュート"
-  deleteRoom: "グループを削除"
-  chatNotAvailableForThisAccountOrServer: "このサーバー、またはこのアカウントでダイレクトメッセージは有効化されていません。"
-  chatIsReadOnlyForThisAccountOrServer: "このサーバー、またはこのアカウントでダイレクトメッセージは読み取り専用となっています。新たに書き込んだり、グループを作成・参加したりすることはできません。"
-  chatNotAvailableInOtherAccount: "相手のアカウントでダイレクトメッセージが使えない状態になっています。"
-  cannotChatWithTheUser: "このユーザーとのダイレクトメッセージを開始できません"
-  cannotChatWithTheUser_description: "ダイレクトメッセージが使えない状態になっているか、相手がダイレクトメッセージを開放していません。"
-  youAreNotAMemberOfThisRoomButInvited: "あなたはこのグループの参加者ではありませんが、招待が届いています。参加するには、招待を承認してください。"
+  muteThisRoom: "このルームをミュート"
+  deleteRoom: "ルームを削除"
+  chatNotAvailableForThisAccountOrServer: "このサーバー、またはこのアカウントでチャットは有効化されていません。"
+  chatIsReadOnlyForThisAccountOrServer: "このサーバー、またはこのアカウントでチャットは読み取り専用となっています。新たに書き込んだり、チャットルームを作成・参加したりすることはできません。"
+  chatNotAvailableInOtherAccount: "相手のアカウントでチャット機能が使えない状態になっています。"
+  cannotChatWithTheUser: "このユーザーとのチャットを開始できません"
+  cannotChatWithTheUser_description: "チャットが使えない状態になっているか、相手がチャットを開放していません。"
+  youAreNotAMemberOfThisRoomButInvited: "あなたはこのルームの参加者ではありませんが、招待が届いています。参加するには、招待を承認してください。"
   doYouAcceptInvitation: "招待を承認しますか？"
-  chatWithThisUser: "ダイレクトメッセージ"
-  thisUserAllowsChatOnlyFromFollowers: "このユーザーはフォロワーからのみメッセージを受け付けています。"
-  thisUserAllowsChatOnlyFromFollowing: "このユーザーは、このユーザーがフォローしているユーザーからのみメッセージを受け付けています。"
-  thisUserAllowsChatOnlyFromMutualFollowing: "このユーザーは相互フォローのユーザーからのみメッセージを受け付けています。"
-  thisUserNotAllowedChatAnyone: "このユーザーは誰からもメッセージを受け付けていません。"
-  chatAllowedUsers: "メッセージを許可する相手"
-  chatAllowedUsers_note: "自分からメッセージを送った相手とはこの設定に関わらずメッセージの送受信が可能です。"
+  chatWithThisUser: "チャットする"
+  thisUserAllowsChatOnlyFromFollowers: "このユーザーはフォロワーからのみチャットを受け付けています。"
+  thisUserAllowsChatOnlyFromFollowing: "このユーザーは、このユーザーがフォローしているユーザーからのみチャットを受け付けています。"
+  thisUserAllowsChatOnlyFromMutualFollowing: "このユーザーは相互フォローのユーザーからのみチャットを受け付けています。"
+  thisUserNotAllowedChatAnyone: "このユーザーは誰からもチャットを受け付けていません。"
+  chatAllowedUsers: "チャットを許可する相手"
+  chatAllowedUsers_note: "自分からチャットメッセージを送った相手とはこの設定に関わらずチャットが可能です。"
   _chatAllowedUsers:
     everyone: "誰でも"
     followers: "自分のフォロワーのみ"
@@ -2057,12 +2034,11 @@ _role:
     canImportFollowing: "フォローのインポートを許可"
     canImportMuting: "ミュートのインポートを許可"
     canImportUserLists: "リストのインポートを許可"
-    chatAvailability: "ダイレクトメッセージを許可"
+    chatAvailability: "チャットを許可"
     uploadableFileTypes: "アップロード可能なファイル種別"
     uploadableFileTypes_caption: "MIMEタイプを指定します。改行で区切って複数指定できるほか、アスタリスク(*)でワイルドカード指定できます。(例: image/*)"
     uploadableFileTypes_caption2: "ファイルによっては種別を判定できないことがあります。そのようなファイルを許可する場合は {x} を指定に追加してください。"
     noteDraftLimit: "サーバーサイドのノートの下書きの作成可能数"
-    scheduledNoteLimit: "予約投稿の同時作成可能数"
     watermarkAvailable: "ウォーターマーク機能の使用可否"
   _condition:
     roleAssignedTo: "マニュアルロールにアサイン済み"
@@ -2305,7 +2281,7 @@ _theme:
     buttonHoverBg: "ボタンの背景 (ホバー)"
     inputBorder: "入力ボックスの縁取り"
     badge: "バッジ"
-    messageBg: "メッセージの背景"
+    messageBg: "チャットの背景"
     fgHighlighted: "強調された文字"
 
 _sfx:
@@ -2313,7 +2289,7 @@ _sfx:
   noteMy: "ノート(自分)"
   notification: "通知"
   reaction: "リアクション選択時"
-  chatMessage: "ダイレクトメッセージ"
+  chatMessage: "チャットのメッセージ"
 
 _soundSettings:
   driveFile: "ドライブの音声を使用"
@@ -2393,8 +2369,8 @@ _permissions:
   "write:favorites": "お気に入りを操作する"
   "read:following": "フォローの情報を見る"
   "write:following": "フォロー・フォロー解除する"
-  "read:messaging": "ダイレクトメッセージを見る"
-  "write:messaging": "ダイレクトメッセージを操作する"
+  "read:messaging": "チャットを見る"
+  "write:messaging": "チャットを操作する"
   "read:mutes": "ミュートを見る"
   "write:mutes": "ミュートを操作する"
   "write:notes": "ノートを作成・削除する"
@@ -2467,8 +2443,8 @@ _permissions:
   "read:clip-favorite": "クリップのいいねを見る"
   "read:federation": "連合に関する情報を取得する"
   "write:report-abuse": "違反を報告する"
-  "write:chat": "ダイレクトメッセージを操作する"
-  "read:chat": "ダイレクトメッセージを閲覧する"
+  "write:chat": "チャットを操作する"
+  "read:chat": "チャットを閲覧する"
 
 _auth:
   shareAccessTitle: "アプリへのアクセス許可"
@@ -2531,7 +2507,7 @@ _widgets:
     chooseList: "リストを選択"
   clicker: "クリッカー"
   birthdayFollowings: "今日誕生日のユーザー"
-  chat: "ダイレクトメッセージ"
+  chat: "チャット"
 
 _cw:
   hide: "隠す"
@@ -2735,12 +2711,10 @@ _notification:
   youReceivedFollowRequest: "フォローリクエストが来ました"
   yourFollowRequestAccepted: "フォローリクエストが承認されました"
   pollEnded: "アンケートの結果が出ました"
-  scheduledNotePosted: "予約ノートが投稿されました"
-  scheduledNotePostFailed: "予約ノートの投稿に失敗しました"
   newNote: "新しい投稿"
   unreadAntennaNote: "アンテナ {name}"
   roleAssigned: "ロールが付与されました"
-  chatRoomInvitationReceived: "ダイレクトメッセージのグループへ招待されました"
+  chatRoomInvitationReceived: "チャットルームへ招待されました"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
   achievementEarned: "実績を獲得"
   testNotification: "通知テスト"
@@ -2770,7 +2744,7 @@ _notification:
     receiveFollowRequest: "フォロー申請を受け取った"
     followRequestAccepted: "フォローが受理された"
     roleAssigned: "ロールが付与された"
-    chatRoomInvitationReceived: "ダイレクトメッセージのグループへ招待された"
+    chatRoomInvitationReceived: "チャットルームへ招待された"
     achievementEarned: "実績の獲得"
     exportCompleted: "エクスポートが完了した"
     login: "ログイン"
@@ -2820,7 +2794,7 @@ _deck:
     mentions: "メンション"
     direct: "指名"
     roleTimeline: "ロールタイムライン"
-    chat: "ダイレクトメッセージ"
+    chat: "チャット"
 
 _dialog:
   charactersExceeded: "最大文字数を超えています！ 現在 {current} / 制限 {max}"
@@ -2923,7 +2897,7 @@ _moderationLogTypes:
   deletePage: "ページを削除"
   deleteFlash: "Playを削除"
   deleteGalleryPost: "ギャラリーの投稿を削除"
-  deleteChatRoom: "ダイレクトメッセージのグループを削除"
+  deleteChatRoom: "チャットルームを削除"
   updateProxyAccountDescription: "プロキシアカウントの説明を更新"
 
 _fileViewer:
@@ -3297,9 +3271,7 @@ _watermarkEditor:
   opacity: "不透明度"
   scale: "サイズ"
   text: "テキスト"
-  qr: "二次元コード"
   position: "位置"
-  margin: "マージン"
   type: "タイプ"
   image: "画像"
   advanced: "高度"
@@ -3314,7 +3286,6 @@ _watermarkEditor:
   polkadotSubDotOpacity: "サブドットの不透明度"
   polkadotSubDotRadius: "サブドットの大きさ"
   polkadotSubDotDivisions: "サブドットの数"
-  leaveBlankToAccountUrl: "空欄にするとアカウントのURLになります"
 
 _imageEffector:
   title: "エフェクト"
@@ -3328,8 +3299,6 @@ _imageEffector:
     mirror: "ミラー"
     invert: "色の反転"
     grayscale: "白黒"
-    blur: "ぼかし"
-    pixelate: "モザイク"
     colorAdjust: "色調補正"
     colorClamp: "色の圧縮"
     colorClampAdvanced: "色の圧縮(高度)"
@@ -3341,15 +3310,11 @@ _imageEffector:
     checker: "チェッカー"
     blockNoise: "ブロックノイズ"
     tearing: "ティアリング"
-    fill: "塗りつぶし"
 
   _fxProps:
     angle: "角度"
     scale: "サイズ"
     size: "サイズ"
-    radius: "半径"
-    samples: "サンプル数"
-    offset: "位置"
     color: "色"
     opacity: "不透明度"
     normalize: "正規化"
@@ -3378,7 +3343,6 @@ _imageEffector:
     zoomLinesThreshold: "集中線の幅"
     zoomLinesMaskSize: "中心径"
     zoomLinesBlack: "黒色にする"
-    circle: "円形"
 
 drafts: "下書き"
 _drafts:
@@ -3395,23 +3359,3 @@ _drafts:
   restoreFromDraft: "下書きから復元"
   restore: "復元"
   listDrafts: "下書き一覧"
-  schedule: "投稿予約"
-  listScheduledNotes: "予約投稿一覧"
-  cancelSchedule: "予約解除"
-
-qr: "二次元コード"
-_qr:
-  showTabTitle: "表示"
-  readTabTitle: "読み取る"
-  shareTitle: "{name} {acct}"
-  shareText: "Fediverseで私をフォローしてください！"
-  chooseCamera: "カメラを選択"
-  cannotToggleFlash: "ライト選択不可"
-  turnOnFlash: "ライトをオンにする"
-  turnOffFlash: "ライトをオフにする"
-  startQr: "コードリーダーを再開"
-  stopQr: "コードリーダーを停止"
-  noQrCodeFound: "QRコードが見つかりません"
-  scanFile: "端末の画像をスキャン"
-  raw: "テキスト"
-  mfm: "MFM"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2025.9.1-alpha.2",
+	"version": "2025.9.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@10.16.0",
+	"packageManager": "pnpm@10.15.1",
 	"workspaces": [
 		"packages/frontend-shared",
 		"packages/frontend",
@@ -76,7 +76,7 @@
 		"eslint": "9.35.0",
 		"globals": "16.3.0",
 		"ncp": "2.0.0",
-		"pnpm": "10.16.0",
+		"pnpm": "10.15.1",
 		"start-server-and-test": "2.1.0"
 	},
 	"optionalDependencies": {

packages/backend/migration/1757823175259-sensitive-ad.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class SensitiveAd1757823175259 {
-    name = 'SensitiveAd1757823175259'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "ad" ADD "isSensitive" boolean NOT NULL DEFAULT false`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "isSensitive"`);
-    }
-}

packages/backend/migration/1758677617888-scheduled-post.js

@@ -1,24 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class ScheduledPost1758677617888 {
-    name = 'ScheduledPost1758677617888'
-
-    /**
-     * @param {QueryRunner} queryRunner
-     */
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_draft" ADD "scheduledAt" TIMESTAMP WITH TIME ZONE`);
-        await queryRunner.query(`ALTER TABLE "note_draft" ADD "isActuallyScheduled" boolean NOT NULL DEFAULT false`);
-    }
-
-    /**
-     * @param {QueryRunner} queryRunner
-     */
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_draft" DROP COLUMN "isActuallyScheduled"`);
-        await queryRunner.query(`ALTER TABLE "note_draft" DROP COLUMN "scheduledAt"`);
-    }
-}

packages/backend/src/config.ts

@@ -7,7 +7,6 @@ import * as fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, resolve } from 'node:path';
 import * as yaml from 'js-yaml';
-import { type FastifyServerOptions } from 'fastify';
 import type * as Sentry from '@sentry/node';
 import type * as SentryVue from '@sentry/vue';
 import type { RedisOptions } from 'ioredis';
@@ -28,7 +27,6 @@ type Source = {
 	url?: string;
 	port?: number;
 	socket?: string;
-	trustProxy?: FastifyServerOptions['trustProxy'];
 	chmodSocket?: string;
 	disableHsts?: boolean;
 	db: {
@@ -120,7 +118,6 @@ export type Config = {
 	url: string;
 	port: number;
 	socket: string | undefined;
-	trustProxy: FastifyServerOptions['trustProxy'];
 	chmodSocket: string | undefined;
 	disableHsts: boolean | undefined;
 	db: {
@@ -269,7 +266,6 @@ export function loadConfig(): Config {
 		url: url.origin,
 		port: config.port ?? parseInt(process.env.PORT ?? '', 10),
 		socket: config.socket,
-		trustProxy: config.trustProxy,
 		chmodSocket: config.chmodSocket,
 		disableHsts: config.disableHsts,
 		host,

packages/backend/src/core/NoteCreateService.ts

@@ -13,7 +13,7 @@ import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mf
 import { extractHashtags } from '@/misc/extract-hashtags.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { MiNote } from '@/models/Note.js';
-import type { BlockingsRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, FollowingsRepository, InstancesRepository, MiFollowing, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js';
+import type { ChannelFollowingsRepository, ChannelsRepository, FollowingsRepository, InstancesRepository, MiFollowing, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiApp } from '@/models/App.js';
 import { concat } from '@/misc/prelude/array.js';
@@ -56,7 +56,6 @@ import { trackPromise } from '@/misc/promise-tracker.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { CollapsedQueue } from '@/misc/collapsed-queue.js';
 import { CacheService } from '@/core/CacheService.js';
-import { isQuote, isRenote } from '@/misc/is-renote.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -193,12 +192,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		@Inject(DI.channelFollowingsRepository)
 		private channelFollowingsRepository: ChannelFollowingsRepository,
 
-		@Inject(DI.blockingsRepository)
-		private blockingsRepository: BlockingsRepository,
-
-		@Inject(DI.driveFilesRepository)
-		private driveFilesRepository: DriveFilesRepository,
-
 		private userEntityService: UserEntityService,
 		private noteEntityService: NoteEntityService,
 		private idService: IdService,
@@ -228,167 +221,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		this.updateNotesCountQueue = new CollapsedQueue(process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
 	}
 
-	@bindThis
-	public async fetchAndCreate(user: {
-		id: MiUser['id'];
-		username: MiUser['username'];
-		host: MiUser['host'];
-		isBot: MiUser['isBot'];
-		isCat: MiUser['isCat'];
-	}, data: {
-		createdAt: Date;
-		replyId: MiNote['id'] | null;
-		renoteId: MiNote['id'] | null;
-		fileIds: MiDriveFile['id'][];
-		text: string | null;
-		cw: string | null;
-		visibility: string;
-		visibleUserIds: MiUser['id'][];
-		channelId: MiChannel['id'] | null;
-		localOnly: boolean;
-		reactionAcceptance: MiNote['reactionAcceptance'];
-		poll: IPoll | null;
-		apMentions?: MinimumUser[] | null;
-		apHashtags?: string[] | null;
-		apEmojis?: string[] | null;
-	}): Promise<MiNote> {
-		const visibleUsers = data.visibleUserIds.length > 0 ? await this.usersRepository.findBy({
-			id: In(data.visibleUserIds),
-		}) : [];
-
-		let files: MiDriveFile[] = [];
-		if (data.fileIds.length > 0) {
-			files = await this.driveFilesRepository.createQueryBuilder('file')
-				.where('file.userId = :userId AND file.id IN (:...fileIds)', {
-					userId: user.id,
-					fileIds: data.fileIds,
-				})
-				.orderBy('array_position(ARRAY[:...fileIds], "id"::text)')
-				.setParameters({ fileIds: data.fileIds })
-				.getMany();
-
-			if (files.length !== data.fileIds.length) {
-				throw new IdentifiableError('801c046c-5bf5-4234-ad2b-e78fc20a2ac7', 'No such file');
-			}
-		}
-
-		let renote: MiNote | null = null;
-		if (data.renoteId != null) {
-			// Fetch renote to note
-			renote = await this.notesRepository.findOne({
-				where: { id: data.renoteId },
-				relations: ['user', 'renote', 'reply'],
-			});
-
-			if (renote == null) {
-				throw new IdentifiableError('53983c56-e163-45a6-942f-4ddc485d4290', 'No such renote target');
-			} else if (isRenote(renote) && !isQuote(renote)) {
-				throw new IdentifiableError('bde24c37-121f-4e7d-980d-cec52f599f02', 'Cannot renote pure renote');
-			}
-
-			// Check blocking
-			if (renote.userId !== user.id) {
-				const blockExist = await this.blockingsRepository.exists({
-					where: {
-						blockerId: renote.userId,
-						blockeeId: user.id,
-					},
-				});
-				if (blockExist) {
-					throw new IdentifiableError('2b4fe776-4414-4a2d-ae39-f3418b8fd4d3', 'You have been blocked by the user');
-				}
-			}
-
-			if (renote.visibility === 'followers' && renote.userId !== user.id) {
-				// 他人のfollowers noteはreject
-				throw new IdentifiableError('90b9d6f0-893a-4fef-b0f1-e9a33989f71a', 'Renote target visibility');
-			} else if (renote.visibility === 'specified') {
-				// specified / direct noteはreject
-				throw new IdentifiableError('48d7a997-da5c-4716-b3c3-92db3f37bf7d', 'Renote target visibility');
-			}
-
-			if (renote.channelId && renote.channelId !== data.channelId) {
-				// チャンネルのノートに対しリノート要求がきたとき、チャンネル外へのリノート可否をチェック
-				// リノートのユースケースのうち、チャンネル内→チャンネル外は少数だと考えられるため、JOINはせず必要な時に都度取得する
-				const renoteChannel = await this.channelsRepository.findOneBy({ id: renote.channelId });
-				if (renoteChannel == null) {
-					// リノートしたいノートが書き込まれているチャンネルが無い
-					throw new IdentifiableError('b060f9a6-8909-4080-9e0b-94d9fa6f6a77', 'No such channel');
-				} else if (!renoteChannel.allowRenoteToExternal) {
-					// リノート作成のリクエストだが、対象チャンネルがリノート禁止だった場合
-					throw new IdentifiableError('7e435f4a-780d-4cfc-a15a-42519bd6fb67', 'Channel does not allow renote to external');
-				}
-			}
-		}
-
-		let reply: MiNote | null = null;
-		if (data.replyId != null) {
-			// Fetch reply
-			reply = await this.notesRepository.findOne({
-				where: { id: data.replyId },
-				relations: ['user'],
-			});
-
-			if (reply == null) {
-				throw new IdentifiableError('60142edb-1519-408e-926d-4f108d27bee0', 'No such reply target');
-			} else if (isRenote(reply) && !isQuote(reply)) {
-				throw new IdentifiableError('f089e4e2-c0e7-4f60-8a23-e5a6bf786b36', 'Cannot reply to pure renote');
-			} else if (!await this.noteEntityService.isVisibleForMe(reply, user.id)) {
-				throw new IdentifiableError('11cd37b3-a411-4f77-8633-c580ce6a8dce', 'No such reply target');
-			} else if (reply.visibility === 'specified' && data.visibility !== 'specified') {
-				throw new IdentifiableError('ced780a1-2012-4caf-bc7e-a95a291294cb', 'Cannot reply to specified note with different visibility');
-			}
-
-			// Check blocking
-			if (reply.userId !== user.id) {
-				const blockExist = await this.blockingsRepository.exists({
-					where: {
-						blockerId: reply.userId,
-						blockeeId: user.id,
-					},
-				});
-				if (blockExist) {
-					throw new IdentifiableError('b0df6025-f2e8-44b4-a26a-17ad99104612', 'You have been blocked by the user');
-				}
-			}
-		}
-
-		if (data.poll) {
-			if (data.poll.expiresAt != null) {
-				if (data.poll.expiresAt.getTime() < Date.now()) {
-					throw new IdentifiableError('0c11c11e-0c8d-48e7-822c-76ccef660068', 'Poll expiration must be future time');
-				}
-			}
-		}
-
-		let channel: MiChannel | null = null;
-		if (data.channelId != null) {
-			channel = await this.channelsRepository.findOneBy({ id: data.channelId, isArchived: false });
-
-			if (channel == null) {
-				throw new IdentifiableError('bfa3905b-25f5-4894-b430-da331a490e4b', 'No such channel');
-			}
-		}
-
-		return this.create(user, {
-			createdAt: data.createdAt,
-			files: files,
-			poll: data.poll,
-			text: data.text,
-			reply,
-			renote,
-			cw: data.cw,
-			localOnly: data.localOnly,
-			reactionAcceptance: data.reactionAcceptance,
-			visibility: data.visibility,
-			visibleUsers,
-			channel,
-			apMentions: data.apMentions,
-			apHashtags: data.apHashtags,
-			apEmojis: data.apEmojis,
-		});
-	}
-
 	@bindThis
 	public async create(user: {
 		id: MiUser['id'];

packages/backend/src/core/NoteDraftService.ts

@@ -5,18 +5,32 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
+import type { noteVisibilities, noteReactionAcceptances } from '@/types.js';
 import { DI } from '@/di-symbols.js';
 import type { MiNoteDraft, NoteDraftsRepository, MiNote, MiDriveFile, MiChannel, UsersRepository, DriveFilesRepository, NotesRepository, BlockingsRepository, ChannelsRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import { IdService } from '@/core/IdService.js';
 import type { MiLocalUser, MiUser } from '@/models/User.js';
+import { IPoll } from '@/models/Poll.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { isRenote, isQuote } from '@/misc/is-renote.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
-import { QueueService } from '@/core/QueueService.js';
 
-export type NoteDraftOptions = Omit<MiNoteDraft, 'id' | 'userId' | 'user' | 'reply' | 'renote' | 'channel'>;
+export type NoteDraftOptions = {
+	replyId?: MiNote['id'] | null;
+	renoteId?: MiNote['id'] | null;
+	text?: string | null;
+	cw?: string | null;
+	localOnly?: boolean | null;
+	reactionAcceptance?: typeof noteReactionAcceptances[number];
+	visibility?: typeof noteVisibilities[number];
+	fileIds?: MiDriveFile['id'][];
+	visibleUserIds?: MiUser['id'][];
+	hashtag?: string;
+	channelId?: MiChannel['id'] | null;
+	poll?: (IPoll & { expiredAfter?: number | null }) | null;
+};
 
 @Injectable()
 export class NoteDraftService {
@@ -42,7 +56,6 @@ export class NoteDraftService {
 		private roleService: RoleService,
 		private idService: IdService,
 		private noteEntityService: NoteEntityService,
-		private queueService: QueueService,
 	) {
 	}
 
@@ -59,43 +72,36 @@ export class NoteDraftService {
 	@bindThis
 	public async create(me: MiLocalUser, data: NoteDraftOptions): Promise<MiNoteDraft> {
 		//#region check draft limit
-		const policies = await this.roleService.getUserPolicies(me.id);
 
 		const currentCount = await this.noteDraftsRepository.countBy({
 			userId: me.id,
 		});
-		if (currentCount >= policies.noteDraftLimit) {
+		if (currentCount >= (await this.roleService.getUserPolicies(me.id)).noteDraftLimit) {
 			throw new IdentifiableError('9ee33bbe-fde3-4c71-9b51-e50492c6b9c8', 'Too many drafts');
 		}
-
-		if (data.isActuallyScheduled) {
-			const currentScheduledCount = await this.noteDraftsRepository.countBy({
-				userId: me.id,
-				isActuallyScheduled: true,
-			});
-			if (currentScheduledCount >= policies.scheduledNoteLimit) {
-				throw new IdentifiableError('c3275f19-4558-4c59-83e1-4f684b5fab66', 'Too many scheduled notes');
-			}
-		}
 		//#endregion
 
-		await this.validate(me, data);
-
-		const draft = await this.noteDraftsRepository.insertOne({
-			...data,
-			id: this.idService.gen(),
-			userId: me.id,
-		});
-
-		if (draft.scheduledAt && draft.isActuallyScheduled) {
-			this.schedule(draft);
+		if (data.poll) {
+			if (typeof data.poll.expiresAt === 'number') {
+				if (data.poll.expiresAt < Date.now()) {
+					throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
 				}
+			} else if (typeof data.poll.expiredAfter === 'number') {
+				data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
+			}
+		}
+
+		const appliedDraft = await this.checkAndSetDraftNoteOptions(me, this.noteDraftsRepository.create(), data);
+
+		appliedDraft.id = this.idService.gen();
+		appliedDraft.userId = me.id;
+		const draft = this.noteDraftsRepository.save(appliedDraft);
 
 		return draft;
 	}
 
 	@bindThis
-	public async update(me: MiLocalUser, draftId: MiNoteDraft['id'], data: Partial<NoteDraftOptions>): Promise<MiNoteDraft> {
+	public async update(me: MiLocalUser, draftId: MiNoteDraft['id'], data: NoteDraftOptions): Promise<MiNoteDraft> {
 		const draft = await this.noteDraftsRepository.findOneBy({
 			id: draftId,
 			userId: me.id,
@@ -105,36 +111,19 @@ export class NoteDraftService {
 			throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
 		}
 
-		//#region check draft limit
-		const policies = await this.roleService.getUserPolicies(me.id);
-
-		if (!draft.isActuallyScheduled && data.isActuallyScheduled) {
-			const currentScheduledCount = await this.noteDraftsRepository.countBy({
-				userId: me.id,
-				isActuallyScheduled: true,
-			});
-			if (currentScheduledCount >= policies.scheduledNoteLimit) {
-				throw new IdentifiableError('bacdf856-5c51-4159-b88a-804fa5103be5', 'Too many scheduled notes');
+		if (data.poll) {
+			if (typeof data.poll.expiresAt === 'number') {
+				if (data.poll.expiresAt < Date.now()) {
+					throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
+				}
+			} else if (typeof data.poll.expiredAfter === 'number') {
+				data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
 			}
 		}
-		//#endregion
 
-		await this.validate(me, data);
+		const appliedDraft = await this.checkAndSetDraftNoteOptions(me, draft, data);
 
-		const updatedDraft = await this.noteDraftsRepository.createQueryBuilder().update()
-			.set(data)
-			.where('id = :id', { id: draftId })
-			.returning('*')
-			.execute()
-			.then((response) => response.raw[0]);
-
-		this.clearSchedule(draftId).then(() => {
-			if (updatedDraft.scheduledAt != null && updatedDraft.isActuallyScheduled) {
-				this.schedule(updatedDraft);
-			}
-		});
-
-		return updatedDraft;
+		return await this.noteDraftsRepository.save(appliedDraft);
 	}
 
 	@bindThis
@@ -149,8 +138,6 @@ export class NoteDraftService {
 		}
 
 		await this.noteDraftsRepository.delete(draft.id);
-
-		this.clearSchedule(draftId);
 	}
 
 	@bindThis
@@ -167,20 +154,27 @@ export class NoteDraftService {
 		return draft;
 	}
 
+	// 関連エンティティを取得し紐づける部分を共通化する
 	@bindThis
-	public async validate(
+	public async checkAndSetDraftNoteOptions(
 		me: MiLocalUser,
-		data: Partial<NoteDraftOptions>,
-	): Promise<void> {
-		if (data.pollExpiresAt != null) {
-			if (data.pollExpiresAt.getTime() < Date.now()) {
-				throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
-			}
+		draft: MiNoteDraft,
+		data: NoteDraftOptions,
+	): Promise<MiNoteDraft> {
+		data.visibility ??= 'public';
+		data.localOnly ??= false;
+		if (data.reactionAcceptance === undefined) data.reactionAcceptance = null;
+		if (data.channelId != null) {
+			data.visibility = 'public';
+			data.visibleUserIds = [];
+			data.localOnly = true;
 		}
 
+		let appliedDraft = draft;
+
 		//#region visibleUsers
 		let visibleUsers: MiUser[] = [];
-		if (data.visibleUserIds != null && data.visibleUserIds.length > 0) {
+		if (data.visibleUserIds != null) {
 			visibleUsers = await this.usersRepository.findBy({
 				id: In(data.visibleUserIds),
 			});
@@ -190,7 +184,7 @@ export class NoteDraftService {
 		//#region files
 		let files: MiDriveFile[] = [];
 		const fileIds = data.fileIds ?? null;
-		if (fileIds != null && fileIds.length > 0) {
+		if (fileIds != null) {
 			files = await this.driveFilesRepository.createQueryBuilder('file')
 				.where('file.userId = :userId AND file.id IN (:...fileIds)', {
 					userId: me.id,
@@ -294,37 +288,27 @@ export class NoteDraftService {
 			}
 		}
 		//#endregion
-	}
 
-	@bindThis
-	public async schedule(draft: MiNoteDraft): Promise<void> {
-		if (!draft.isActuallyScheduled) return;
-		if (draft.scheduledAt == null) return;
-		if (draft.scheduledAt.getTime() <= Date.now()) return;
+		appliedDraft = {
+			...appliedDraft,
+			visibility: data.visibility,
+			cw: data.cw ?? null,
+			fileIds: fileIds ?? [],
+			replyId: data.replyId ?? null,
+			renoteId: data.renoteId ?? null,
+			channelId: data.channelId ?? null,
+			text: data.text ?? null,
+			hashtag: data.hashtag ?? null,
+			hasPoll: data.poll != null,
+			pollChoices: data.poll ? data.poll.choices : [],
+			pollMultiple: data.poll ? data.poll.multiple : false,
+			pollExpiresAt: data.poll ? data.poll.expiresAt : null,
+			pollExpiredAfter: data.poll ? data.poll.expiredAfter ?? null : null,
+			visibleUserIds: data.visibleUserIds ?? [],
+			localOnly: data.localOnly,
+			reactionAcceptance: data.reactionAcceptance,
+		} satisfies MiNoteDraft;
 
-		const delay = draft.scheduledAt.getTime() - Date.now();
-		this.queueService.postScheduledNoteQueue.add(draft.id, {
-			noteDraftId: draft.id,
-		}, {
-			delay,
-			removeOnComplete: {
-				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 async clearSchedule(draftId: MiNoteDraft['id']): Promise<void> {
-		const jobs = await this.queueService.postScheduledNoteQueue.getJobs(['delayed', 'waiting', 'active']);
-		for (const job of jobs) {
-			if (job.data.noteDraftId === draftId) {
-				await job.remove();
-			}
-		}
+		return appliedDraft;
 	}
 }

packages/backend/src/core/QueueModule.ts

@@ -16,13 +16,11 @@ import {
 	RelationshipJobData,
 	UserWebhookDeliverJobData,
 	SystemWebhookDeliverJobData,
-	PostScheduledNoteJobData,
 } from '../queue/types.js';
 import type { Provider } from '@nestjs/common';
 
 export type SystemQueue = Bull.Queue<Record<string, unknown>>;
 export type EndedPollNotificationQueue = Bull.Queue<EndedPollNotificationJobData>;
-export type PostScheduledNoteQueue = Bull.Queue<PostScheduledNoteJobData>;
 export type DeliverQueue = Bull.Queue<DeliverJobData>;
 export type InboxQueue = Bull.Queue<InboxJobData>;
 export type DbQueue = Bull.Queue;
@@ -43,12 +41,6 @@ const $endedPollNotification: Provider = {
 	inject: [DI.config],
 };
 
-const $postScheduledNote: Provider = {
-	provide: 'queue:postScheduledNote',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.POST_SCHEDULED_NOTE, baseQueueOptions(config, QUEUE.POST_SCHEDULED_NOTE)),
-	inject: [DI.config],
-};
-
 const $deliver: Provider = {
 	provide: 'queue:deliver',
 	useFactory: (config: Config) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER)),
@@ -97,7 +89,6 @@ const $systemWebhookDeliver: Provider = {
 	providers: [
 		$system,
 		$endedPollNotification,
-		$postScheduledNote,
 		$deliver,
 		$inbox,
 		$db,
@@ -109,7 +100,6 @@ const $systemWebhookDeliver: Provider = {
 	exports: [
 		$system,
 		$endedPollNotification,
-		$postScheduledNote,
 		$deliver,
 		$inbox,
 		$db,
@@ -123,7 +113,6 @@ export class QueueModule implements OnApplicationShutdown {
 	constructor(
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:postScheduledNote') public postScheduledNoteQueue: PostScheduledNoteQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,
@@ -140,7 +129,6 @@ export class QueueModule implements OnApplicationShutdown {
 		await Promise.all([
 			this.systemQueue.close(),
 			this.endedPollNotificationQueue.close(),
-			this.postScheduledNoteQueue.close(),
 			this.deliverQueue.close(),
 			this.inboxQueue.close(),
 			this.dbQueue.close(),

packages/backend/src/core/QueueService.ts

@@ -31,7 +31,6 @@ import type {
 	DbQueue,
 	DeliverQueue,
 	EndedPollNotificationQueue,
-	PostScheduledNoteQueue,
 	InboxQueue,
 	ObjectStorageQueue,
 	RelationshipQueue,
@@ -45,7 +44,6 @@ import type * as Bull from 'bullmq';
 export const QUEUE_TYPES = [
 	'system',
 	'endedPollNotification',
-	'postScheduledNote',
 	'deliver',
 	'inbox',
 	'db',
@@ -94,7 +92,6 @@ export class QueueService {
 
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:postScheduledNote') public postScheduledNoteQueue: PostScheduledNoteQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,
@@ -720,7 +717,6 @@ export class QueueService {
 		switch (type) {
 			case 'system': return this.systemQueue;
 			case 'endedPollNotification': return this.endedPollNotificationQueue;
-			case 'postScheduledNote': return this.postScheduledNoteQueue;
 			case 'deliver': return this.deliverQueue;
 			case 'inbox': return this.inboxQueue;
 			case 'db': return this.dbQueue;

packages/backend/src/core/RoleService.ts

@@ -69,7 +69,6 @@ export type RolePolicies = {
 	chatAvailability: 'available' | 'readonly' | 'unavailable';
 	uploadableFileTypes: string[];
 	noteDraftLimit: number;
-	scheduledNoteLimit: number;
 	watermarkAvailable: boolean;
 };
 
@@ -102,22 +101,20 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	userEachUserListsLimit: 50,
 	rateLimitFactor: 1,
 	avatarDecorationLimit: 1,
-	canImportAntennas: false,
-	canImportBlocking: false,
-	canImportFollowing: false,
-	canImportMuting: false,
-	canImportUserLists: false,
+	canImportAntennas: true,
+	canImportBlocking: true,
+	canImportFollowing: true,
+	canImportMuting: true,
+	canImportUserLists: true,
 	chatAvailability: 'available',
 	uploadableFileTypes: [
 		'text/plain',
-		'text/csv',
 		'application/json',
 		'image/*',
 		'video/*',
 		'audio/*',
 	],
 	noteDraftLimit: 10,
-	scheduledNoteLimit: 1,
 	watermarkAvailable: true,
 };
 
@@ -442,7 +439,6 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 				return [...set];
 			}),
 			noteDraftLimit: calc('noteDraftLimit', vs => Math.max(...vs)),
-			scheduledNoteLimit: calc('scheduledNoteLimit', vs => Math.max(...vs)),
 			watermarkAvailable: calc('watermarkAvailable', vs => vs.some(v => v === true)),
 		};
 	}

packages/backend/src/core/entities/MetaEntityService.ts

@@ -117,7 +117,6 @@ export class MetaEntityService {
 				ratio: ad.ratio,
 				imageUrl: ad.imageUrl,
 				dayOfWeek: ad.dayOfWeek,
-				isSensitive: ad.isSensitive ? true : undefined,
 			})),
 			notesPerOneAd: instance.notesPerOneAd,
 			enableEmail: instance.enableEmail,

packages/backend/src/core/entities/NoteDraftEntityService.ts

@@ -105,8 +105,6 @@ export class NoteDraftEntityService implements OnModuleInit {
 		const packed: Packed<'NoteDraft'> = await awaitAll({
 			id: noteDraft.id,
 			createdAt: this.idService.parse(noteDraft.id).date.toISOString(),
-			scheduledAt: noteDraft.scheduledAt?.getTime() ?? null,
-			isActuallyScheduled: noteDraft.isActuallyScheduled,
 			userId: noteDraft.userId,
 			user: packedUsers?.get(noteDraft.userId) ?? this.userEntityService.pack(noteDraft.user ?? noteDraft.userId, me),
 			text: text,
@@ -114,13 +112,13 @@ export class NoteDraftEntityService implements OnModuleInit {
 			visibility: noteDraft.visibility,
 			localOnly: noteDraft.localOnly,
 			reactionAcceptance: noteDraft.reactionAcceptance,
-			visibleUserIds: noteDraft.visibleUserIds,
-			hashtag: noteDraft.hashtag,
+			visibleUserIds: noteDraft.visibility === 'specified' ? noteDraft.visibleUserIds : undefined,
+			hashtag: noteDraft.hashtag ?? undefined,
 			fileIds: noteDraft.fileIds,
 			files: packedFiles != null ? this.packAttachedFiles(noteDraft.fileIds, packedFiles) : this.driveFileEntityService.packManyByIds(noteDraft.fileIds),
 			replyId: noteDraft.replyId,
 			renoteId: noteDraft.renoteId,
-			channelId: noteDraft.channelId,
+			channelId: noteDraft.channelId ?? undefined,
 			channel: channel ? {
 				id: channel.id,
 				name: channel.name,
@@ -129,12 +127,6 @@ export class NoteDraftEntityService implements OnModuleInit {
 				allowRenoteToExternal: channel.allowRenoteToExternal,
 				userId: channel.userId,
 			} : undefined,
-			poll: noteDraft.hasPoll ? {
-				choices: noteDraft.pollChoices,
-				multiple: noteDraft.pollMultiple,
-				expiresAt: noteDraft.pollExpiresAt?.toISOString(),
-				expiredAfter: noteDraft.pollExpiredAfter,
-			} : null,
 
 			...(opts.detail ? {
 				reply: noteDraft.replyId ? nullIfEntityNotFound(this.noteEntityService.pack(noteDraft.replyId, me, {
@@ -146,6 +138,13 @@ export class NoteDraftEntityService implements OnModuleInit {
 					detail: true,
 					skipHide: opts.skipHide,
 				})) : undefined,
+
+				poll: noteDraft.hasPoll ? {
+					choices: noteDraft.pollChoices,
+					multiple: noteDraft.pollMultiple,
+					expiresAt: noteDraft.pollExpiresAt?.toISOString(),
+					expiredAfter: noteDraft.pollExpiredAfter,
+				} : undefined,
 			} : {} ),
 		});
 

packages/backend/src/core/entities/NotificationEntityService.ts

@@ -21,18 +21,7 @@ import type { OnModuleInit } from '@nestjs/common';
 import type { UserEntityService } from './UserEntityService.js';
 import type { NoteEntityService } from './NoteEntityService.js';
 
-const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set([
-	'note',
-	'mention',
-	'reply',
-	'renote',
-	'renote:grouped',
-	'quote',
-	'reaction',
-	'reaction:grouped',
-	'pollEnded',
-	'scheduledNotePosted',
-] as (typeof groupedNotificationTypes[number])[]);
+const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set(['note', 'mention', 'reply', 'renote', 'renote:grouped', 'quote', 'reaction', 'reaction:grouped', 'pollEnded'] as (typeof groupedNotificationTypes[number])[]);
 
 @Injectable()
 export class NotificationEntityService implements OnModuleInit {

packages/backend/src/models/Ad.ts

@@ -54,17 +54,10 @@ export class MiAd {
 		length: 8192, nullable: false,
 	})
 	public memo: string;
-
 	@Column('integer', {
 		default: 0, nullable: false,
 	})
 	public dayOfWeek: number;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public isSensitive: boolean;
-
 	constructor(data: Partial<MiAd>) {
 		if (data == null) return;
 

packages/backend/src/models/NoteDraft.ts

@@ -126,7 +126,7 @@ export class MiNoteDraft {
 	@JoinColumn()
 	public channel: MiChannel | null;
 
-	//#region 以下、Pollについて追加
+	// 以下、Pollについて追加
 
 	@Column('boolean', {
 		default: false,
@@ -151,15 +151,13 @@ export class MiNoteDraft {
 	})
 	public pollExpiredAfter: number | null;
 
-	//#endregion
+	// ここまで追加
 
-	@Column('timestamp with time zone', {
-		nullable: true,
-	})
-	public scheduledAt: Date | null;
+	constructor(data: Partial<MiNoteDraft>) {
+		if (data == null) return;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public isActuallyScheduled: boolean;
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
 }

packages/backend/src/models/Notification.ts

@@ -9,7 +9,6 @@ import { MiNote } from './Note.js';
 import { MiAccessToken } from './AccessToken.js';
 import { MiRole } from './Role.js';
 import { MiDriveFile } from './DriveFile.js';
-import { MiNoteDraft } from './NoteDraft.js';
 
 // misskey-js の notificationTypes と同期すべし
 export type MiNotification = {
@@ -61,16 +60,6 @@ export type MiNotification = {
 	createdAt: string;
 	notifierId: MiUser['id'];
 	noteId: MiNote['id'];
-} | {
-	type: 'scheduledNotePosted';
-	id: string;
-	createdAt: string;
-	noteId: MiNote['id'];
-} | {
-	type: 'scheduledNotePostFailed';
-	id: string;
-	createdAt: string;
-	noteDraftId: MiNoteDraft['id'];
 } | {
 	type: 'receiveFollowRequest';
 	id: string;

packages/backend/src/models/json-schema/ad.ts

@@ -60,10 +60,5 @@ export const packedAdSchema = {
 			optional: false,
 			nullable: false,
 		},
-		isSensitive: {
-			type: 'boolean',
-			optional: false,
-			nullable: false,
-		},
 	},
 } as const;

packages/backend/src/models/json-schema/meta.ts

@@ -195,10 +195,6 @@ export const packedMetaLiteSchema = {
 						type: 'integer',
 						optional: false, nullable: false,
 					},
-					isSensitive: {
-						type: 'boolean',
-						optional: true, nullable: false,
-					},
 				},
 			},
 		},

packages/backend/src/models/json-schema/note-draft.ts

@@ -23,7 +23,7 @@ export const packedNoteDraftSchema = {
 		},
 		cw: {
 			type: 'string',
-			optional: false, nullable: true,
+			optional: true, nullable: true,
 		},
 		userId: {
 			type: 'string',
@@ -37,23 +37,27 @@ export const packedNoteDraftSchema = {
 		},
 		replyId: {
 			type: 'string',
-			optional: false, nullable: true,
+			optional: true, nullable: true,
 			format: 'id',
+			example: 'xxxxxxxxxx',
 		},
 		renoteId: {
 			type: 'string',
-			optional: false, nullable: true,
+			optional: true, nullable: true,
 			format: 'id',
+			example: 'xxxxxxxxxx',
 		},
 		reply: {
 			type: 'object',
 			optional: true, nullable: true,
 			ref: 'Note',
+			description: 'The reply target note contents if exists. If the reply target has been deleted since the draft was created, this will be null while replyId is not null.',
 		},
 		renote: {
 			type: 'object',
 			optional: true, nullable: true,
 			ref: 'Note',
+			description: 'The renote target note contents if exists. If the renote target has been deleted since the draft was created, this will be null while renoteId is not null.',
 		},
 		visibility: {
 			type: 'string',
@@ -62,7 +66,7 @@ export const packedNoteDraftSchema = {
 		},
 		visibleUserIds: {
 			type: 'array',
-			optional: false, nullable: false,
+			optional: true, nullable: false,
 			items: {
 				type: 'string',
 				optional: false, nullable: false,
@@ -71,7 +75,7 @@ export const packedNoteDraftSchema = {
 		},
 		fileIds: {
 			type: 'array',
-			optional: false, nullable: false,
+			optional: true, nullable: false,
 			items: {
 				type: 'string',
 				optional: false, nullable: false,
@@ -89,11 +93,11 @@ export const packedNoteDraftSchema = {
 		},
 		hashtag: {
 			type: 'string',
-			optional: false, nullable: true,
+			optional: true, nullable: false,
 		},
 		poll: {
 			type: 'object',
-			optional: false, nullable: true,
+			optional: true, nullable: true,
 			properties: {
 				expiresAt: {
 					type: 'string',
@@ -120,8 +124,9 @@ export const packedNoteDraftSchema = {
 		},
 		channelId: {
 			type: 'string',
-			optional: false, nullable: true,
+			optional: true, nullable: true,
 			format: 'id',
+			example: 'xxxxxxxxxx',
 		},
 		channel: {
 			type: 'object',
@@ -155,20 +160,12 @@ export const packedNoteDraftSchema = {
 		},
 		localOnly: {
 			type: 'boolean',
-			optional: false, nullable: false,
+			optional: true, nullable: false,
 		},
 		reactionAcceptance: {
 			type: 'string',
 			optional: false, nullable: true,
 			enum: ['likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote', null],
 		},
-		scheduledAt: {
-			type: 'number',
-			optional: false, nullable: true,
-		},
-		isActuallyScheduled: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
 	},
 } as const;

packages/backend/src/models/json-schema/notification.ts

@@ -207,36 +207,6 @@ export const packedNotificationSchema = {
 				optional: false, nullable: false,
 			},
 		},
-	}, {
-		type: 'object',
-		properties: {
-			...baseSchema.properties,
-			type: {
-				type: 'string',
-				optional: false, nullable: false,
-				enum: ['scheduledNotePosted'],
-			},
-			note: {
-				type: 'object',
-				ref: 'Note',
-				optional: false, nullable: false,
-			},
-		},
-	}, {
-		type: 'object',
-		properties: {
-			...baseSchema.properties,
-			type: {
-				type: 'string',
-				optional: false, nullable: false,
-				enum: ['scheduledNotePostFailed'],
-			},
-			noteDraft: {
-				type: 'object',
-				ref: 'NoteDraft',
-				optional: false, nullable: false,
-			},
-		},
 	}, {
 		type: 'object',
 		properties: {

packages/backend/src/models/json-schema/role.ts

@@ -317,10 +317,6 @@ export const packedRolePoliciesSchema = {
 			type: 'integer',
 			optional: false, nullable: false,
 		},
-		scheduledNoteLimit: {
-			type: 'integer',
-			optional: false, nullable: false,
-		},
 		watermarkAvailable: {
 			type: 'boolean',
 			optional: false, nullable: false,

packages/backend/src/models/json-schema/user.ts

@@ -609,8 +609,6 @@ export const packedMeDetailedOnlySchema = {
 				quote: { optional: true, ...notificationRecieveConfig },
 				reaction: { optional: true, ...notificationRecieveConfig },
 				pollEnded: { optional: true, ...notificationRecieveConfig },
-				scheduledNotePosted: { optional: true, ...notificationRecieveConfig },
-				scheduledNotePostFailed: { optional: true, ...notificationRecieveConfig },
 				receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
 				followRequestAccepted: { optional: true, ...notificationRecieveConfig },
 				roleAssigned: { optional: true, ...notificationRecieveConfig },

packages/backend/src/queue/QueueProcessorModule.ts

@@ -10,7 +10,6 @@ import { QueueLoggerService } from './QueueLoggerService.js';
 import { QueueProcessorService } from './QueueProcessorService.js';
 import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
 import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
-import { PostScheduledNoteProcessorService } from './processors/PostScheduledNoteProcessorService.js';
 import { InboxProcessorService } from './processors/InboxProcessorService.js';
 import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
 import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
@@ -80,7 +79,6 @@ import { RelationshipProcessorService } from './processors/RelationshipProcessor
 		UserWebhookDeliverProcessorService,
 		SystemWebhookDeliverProcessorService,
 		EndedPollNotificationProcessorService,
-		PostScheduledNoteProcessorService,
 		DeliverProcessorService,
 		InboxProcessorService,
 		AggregateRetentionProcessorService,

packages/backend/src/queue/QueueProcessorService.ts

@@ -14,7 +14,6 @@ import { CheckModeratorsActivityProcessorService } from '@/queue/processors/Chec
 import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
 import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
 import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
-import { PostScheduledNoteProcessorService } from './processors/PostScheduledNoteProcessorService.js';
 import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
 import { InboxProcessorService } from './processors/InboxProcessorService.js';
 import { DeleteDriveFilesProcessorService } from './processors/DeleteDriveFilesProcessorService.js';
@@ -86,7 +85,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 	private relationshipQueueWorker: Bull.Worker;
 	private objectStorageQueueWorker: Bull.Worker;
 	private endedPollNotificationQueueWorker: Bull.Worker;
-	private postScheduledNoteQueueWorker: Bull.Worker;
 
 	constructor(
 		@Inject(DI.config)
@@ -96,7 +94,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		private userWebhookDeliverProcessorService: UserWebhookDeliverProcessorService,
 		private systemWebhookDeliverProcessorService: SystemWebhookDeliverProcessorService,
 		private endedPollNotificationProcessorService: EndedPollNotificationProcessorService,
-		private postScheduledNoteProcessorService: PostScheduledNoteProcessorService,
 		private deliverProcessorService: DeliverProcessorService,
 		private inboxProcessorService: InboxProcessorService,
 		private deleteDriveFilesProcessorService: DeleteDriveFilesProcessorService,
@@ -523,21 +520,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			});
 		}
 		//#endregion
-
-		//#region post scheduled note
-		{
-			this.postScheduledNoteQueueWorker = new Bull.Worker(QUEUE.POST_SCHEDULED_NOTE, async (job) => {
-				if (this.config.sentryForBackend) {
-					return Sentry.startSpan({ name: 'Queue: PostScheduledNote' }, () => this.postScheduledNoteProcessorService.process(job));
-				} else {
-					return this.postScheduledNoteProcessorService.process(job);
-				}
-			}, {
-				...baseWorkerOptions(this.config, QUEUE.POST_SCHEDULED_NOTE),
-				autorun: false,
-			});
-		}
-		//#endregion
 	}
 
 	@bindThis
@@ -552,7 +534,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			this.relationshipQueueWorker.run(),
 			this.objectStorageQueueWorker.run(),
 			this.endedPollNotificationQueueWorker.run(),
-			this.postScheduledNoteQueueWorker.run(),
 		]);
 	}
 
@@ -568,7 +549,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			this.relationshipQueueWorker.close(),
 			this.objectStorageQueueWorker.close(),
 			this.endedPollNotificationQueueWorker.close(),
-			this.postScheduledNoteQueueWorker.close(),
 		]);
 	}
 

packages/backend/src/queue/const.ts

@@ -12,7 +12,6 @@ export const QUEUE = {
 	INBOX: 'inbox',
 	SYSTEM: 'system',
 	ENDED_POLL_NOTIFICATION: 'endedPollNotification',
-	POST_SCHEDULED_NOTE: 'postScheduledNote',
 	DB: 'db',
 	RELATIONSHIP: 'relationship',
 	OBJECT_STORAGE: 'objectStorage',

packages/backend/src/queue/processors/PostScheduledNoteProcessorService.ts

@@ -1,72 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DI } from '@/di-symbols.js';
-import type { NoteDraftsRepository } from '@/models/_.js';
-import type Logger from '@/logger.js';
-import { NotificationService } from '@/core/NotificationService.js';
-import { bindThis } from '@/decorators.js';
-import { NoteCreateService } from '@/core/NoteCreateService.js';
-import { QueueLoggerService } from '../QueueLoggerService.js';
-import type * as Bull from 'bullmq';
-import type { PostScheduledNoteJobData } from '../types.js';
-
-@Injectable()
-export class PostScheduledNoteProcessorService {
-	private logger: Logger;
-
-	constructor(
-		@Inject(DI.noteDraftsRepository)
-		private noteDraftsRepository: NoteDraftsRepository,
-
-		private noteCreateService: NoteCreateService,
-		private notificationService: NotificationService,
-		private queueLoggerService: QueueLoggerService,
-	) {
-		this.logger = this.queueLoggerService.logger.createSubLogger('post-scheduled-note');
-	}
-
-	@bindThis
-	public async process(job: Bull.Job<PostScheduledNoteJobData>): Promise<void> {
-		const draft = await this.noteDraftsRepository.findOne({ where: { id: job.data.noteDraftId }, relations: ['user'] });
-		if (draft == null || draft.user == null || draft.scheduledAt == null || !draft.isActuallyScheduled) {
-			return;
-		}
-
-		try {
-			const note = await this.noteCreateService.fetchAndCreate(draft.user, {
-				createdAt: new Date(),
-				fileIds: draft.fileIds,
-				poll: draft.hasPoll ? {
-					choices: draft.pollChoices,
-					multiple: draft.pollMultiple,
-					expiresAt: draft.pollExpiredAfter ? new Date(Date.now() + draft.pollExpiredAfter) : draft.pollExpiresAt ? new Date(draft.pollExpiresAt) : null,
-				} : null,
-				text: draft.text ?? null,
-				replyId: draft.replyId,
-				renoteId: draft.renoteId,
-				cw: draft.cw,
-				localOnly: draft.localOnly,
-				reactionAcceptance: draft.reactionAcceptance,
-				visibility: draft.visibility,
-				visibleUserIds: draft.visibleUserIds,
-				channelId: draft.channelId,
-			});
-
-			// await不要
-			this.noteDraftsRepository.remove(draft);
-
-			// await不要
-			this.notificationService.createNotification(draft.userId, 'scheduledNotePosted', {
-				noteId: note.id,
-			});
-		} catch (err) {
-			this.notificationService.createNotification(draft.userId, 'scheduledNotePostFailed', {
-				noteDraftId: draft.id,
-			});
-		}
-	}
-}

packages/backend/src/queue/types.ts

@@ -109,10 +109,6 @@ export type EndedPollNotificationJobData = {
 	noteId: MiNote['id'];
 };
 
-export type PostScheduledNoteJobData = {
-	noteDraftId: string;
-};
-
 export type SystemWebhookDeliverJobData<T extends SystemWebhookEventType = SystemWebhookEventType> = {
 	type: T;
 	content: SystemWebhookPayload<T>;

packages/backend/src/server/ServerService.ts

@@ -75,7 +75,7 @@ export class ServerService implements OnApplicationShutdown {
 	@bindThis
 	public async launch(): Promise<void> {
 		const fastify = Fastify({
-			trustProxy: this.config.trustProxy ?? true,
+			trustProxy: true,
 			logger: false,
 		});
 		this.#fastify = fastify;

packages/backend/src/server/api/endpoints/admin/ad/create.ts

@@ -36,7 +36,6 @@ export const paramDef = {
 		startsAt: { type: 'integer' },
 		imageUrl: { type: 'string', minLength: 1 },
 		dayOfWeek: { type: 'integer' },
-		isSensitive: { type: 'boolean' },
 	},
 	required: ['url', 'memo', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt', 'imageUrl', 'dayOfWeek'],
 } as const;
@@ -56,7 +55,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				expiresAt: new Date(ps.expiresAt),
 				startsAt: new Date(ps.startsAt),
 				dayOfWeek: ps.dayOfWeek,
-				isSensitive: ps.isSensitive,
 				url: ps.url,
 				imageUrl: ps.imageUrl,
 				priority: ps.priority,
@@ -75,7 +73,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				expiresAt: ad.expiresAt.toISOString(),
 				startsAt: ad.startsAt.toISOString(),
 				dayOfWeek: ad.dayOfWeek,
-				isSensitive: ad.isSensitive,
 				url: ad.url,
 				imageUrl: ad.imageUrl,
 				priority: ad.priority,

packages/backend/src/server/api/endpoints/admin/ad/list.ts

@@ -63,7 +63,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				expiresAt: ad.expiresAt.toISOString(),
 				startsAt: ad.startsAt.toISOString(),
 				dayOfWeek: ad.dayOfWeek,
-				isSensitive: ad.isSensitive,
 				url: ad.url,
 				imageUrl: ad.imageUrl,
 				memo: ad.memo,

packages/backend/src/server/api/endpoints/admin/ad/update.ts

@@ -39,7 +39,6 @@ export const paramDef = {
 		expiresAt: { type: 'integer' },
 		startsAt: { type: 'integer' },
 		dayOfWeek: { type: 'integer' },
-		isSensitive: { type: 'boolean' },
 	},
 	required: ['id'],
 } as const;
@@ -67,7 +66,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				expiresAt: ps.expiresAt ? new Date(ps.expiresAt) : undefined,
 				startsAt: ps.startsAt ? new Date(ps.startsAt) : undefined,
 				dayOfWeek: ps.dayOfWeek,
-				isSensitive: ps.isSensitive,
 			});
 
 			const updatedAd = await this.adsRepository.findOneByOrFail({ id: ad.id });

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

@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, PostScheduledNoteQueue, InboxQueue, ObjectStorageQueue, SystemQueue, UserWebhookDeliverQueue, SystemWebhookDeliverQueue } from '@/core/QueueModule.js';
+import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, ObjectStorageQueue, SystemQueue, UserWebhookDeliverQueue, SystemWebhookDeliverQueue } from '@/core/QueueModule.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -49,7 +49,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	constructor(
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:postScheduledNote') public postScheduledNoteQueue: PostScheduledNoteQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,

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

@@ -103,8 +103,6 @@ export const meta = {
 					quote: { optional: true, ...notificationRecieveConfig },
 					reaction: { optional: true, ...notificationRecieveConfig },
 					pollEnded: { optional: true, ...notificationRecieveConfig },
-					scheduledNotePosted: { optional: true, ...notificationRecieveConfig },
-					scheduledNotePostFailed: { optional: true, ...notificationRecieveConfig },
 					receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
 					followRequestAccepted: { optional: true, ...notificationRecieveConfig },
 					roleAssigned: { optional: true, ...notificationRecieveConfig },

packages/backend/src/server/api/endpoints/ap/show.ts

@@ -18,9 +18,9 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
+import { ApiError } from '../../error.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { FetchAllowSoftFailMask } from '@/core/activitypub/misc/check-against-url.js';
-import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['federation'],

packages/backend/src/server/api/endpoints/i/update.ts

@@ -209,8 +209,6 @@ export const paramDef = {
 				quote: notificationRecieveConfig,
 				reaction: notificationRecieveConfig,
 				pollEnded: notificationRecieveConfig,
-				scheduledNotePosted: notificationRecieveConfig,
-				scheduledNotePostFailed: notificationRecieveConfig,
 				receiveFollowRequest: notificationRecieveConfig,
 				followRequestAccepted: notificationRecieveConfig,
 				roleAssigned: notificationRecieveConfig,

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -6,10 +6,17 @@
 import ms from 'ms';
 import { In } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
+import type { MiUser } from '@/models/User.js';
+import type { UsersRepository, NotesRepository, BlockingsRepository, DriveFilesRepository, ChannelsRepository } from '@/models/_.js';
+import type { MiDriveFile } from '@/models/DriveFile.js';
+import type { MiNote } from '@/models/Note.js';
+import type { MiChannel } from '@/models/Channel.js';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
+import { DI } from '@/di-symbols.js';
+import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { ApiError } from '../../error.js';
 
@@ -216,28 +223,168 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		@Inject(DI.notesRepository)
+		private notesRepository: NotesRepository,
+
+		@Inject(DI.blockingsRepository)
+		private blockingsRepository: BlockingsRepository,
+
+		@Inject(DI.driveFilesRepository)
+		private driveFilesRepository: DriveFilesRepository,
+
+		@Inject(DI.channelsRepository)
+		private channelsRepository: ChannelsRepository,
+
 		private noteEntityService: NoteEntityService,
 		private noteCreateService: NoteCreateService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
+			let visibleUsers: MiUser[] = [];
+			if (ps.visibleUserIds) {
+				visibleUsers = await this.usersRepository.findBy({
+					id: In(ps.visibleUserIds),
+				});
+			}
+
+			let files: MiDriveFile[] = [];
+			const fileIds = ps.fileIds ?? ps.mediaIds ?? null;
+			if (fileIds != null) {
+				files = await this.driveFilesRepository.createQueryBuilder('file')
+					.where('file.userId = :userId AND file.id IN (:...fileIds)', {
+						userId: me.id,
+						fileIds,
+					})
+					.orderBy('array_position(ARRAY[:...fileIds], "id"::text)')
+					.setParameters({ fileIds })
+					.getMany();
+
+				if (files.length !== fileIds.length) {
+					throw new ApiError(meta.errors.noSuchFile);
+				}
+			}
+
+			let renote: MiNote | null = null;
+			if (ps.renoteId != null) {
+				// Fetch renote to note
+				renote = await this.notesRepository.findOne({
+					where: { id: ps.renoteId },
+					relations: ['user', 'renote', 'reply'],
+				});
+
+				if (renote == null) {
+					throw new ApiError(meta.errors.noSuchRenoteTarget);
+				} else if (isRenote(renote) && !isQuote(renote)) {
+					throw new ApiError(meta.errors.cannotReRenote);
+				}
+
+				// Check blocking
+				if (renote.userId !== me.id) {
+					const blockExist = await this.blockingsRepository.exists({
+						where: {
+							blockerId: renote.userId,
+							blockeeId: me.id,
+						},
+					});
+					if (blockExist) {
+						throw new ApiError(meta.errors.youHaveBeenBlocked);
+					}
+				}
+
+				if (renote.visibility === 'followers' && renote.userId !== me.id) {
+					// 他人のfollowers noteはreject
+					throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
+				} else if (renote.visibility === 'specified') {
+					// specified / direct noteはreject
+					throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
+				}
+
+				if (renote.channelId && renote.channelId !== ps.channelId) {
+					// チャンネルのノートに対しリノート要求がきたとき、チャンネル外へのリノート可否をチェック
+					// リノートのユースケースのうち、チャンネル内→チャンネル外は少数だと考えられるため、JOINはせず必要な時に都度取得する
+					const renoteChannel = await this.channelsRepository.findOneBy({ id: renote.channelId });
+					if (renoteChannel == null) {
+						// リノートしたいノートが書き込まれているチャンネルが無い
+						throw new ApiError(meta.errors.noSuchChannel);
+					} else if (!renoteChannel.allowRenoteToExternal) {
+						// リノート作成のリクエストだが、対象チャンネルがリノート禁止だった場合
+						throw new ApiError(meta.errors.cannotRenoteOutsideOfChannel);
+					}
+				}
+			}
+
+			let reply: MiNote | null = null;
+			if (ps.replyId != null) {
+				// Fetch reply
+				reply = await this.notesRepository.findOne({
+					where: { id: ps.replyId },
+					relations: ['user'],
+				});
+
+				if (reply == null) {
+					throw new ApiError(meta.errors.noSuchReplyTarget);
+				} else if (isRenote(reply) && !isQuote(reply)) {
+					throw new ApiError(meta.errors.cannotReplyToPureRenote);
+				} else if (!await this.noteEntityService.isVisibleForMe(reply, me.id)) {
+					throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
+				} else if (reply.visibility === 'specified' && ps.visibility !== 'specified') {
+					throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
+				}
+
+				// Check blocking
+				if (reply.userId !== me.id) {
+					const blockExist = await this.blockingsRepository.exists({
+						where: {
+							blockerId: reply.userId,
+							blockeeId: me.id,
+						},
+					});
+					if (blockExist) {
+						throw new ApiError(meta.errors.youHaveBeenBlocked);
+					}
+				}
+			}
+
+			if (ps.poll) {
+				if (typeof ps.poll.expiresAt === 'number') {
+					if (ps.poll.expiresAt < Date.now()) {
+						throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
+					}
+				} else if (typeof ps.poll.expiredAfter === 'number') {
+					ps.poll.expiresAt = Date.now() + ps.poll.expiredAfter;
+				}
+			}
+
+			let channel: MiChannel | null = null;
+			if (ps.channelId != null) {
+				channel = await this.channelsRepository.findOneBy({ id: ps.channelId, isArchived: false });
+
+				if (channel == null) {
+					throw new ApiError(meta.errors.noSuchChannel);
+				}
+			}
+
+			// 投稿を作成
 			try {
-				const note = await this.noteCreateService.fetchAndCreate(me, {
+				const note = await this.noteCreateService.create(me, {
 					createdAt: new Date(),
-					fileIds: ps.fileIds ?? ps.mediaIds ?? [],
+					files: files,
 					poll: ps.poll ? {
 						choices: ps.poll.choices,
 						multiple: ps.poll.multiple ?? false,
-						expiresAt: ps.poll.expiredAfter ? new Date(Date.now() + ps.poll.expiredAfter) : ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
-					} : null,
-					text: ps.text ?? null,
-					replyId: ps.replyId ?? null,
-					renoteId: ps.renoteId ?? null,
-					cw: ps.cw ?? null,
+						expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
+					} : undefined,
+					text: ps.text ?? undefined,
+					reply,
+					renote,
+					cw: ps.cw,
 					localOnly: ps.localOnly,
 					reactionAcceptance: ps.reactionAcceptance,
 					visibility: ps.visibility,
-					visibleUserIds: ps.visibleUserIds ?? [],
-					channelId: ps.channelId ?? null,
+					visibleUsers,
+					channel,
 					apMentions: ps.noExtractMentions ? [] : undefined,
 					apHashtags: ps.noExtractHashtags ? [] : undefined,
 					apEmojis: ps.noExtractEmojis ? [] : undefined,
@@ -246,46 +393,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				return {
 					createdNote: await this.noteEntityService.pack(note, me),
 				};
-			} catch (err) {
+			} catch (e) {
 				// TODO: 他のErrorもここでキャッチしてエラーメッセージを当てるようにしたい
-				if (err instanceof IdentifiableError) {
-					if (err.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') {
+				if (e instanceof IdentifiableError) {
+					if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') {
 						throw new ApiError(meta.errors.containsProhibitedWords);
-					} else if (err.id === '9f466dab-c856-48cd-9e65-ff90ff750580') {
+					} else if (e.id === '9f466dab-c856-48cd-9e65-ff90ff750580') {
 						throw new ApiError(meta.errors.containsTooManyMentions);
-					} else if (err.id === '801c046c-5bf5-4234-ad2b-e78fc20a2ac7') {
-						throw new ApiError(meta.errors.noSuchFile);
-					} else if (err.id === '53983c56-e163-45a6-942f-4ddc485d4290') {
-						throw new ApiError(meta.errors.noSuchRenoteTarget);
-					} else if (err.id === 'bde24c37-121f-4e7d-980d-cec52f599f02') {
-						throw new ApiError(meta.errors.cannotReRenote);
-					} else if (err.id === '2b4fe776-4414-4a2d-ae39-f3418b8fd4d3') {
-						throw new ApiError(meta.errors.youHaveBeenBlocked);
-					} else if (err.id === '90b9d6f0-893a-4fef-b0f1-e9a33989f71a') {
-						throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
-					} else if (err.id === '48d7a997-da5c-4716-b3c3-92db3f37bf7d') {
-						throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
-					} else if (err.id === 'b060f9a6-8909-4080-9e0b-94d9fa6f6a77') {
-						throw new ApiError(meta.errors.noSuchChannel);
-					} else if (err.id === '7e435f4a-780d-4cfc-a15a-42519bd6fb67') {
-						throw new ApiError(meta.errors.cannotRenoteOutsideOfChannel);
-					} else if (err.id === '60142edb-1519-408e-926d-4f108d27bee0') {
-						throw new ApiError(meta.errors.noSuchReplyTarget);
-					} else if (err.id === 'f089e4e2-c0e7-4f60-8a23-e5a6bf786b36') {
-						throw new ApiError(meta.errors.cannotReplyToPureRenote);
-					} else if (err.id === '11cd37b3-a411-4f77-8633-c580ce6a8dce') {
-						throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
-					} else if (err.id === 'ced780a1-2012-4caf-bc7e-a95a291294cb') {
-						throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
-					} else if (err.id === 'b0df6025-f2e8-44b4-a26a-17ad99104612') {
-						throw new ApiError(meta.errors.youHaveBeenBlocked);
-					} else if (err.id === '0c11c11e-0c8d-48e7-822c-76ccef660068') {
-						throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
-					} else if (err.id === 'bfa3905b-25f5-4894-b430-da331a490e4b') {
-						throw new ApiError(meta.errors.noSuchChannel);
 					}
 				}
-				throw err;
+				throw e;
 			}
 		});
 	}

packages/backend/src/server/api/endpoints/notes/drafts/create.ts

@@ -124,12 +124,6 @@ export const meta = {
 			id: '9ee33bbe-fde3-4c71-9b51-e50492c6b9c8',
 		},
 
-		tooManyScheduledNotes: {
-			message: 'You cannot create scheduled notes any more.',
-			code: 'TOO_MANY_SCHEDULED_NOTES',
-			id: '22ae69eb-09e3-4541-a850-773cfa45e693',
-		},
-
 		cannotRenoteToExternal: {
 			message: 'Cannot Renote to External.',
 			code: 'CANNOT_RENOTE_TO_EXTERNAL',
@@ -168,7 +162,7 @@ export const paramDef = {
 		fileIds: {
 			type: 'array',
 			uniqueItems: true,
-			minItems: 0,
+			minItems: 1,
 			maxItems: 16,
 			items: { type: 'string', format: 'misskey:id' },
 		},
@@ -189,10 +183,8 @@ export const paramDef = {
 			},
 			required: ['choices'],
 		},
-		scheduledAt: { type: 'integer', nullable: true },
-		isActuallyScheduled: { type: 'boolean', default: false },
 	},
-	required: ['visibility', 'visibleUserIds', 'cw', 'hashtag', 'localOnly', 'reactionAcceptance', 'replyId', 'renoteId', 'channelId', 'text', 'fileIds', 'poll', 'scheduledAt', 'isActuallyScheduled'],
+	required: [],
 } as const;
 
 @Injectable()
@@ -204,23 +196,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const draft = await this.noteDraftService.create(me, {
 				fileIds: ps.fileIds,
-				pollChoices: ps.poll?.choices ?? [],
-				pollMultiple: ps.poll?.multiple ?? false,
-				pollExpiresAt: ps.poll?.expiresAt ? new Date(ps.poll.expiresAt) : null,
-				pollExpiredAfter: ps.poll?.expiredAfter ?? null,
-				hasPoll: ps.poll != null,
-				text: ps.text,
-				replyId: ps.replyId,
-				renoteId: ps.renoteId,
-				cw: ps.cw,
-				hashtag: ps.hashtag,
+				poll: ps.poll ? {
+					choices: ps.poll.choices,
+					multiple: ps.poll.multiple ?? false,
+					expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
+					expiredAfter: ps.poll.expiredAfter ?? null,
+				} : undefined,
+				text: ps.text ?? null,
+				replyId: ps.replyId ?? undefined,
+				renoteId: ps.renoteId ?? undefined,
+				cw: ps.cw ?? null,
+				...(ps.hashtag ? { hashtag: ps.hashtag } : {}),
 				localOnly: ps.localOnly,
 				reactionAcceptance: ps.reactionAcceptance,
 				visibility: ps.visibility,
-				visibleUserIds: ps.visibleUserIds,
-				channelId: ps.channelId,
-				scheduledAt: ps.scheduledAt ? new Date(ps.scheduledAt) : null,
-				isActuallyScheduled: ps.isActuallyScheduled,
+				visibleUserIds: ps.visibleUserIds ?? [],
+				channelId: ps.channelId ?? undefined,
 			}).catch((err) => {
 				if (err instanceof IdentifiableError) {
 					switch (err.id) {
@@ -250,8 +241,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 							throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
 						case '215dbc76-336c-4d2a-9605-95766ba7dab0':
 							throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
-						case 'c3275f19-4558-4c59-83e1-4f684b5fab66':
-							throw new ApiError(meta.errors.tooManyScheduledNotes);
 						default:
 							throw err;
 					}

packages/backend/src/server/api/endpoints/notes/drafts/list.ts

@@ -41,7 +41,6 @@ export const paramDef = {
 		untilId: { type: 'string', format: 'misskey:id' },
 		sinceDate: { type: 'integer' },
 		untilDate: { type: 'integer' },
-		scheduled: { type: 'boolean', nullable: true },
 	},
 	required: [],
 } as const;
@@ -59,12 +58,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const query = this.queryService.makePaginationQuery<MiNoteDraft>(this.noteDraftsRepository.createQueryBuilder('drafts'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 				.andWhere('drafts.userId = :meId', { meId: me.id });
 
-			if (ps.scheduled === true) {
-				query.andWhere('drafts.isActuallyScheduled = true');
-			} else if (ps.scheduled === false) {
-				query.andWhere('drafts.isActuallyScheduled = false');
-			}
-
 			const drafts = await query
 				.limit(ps.limit)
 				.getMany();

packages/backend/src/server/api/endpoints/notes/drafts/update.ts

@@ -159,12 +159,6 @@ export const meta = {
 			code: 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY',
 			id: '215dbc76-336c-4d2a-9605-95766ba7dab0',
 		},
-
-		tooManyScheduledNotes: {
-			message: 'You cannot create scheduled notes any more.',
-			code: 'TOO_MANY_SCHEDULED_NOTES',
-			id: '02f5df79-08ae-4a33-8524-f1503c8f6212',
-		},
 	},
 
 	limit: {
@@ -177,14 +171,14 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		draftId: { type: 'string', nullable: false, format: 'misskey:id' },
-		visibility: { type: 'string', enum: ['public', 'home', 'followers', 'specified'] },
+		visibility: { type: 'string', enum: ['public', 'home', 'followers', 'specified'], default: 'public' },
 		visibleUserIds: { type: 'array', uniqueItems: true, items: {
 			type: 'string', format: 'misskey:id',
 		} },
 		cw: { type: 'string', nullable: true, minLength: 1, maxLength: 100 },
 		hashtag: { type: 'string', nullable: true, maxLength: 200 },
-		localOnly: { type: 'boolean' },
-		reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'] },
+		localOnly: { type: 'boolean', default: false },
+		reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null },
 		replyId: { type: 'string', format: 'misskey:id', nullable: true },
 		renoteId: { type: 'string', format: 'misskey:id', nullable: true },
 		channelId: { type: 'string', format: 'misskey:id', nullable: true },
@@ -200,7 +194,7 @@ export const paramDef = {
 		fileIds: {
 			type: 'array',
 			uniqueItems: true,
-			minItems: 0,
+			minItems: 1,
 			maxItems: 16,
 			items: { type: 'string', format: 'misskey:id' },
 		},
@@ -221,8 +215,6 @@ export const paramDef = {
 			},
 			required: ['choices'],
 		},
-		scheduledAt: { type: 'integer', nullable: true },
-		isActuallyScheduled: { type: 'boolean' },
 	},
 	required: ['draftId'],
 } as const;
@@ -236,22 +228,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const draft = await this.noteDraftService.update(me, ps.draftId, {
 				fileIds: ps.fileIds,
-				pollChoices: ps.poll?.choices,
-				pollMultiple: ps.poll?.multiple,
-				pollExpiresAt: ps.poll?.expiresAt ? new Date(ps.poll.expiresAt) : null,
-				pollExpiredAfter: ps.poll?.expiredAfter,
-				text: ps.text,
-				replyId: ps.replyId,
-				renoteId: ps.renoteId,
-				cw: ps.cw,
-				hashtag: ps.hashtag,
+				poll: ps.poll ? {
+					choices: ps.poll.choices,
+					multiple: ps.poll.multiple ?? false,
+					expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
+					expiredAfter: ps.poll.expiredAfter ?? null,
+				} : undefined,
+				text: ps.text ?? null,
+				replyId: ps.replyId ?? undefined,
+				renoteId: ps.renoteId ?? undefined,
+				cw: ps.cw ?? null,
+				...(ps.hashtag ? { hashtag: ps.hashtag } : {}),
 				localOnly: ps.localOnly,
 				reactionAcceptance: ps.reactionAcceptance,
 				visibility: ps.visibility,
-				visibleUserIds: ps.visibleUserIds,
-				channelId: ps.channelId,
-				scheduledAt: ps.scheduledAt ? new Date(ps.scheduledAt) : null,
-				isActuallyScheduled: ps.isActuallyScheduled,
+				visibleUserIds: ps.visibleUserIds ?? [],
+				channelId: ps.channelId ?? undefined,
 			}).catch((err) => {
 				if (err instanceof IdentifiableError) {
 					switch (err.id) {
@@ -293,8 +285,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 							throw new ApiError(meta.errors.containsProhibitedWords);
 						case '4de0363a-3046-481b-9b0f-feff3e211025':
 							throw new ApiError(meta.errors.containsTooManyMentions);
-						case 'bacdf856-5c51-4159-b88a-804fa5103be5':
-							throw new ApiError(meta.errors.tooManyScheduledNotes);
 						default:
 							throw err;
 					}

packages/backend/src/server/api/endpoints/notes/show.ts

@@ -29,16 +29,10 @@ export const meta = {
 			id: '24fcbfc6-2e37-42b6-8388-c29b3861a08d',
 		},
 
-		contentRestrictedByUser: {
-			message: 'Content restricted by user. Please sign in to view.',
-			code: 'CONTENT_RESTRICTED_BY_USER',
-			id: 'fbcc002d-37d9-4944-a6b0-d9e29f2d33ab',
-		},
-
-		contentRestrictedByServer: {
-			message: 'Content restricted by server settings. Please sign in to view.',
-			code: 'CONTENT_RESTRICTED_BY_SERVER',
-			id: '145f88d2-b03d-4087-8143-a78928883c4b',
+		signinRequired: {
+			message: 'Signin required.',
+			code: 'SIGNIN_REQUIRED',
+			id: '8e75455b-738c-471d-9f80-62693f33372e',
 		},
 	},
 } as const;
@@ -67,15 +61,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			if (note.user!.requireSigninToViewContents && me == null) {
-				throw new ApiError(meta.errors.contentRestrictedByUser);
+				throw new ApiError(meta.errors.signinRequired);
 			}
 
 			if (this.serverSettings.ugcVisibilityForVisitor === 'none' && me == null) {
-				throw new ApiError(meta.errors.contentRestrictedByServer);
+				throw new ApiError(meta.errors.signinRequired);
 			}
 
 			if (this.serverSettings.ugcVisibilityForVisitor === 'local' && note.userHost != null && me == null) {
-				throw new ApiError(meta.errors.contentRestrictedByServer);
+				throw new ApiError(meta.errors.signinRequired);
 			}
 
 			return await this.noteEntityService.pack(note, me, {

packages/backend/src/server/web/boot.js

@@ -13,7 +13,7 @@
 	};
 	window.onunhandledrejection = (e) => {
 		console.error(e);
-		renderError('SOMETHING_HAPPENED_IN_PROMISE', e.reason || e);
+		renderError('SOMETHING_HAPPENED_IN_PROMISE', e);
 	};
 
 	let forceError = localStorage.getItem('forceError');

packages/backend/src/types.ts

@@ -12,8 +12,6 @@
  * quote - 投稿が引用Renoteされた
  * reaction - 投稿にリアクションされた
  * pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した
- * scheduledNotePosted - 予約したノートが投稿された
- * scheduledNotePostFailed - 予約したノートの投稿に失敗した
  * receiveFollowRequest - フォローリクエストされた
  * followRequestAccepted - 自分の送ったフォローリクエストが承認された
  * roleAssigned - ロールが付与された
@@ -34,8 +32,6 @@ export const notificationTypes = [
 	'quote',
 	'reaction',
 	'pollEnded',
-	'scheduledNotePosted',
-	'scheduledNotePostFailed',
 	'receiveFollowRequest',
 	'followRequestAccepted',
 	'roleAssigned',

packages/frontend-builder/package.json

@@ -11,15 +11,15 @@
 	},
 	"devDependencies": {
 		"@types/estree": "1.0.8",
-		"@types/node": "22.18.6",
-		"@typescript-eslint/eslint-plugin": "8.44.0",
-		"@typescript-eslint/parser": "8.44.0",
-		"rollup": "4.52.0",
+		"@types/node": "22.18.3",
+		"@typescript-eslint/eslint-plugin": "8.43.0",
+		"@typescript-eslint/parser": "8.43.0",
+		"rollup": "4.50.1",
 		"typescript": "5.9.2"
 	},
 	"dependencies": {
 		"estree-walker": "3.0.3",
 		"magic-string": "0.30.19",
-		"vite": "7.1.6"
+		"vite": "7.1.5"
 	}
 }

packages/frontend-embed/package.json

@@ -26,29 +26,29 @@
 		"mfm-js": "0.25.0",
 		"misskey-js": "workspace:*",
 		"punycode.js": "2.3.1",
-		"rollup": "4.52.0",
-		"sass": "1.93.0",
-		"shiki": "3.13.0",
+		"rollup": "4.50.1",
+		"sass": "1.92.1",
+		"shiki": "3.12.2",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.16",
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.9.2",
 		"uuid": "11.1.0",
-		"vite": "7.1.6",
+		"vite": "7.1.5",
 		"vue": "3.5.21"
 	},
 	"devDependencies": {
 		"@misskey-dev/summaly": "5.2.3",
-		"@tabler/icons-webfont": "3.35.0",
+		"@tabler/icons-webfont": "3.34.1",
 		"@testing-library/vue": "8.1.0",
 		"@types/estree": "1.0.8",
 		"@types/micromatch": "4.0.9",
-		"@types/node": "22.18.6",
+		"@types/node": "22.18.3",
 		"@types/punycode.js": "npm:@types/punycode@2.1.4",
 		"@types/tinycolor2": "1.4.6",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.44.0",
-		"@typescript-eslint/parser": "8.44.0",
+		"@typescript-eslint/eslint-plugin": "8.43.0",
+		"@typescript-eslint/parser": "8.43.0",
 		"@vitest/coverage-v8": "3.2.4",
 		"@vue/runtime-core": "3.5.21",
 		"acorn": "8.15.0",
@@ -59,10 +59,10 @@
 		"happy-dom": "18.0.1",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.8",
-		"msw": "2.11.3",
+		"msw": "2.11.2",
 		"nodemon": "3.1.10",
 		"prettier": "3.6.2",
-		"start-server-and-test": "2.1.2",
+		"start-server-and-test": "2.1.0",
 		"tsx": "4.20.5",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vue-component-type-helpers": "3.0.7",

packages/frontend-embed/vite.config.ts

@@ -64,8 +64,6 @@ function toBase62(n: number): string {
 }
 
 export function getConfig(): UserConfig {
-	const localesHash = toBase62(hash(JSON.stringify(locales)));
-
 	return {
 		base: '/embed_vite/',
 
@@ -150,9 +148,9 @@ export function getConfig(): UserConfig {
 						// dependencies of i18n.ts
 						'config': ['@@/js/config.js'],
 					},
-					entryFileNames: `scripts/${localesHash}-[hash:8].js`,
-					chunkFileNames: `scripts/${localesHash}-[hash:8].js`,
-					assetFileNames: `assets/${localesHash}-[hash:8][extname]`,
+					entryFileNames: 'scripts/[hash:8].js',
+					chunkFileNames: 'scripts/[hash:8].js',
+					assetFileNames: 'assets/[hash:8][extname]',
 					paths(id) {
 						for (const p of externalPackages) {
 							if (p.match.test(id)) {

packages/frontend-shared/package.json

@@ -21,10 +21,10 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"devDependencies": {
-		"@types/node": "22.18.6",
-		"@typescript-eslint/eslint-plugin": "8.44.0",
-		"@typescript-eslint/parser": "8.44.0",
-		"esbuild": "0.25.10",
+		"@types/node": "22.18.3",
+		"@typescript-eslint/eslint-plugin": "8.43.0",
+		"@typescript-eslint/parser": "8.43.0",
+		"esbuild": "0.25.9",
 		"eslint-plugin-vue": "10.4.0",
 		"nodemon": "3.1.10",
 		"typescript": "5.9.2",

packages/frontend/package.json

@@ -24,7 +24,7 @@
 		"@rollup/plugin-json": "6.1.0",
 		"@rollup/plugin-replace": "6.0.2",
 		"@rollup/pluginutils": "5.3.0",
-		"@sentry/vue": "10.12.0",
+		"@sentry/vue": "10.11.0",
 		"@syuilo/aiscript": "1.1.1",
 		"@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0",
 		"@twemoji/parser": "16.0.0",
@@ -41,7 +41,7 @@
 		"chartjs-chart-matrix": "3.0.0",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.2.0",
-		"chromatic": "13.2.0",
+		"chromatic": "13.1.4",
 		"compare-versions": "6.1.1",
 		"cropperjs": "2.0.1",
 		"date-fns": "4.1.0",
@@ -52,24 +52,21 @@
 		"icons-subsetter": "workspace:*",
 		"idb-keyval": "6.2.2",
 		"insert-text-at-cursor": "0.3.0",
-		"ios-haptics": "0.1.4",
+		"ios-haptics": "0.1.2",
 		"is-file-animated": "1.0.2",
 		"json5": "2.2.3",
 		"magic-string": "0.30.19",
 		"matter-js": "0.20.0",
-		"mediabunny": "1.17.3",
 		"mfm-js": "0.25.0",
 		"misskey-bubble-game": "workspace:*",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
 		"photoswipe": "5.4.4",
 		"punycode.js": "2.3.1",
-		"qr-code-styling": "1.9.2",
-		"qr-scanner": "1.4.2",
-		"rollup": "4.52.0",
+		"rollup": "4.50.1",
 		"sanitize-html": "2.17.0",
-		"sass": "1.93.0",
-		"shiki": "3.13.0",
+		"sass": "1.92.1",
+		"shiki": "3.12.2",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
 		"three": "0.180.0",
@@ -79,7 +76,7 @@
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.9.2",
 		"v-code-diff": "1.13.1",
-		"vite": "7.1.6",
+		"vite": "7.1.5",
 		"vue": "3.5.21",
 		"vuedraggable": "next",
 		"wanakana": "5.3.1"
@@ -88,7 +85,7 @@
 		"@misskey-dev/summaly": "5.2.3",
 		"@storybook/addon-essentials": "8.6.14",
 		"@storybook/addon-interactions": "8.6.14",
-		"@storybook/addon-links": "9.1.7",
+		"@storybook/addon-links": "9.1.5",
 		"@storybook/addon-mdx-gfm": "8.6.14",
 		"@storybook/addon-storysource": "8.6.14",
 		"@storybook/blocks": "8.6.14",
@@ -96,28 +93,28 @@
 		"@storybook/core-events": "8.6.14",
 		"@storybook/manager-api": "8.6.14",
 		"@storybook/preview-api": "8.6.14",
-		"@storybook/react": "9.1.7",
-		"@storybook/react-vite": "9.1.7",
+		"@storybook/react": "9.1.5",
+		"@storybook/react-vite": "9.1.5",
 		"@storybook/test": "8.6.14",
 		"@storybook/theming": "8.6.14",
 		"@storybook/types": "8.6.14",
-		"@storybook/vue3": "9.1.7",
-		"@storybook/vue3-vite": "9.1.7",
-		"@tabler/icons-webfont": "3.35.0",
+		"@storybook/vue3": "9.1.5",
+		"@storybook/vue3-vite": "9.1.5",
+		"@tabler/icons-webfont": "3.34.1",
 		"@testing-library/vue": "8.1.0",
 		"@types/canvas-confetti": "1.9.0",
 		"@types/estree": "1.0.8",
-		"@types/matter-js": "0.20.2",
+		"@types/matter-js": "0.20.0",
 		"@types/micromatch": "4.0.9",
-		"@types/node": "22.18.6",
+		"@types/node": "22.18.3",
 		"@types/punycode.js": "npm:@types/punycode@2.1.4",
 		"@types/sanitize-html": "2.16.0",
 		"@types/seedrandom": "3.0.8",
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.44.0",
-		"@typescript-eslint/parser": "8.44.0",
+		"@typescript-eslint/eslint-plugin": "8.43.0",
+		"@typescript-eslint/parser": "8.43.0",
 		"@vitest/coverage-v8": "3.2.4",
 		"@vue/compiler-core": "3.5.21",
 		"@vue/runtime-core": "3.5.21",
@@ -131,15 +128,15 @@
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.8",
 		"minimatch": "10.0.3",
-		"msw": "2.11.3",
+		"msw": "2.11.2",
 		"msw-storybook-addon": "2.0.5",
 		"nodemon": "3.1.10",
 		"prettier": "3.6.2",
 		"react": "19.1.1",
 		"react-dom": "19.1.1",
 		"seedrandom": "3.0.5",
-		"start-server-and-test": "2.1.2",
-		"storybook": "9.1.7",
+		"start-server-and-test": "2.1.0",
+		"storybook": "9.1.5",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"tsx": "4.20.5",
 		"vite-plugin-turbosnap": "1.0.3",

packages/frontend/src/boot/common.ts

@@ -151,21 +151,7 @@ export async function common(createVue: () => Promise<App<Element>>) {
 	}
 	//#endregion
 
-	//#region Sync dark mode
-	if (prefer.s.syncDeviceDarkMode) {
-		store.set('darkMode', isDeviceDarkmode());
-	}
-
-	window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (mql) => {
-		if (prefer.s.syncDeviceDarkMode) {
-			store.set('darkMode', mql.matches);
-		}
-	});
-	//#endregion
-
 	// NOTE: この処理は必ずクライアント更新チェック処理より後に来ること(テーマ再構築のため)
-	// NOTE: この処理は必ずダークモード判定処理より後に来ること(初回のテーマ適用のため)
-	// see: https://github.com/misskey-dev/misskey/issues/16562
 	watch(store.r.darkMode, (darkMode) => {
 		const theme = (() => {
 			if (darkMode) {
@@ -197,6 +183,18 @@ export async function common(createVue: () => Promise<App<Element>>) {
 		});
 	}
 
+	//#region Sync dark mode
+	if (prefer.s.syncDeviceDarkMode) {
+		store.set('darkMode', isDeviceDarkmode());
+	}
+
+	window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (mql) => {
+		if (prefer.s.syncDeviceDarkMode) {
+			store.set('darkMode', mql.matches);
+		}
+	});
+	//#endregion
+
 	if (!isSafeMode) {
 		if (prefer.s.darkTheme && store.s.darkMode) {
 			if (miLocalStorage.getItem('themeId') !== prefer.s.darkTheme.id) applyTheme(prefer.s.darkTheme);

packages/frontend/src/components/MkAnimBg.vue

@@ -10,7 +10,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { onMounted, onUnmounted, useTemplateRef } from 'vue';
 import isChromatic from 'chromatic/isChromatic';
-import { initShaderProgram } from '@/utility/webgl.js';
 
 const canvasEl = useTemplateRef('canvasEl');
 
@@ -22,6 +21,47 @@ const props = withDefaults(defineProps<{
 	focus: 1.0,
 });
 
+function loadShader(gl: WebGLRenderingContext, type: number, source: string) {
+	const shader = gl.createShader(type);
+	if (shader == null) return null;
+
+	gl.shaderSource(shader, source);
+	gl.compileShader(shader);
+
+	if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+		alert(
+			`falied to compile shader: ${gl.getShaderInfoLog(shader)}`,
+		);
+		gl.deleteShader(shader);
+		return null;
+	}
+
+	return shader;
+}
+
+function initShaderProgram(gl: WebGLRenderingContext, vsSource: string, fsSource: string) {
+	const vertexShader = loadShader(gl, gl.VERTEX_SHADER, vsSource);
+	const fragmentShader = loadShader(gl, gl.FRAGMENT_SHADER, fsSource);
+
+	const shaderProgram = gl.createProgram();
+	if (vertexShader == null || fragmentShader == null) return null;
+
+	gl.attachShader(shaderProgram, vertexShader);
+	gl.attachShader(shaderProgram, fragmentShader);
+	gl.linkProgram(shaderProgram);
+
+	if (!gl.getProgramParameter(shaderProgram, gl.LINK_STATUS)) {
+		alert(
+			`failed to init shader: ${gl.getProgramInfoLog(
+				shaderProgram,
+			)}`,
+		);
+		return null;
+	}
+
+	return shaderProgram;
+}
+
 let handle: ReturnType<typeof window['requestAnimationFrame']> | null = null;
 
 onMounted(() => {
@@ -31,7 +71,7 @@ onMounted(() => {
 	canvas.width = width;
 	canvas.height = height;
 
-	const maybeGl = canvas.getContext('webgl2', { premultipliedAlpha: true });
+	const maybeGl = canvas.getContext('webgl', { premultipliedAlpha: true });
 	if (maybeGl == null) return;
 
 	const gl = maybeGl;
@@ -42,16 +82,18 @@ onMounted(() => {
 	const positionBuffer = gl.createBuffer();
 	gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer);
 
-	const shaderProgram = initShaderProgram(gl, `#version 300 es
-		in vec2 position;
+	const shaderProgram = initShaderProgram(gl, `
+		attribute vec2 vertex;
+
 		uniform vec2 u_scale;
-		out vec2 in_uv;
+
+		varying vec2 v_pos;
 
 		void main() {
-			gl_Position = vec4(position, 0.0, 1.0);
-			in_uv = position / u_scale;
+			gl_Position = vec4(vertex, 0.0, 1.0);
+			v_pos = vertex / u_scale;
 		}
-	`, `#version 300 es
+	`, `
 		precision mediump float;
 
 		vec3 mod289(vec3 x) {
@@ -101,7 +143,6 @@ onMounted(() => {
 			return 130.0 * dot(m, g);
 		}
 
-		in vec2 in_uv;
 		uniform float u_time;
 		uniform vec2 u_resolution;
 		uniform float u_spread;
@@ -109,7 +150,8 @@ onMounted(() => {
 		uniform float u_warp;
 		uniform float u_focus;
 		uniform float u_itensity;
-		out vec4 out_color;
+
+		varying vec2 v_pos;
 
 		float circle( in vec2 _pos, in vec2 _origin, in float _radius ) {
 			float SPREAD = 0.7 * u_spread;
@@ -140,13 +182,13 @@ onMounted(() => {
 
 			float ratio = u_resolution.x / u_resolution.y;
 
-			vec2 uv = vec2( in_uv.x, in_uv.y / ratio ) * 0.5 + 0.5;
+			vec2 uv = vec2( v_pos.x, v_pos.y / ratio ) * 0.5 + 0.5;
 
 			vec3 color = vec3( 0.0 );
 
-			float greenMix = snoise( in_uv * 1.31 + u_time * 0.8 * 0.00017 ) * 0.5 + 0.5;
-			float purpleMix = snoise( in_uv * 1.26 + u_time * 0.8 * -0.0001 ) * 0.5 + 0.5;
-			float orangeMix = snoise( in_uv * 1.34 + u_time * 0.8 * 0.00015 ) * 0.5 + 0.5;
+			float greenMix = snoise( v_pos * 1.31 + u_time * 0.8 * 0.00017 ) * 0.5 + 0.5;
+			float purpleMix = snoise( v_pos * 1.26 + u_time * 0.8 * -0.0001 ) * 0.5 + 0.5;
+			float orangeMix = snoise( v_pos * 1.34 + u_time * 0.8 * 0.00015 ) * 0.5 + 0.5;
 
 			float alphaOne = 0.35 + 0.65 * pow( snoise( vec2( u_time * 0.00012, uv.x ) ) * 0.5 + 0.5, 1.2 );
 			float alphaTwo = 0.35 + 0.65 * pow( snoise( vec2( ( u_time + 1561.0 ) * 0.00014, uv.x ) ) * 0.5 + 0.5, 1.2 );
@@ -156,10 +198,10 @@ onMounted(() => {
 			color += vec3( circle( uv, vec2( 0.90 + cos( u_time * 0.000166 ) * 0.06, 0.42 + sin( u_time * 0.000138 ) * 0.06 ), 0.18 ) ) * alphaTwo * ( green * greenMix + purple * purpleMix );
 			color += vec3( circle( uv, vec2( 0.19 + sin( u_time * 0.000112 ) * 0.06, 0.25 + sin( u_time * 0.000192 ) * 0.06 ), 0.09 ) ) * alphaThree * ( orange * orangeMix );
 
-			color *= u_itensity + 1.0 * pow( snoise( vec2( in_uv.y + u_time * 0.00013, in_uv.x + u_time * -0.00009 ) ) * 0.5 + 0.5, 2.0 );
+			color *= u_itensity + 1.0 * pow( snoise( vec2( v_pos.y + u_time * 0.00013, v_pos.x + u_time * -0.00009 ) ) * 0.5 + 0.5, 2.0 );
 
 			vec3 inverted = vec3( 1.0 ) - color;
-			out_color = vec4(color, max(max(color.x, color.y), color.z));
+			gl_FragColor = vec4( color, max(max(color.x, color.y), color.z) );
 		}
 	`);
 	if (shaderProgram == null) return;
@@ -181,7 +223,7 @@ onMounted(() => {
 	gl.uniform1f(u_itensity, 0.5);
 	gl.uniform2fv(u_scale, [props.scale, props.scale]);
 
-	const vertex = gl.getAttribLocation(shaderProgram, 'position');
+	const vertex = gl.getAttribLocation(shaderProgram, 'vertex');
 	gl.enableVertexAttribArray(vertex);
 	gl.vertexAttribPointer(vertex, 2, gl.FLOAT, false, 0, 0);
 

packages/frontend/src/components/MkAntennaEditor.vue

@@ -10,11 +10,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkInput v-model="name">
 				<template #label>{{ i18n.ts.name }}</template>
 			</MkInput>
-			<MkSelect v-model="src" :items="antennaSourcesSelectDef">
+			<MkSelect v-model="src">
 				<template #label>{{ i18n.ts.antennaSource }}</template>
+				<option value="all">{{ i18n.ts._antennaSources.all }}</option>
+				<!--<option value="home">{{ i18n.ts._antennaSources.homeTimeline }}</option>-->
+				<option value="users">{{ i18n.ts._antennaSources.users }}</option>
+				<!--<option value="list">{{ i18n.ts._antennaSources.userList }}</option>-->
+				<option value="users_blacklist">{{ i18n.ts._antennaSources.userBlacklist }}</option>
 			</MkSelect>
-			<MkSelect v-if="src === 'list'" v-model="userListId" :items="userListsSelectDef">
+			<MkSelect v-if="src === 'list'" v-model="userListId">
 				<template #label>{{ i18n.ts.userList }}</template>
+				<option v-for="list in userLists" :key="list.id" :value="list.id">{{ list.name }}</option>
 			</MkSelect>
 			<MkTextarea v-else-if="src === 'users' || src === 'users_blacklist'" v-model="users">
 				<template #label>{{ i18n.ts.users }}</template>
@@ -46,7 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { watch, ref, computed } from 'vue';
+import { watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import type { DeepPartial } from '@/utility/merge.js';
 import MkButton from '@/components/MkButton.vue';
@@ -58,7 +64,6 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { deepMerge } from '@/utility/merge.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 type PartialAllowedAntenna = Omit<Misskey.entities.Antenna, 'id' | 'createdAt' | 'updatedAt'> & {
 	id?: string;
@@ -94,35 +99,9 @@ const emit = defineEmits<{
 	(ev: 'deleted'): void,
 }>();
 
-const {
-	model: src,
-	def: antennaSourcesSelectDef,
-} = useMkSelect({
-	items: [
-		{ value: 'all', label: i18n.ts._antennaSources.all },
-		//{ value: 'home', label: i18n.ts._antennaSources.homeTimeline },
-		{ value: 'users', label: i18n.ts._antennaSources.users },
-		//{ value: 'list', label: i18n.ts._antennaSources.userList },
-		{ value: 'users_blacklist', label: i18n.ts._antennaSources.userBlacklist },
-	],
-	initialValue: initialAntenna.src,
-});
-
-const {
-	model: userListId,
-	def: userListsSelectDef,
-} = useMkSelect({
-	items: computed(() => {
-		if (userLists.value == null) return [];
-		return userLists.value.map(list => ({
-			value: list.id,
-			label: list.name,
-		}));
-	}),
-	initialValue: initialAntenna.userListId,
-});
-
 const name = ref<string>(initialAntenna.name);
+const src = ref<Misskey.entities.AntennasCreateRequest['src']>(initialAntenna.src);
+const userListId = ref<string | null>(initialAntenna.userListId);
 const users = ref<string>(initialAntenna.users.join('\n'));
 const keywords = ref<string>(initialAntenna.keywords.map(x => x.join(' ')).join('\n'));
 const excludeKeywords = ref<string>(initialAntenna.excludeKeywords.map(x => x.join(' ')).join('\n'));

packages/frontend/src/components/MkAsUi.vue

@@ -32,9 +32,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template v-if="c.label" #label>{{ c.label }}</template>
 		<template v-if="c.caption" #caption>{{ c.caption }}</template>
 	</MkInput>
-	<MkSelect v-else-if="c.type === 'select'" :small="size === 'small'" :modelValue="valueForSelect" :items="selectDef" @update:modelValue="onSelectUpdate">
+	<MkSelect v-else-if="c.type === 'select'" :small="size === 'small'" :modelValue="valueForSelect" @update:modelValue="onSelectUpdate">
 		<template v-if="c.label" #label>{{ c.label }}</template>
 		<template v-if="c.caption" #caption>{{ c.caption }}</template>
+		<option v-for="item in c.items" :key="item.value" :value="item.value">{{ item.text }}</option>
 	</MkSelect>
 	<MkButton v-else-if="c.type === 'postFormButton'" :primary="c.primary" :rounded="c.rounded" :small="size === 'small'" inline @click="openPostForm">{{ c.text }}</MkButton>
 	<div v-else-if="c.type === 'postForm'" :class="$style.postForm">
@@ -73,7 +74,6 @@ import MkSelect from '@/components/MkSelect.vue';
 import type { AsUiComponent, AsUiRoot, AsUiPostFormButton } from '@/aiscript/ui.js';
 import MkFolder from '@/components/MkFolder.vue';
 import MkPostForm from '@/components/MkPostForm.vue';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 const props = withDefaults(defineProps<{
 	component: AsUiComponent;
@@ -130,19 +130,7 @@ function onSwitchUpdate(v: boolean) {
 	}
 }
 
-const {
-	model: valueForSelect,
-	def: selectDef,
-} = useMkSelect({
-	items: computed(() => {
-		if (c.type !== 'select') return [];
-		return (c.items ?? []).map(item => ({
-			value: item.value,
-			label: item.text,
-		}));
-	}),
-	initialValue: (c.type === 'select' && 'default' in c && typeof c.default !== 'boolean') ? c.default ?? null : null,
-});
+const valueForSelect = ref('default' in c && typeof c.default !== 'boolean' ? c.default ?? null : null);
 
 function onSelectUpdate(v) {
 	valueForSelect.value = v;

packages/frontend/src/components/MkDialog.vue

@@ -29,7 +29,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<span v-else-if="okButtonDisabledReason === 'charactersBelow'" v-text="i18n.tsx._dialog.charactersBelow({ current: (inputValue as string)?.length ?? 0, min: input.minLength ?? 'NaN' })"/>
 			</template>
 		</MkInput>
-		<MkSelect v-if="select" v-model="selectedValue" :items="selectDef" autofocus></MkSelect>
+		<MkSelect v-if="select" v-model="selectedValue" autofocus>
+			<template v-if="select.items">
+				<template v-for="item in select.items">
+					<optgroup v-if="'sectionTitle' in item" :label="item.sectionTitle">
+						<option v-for="subItem in item.items" :value="subItem.value">{{ subItem.text }}</option>
+					</optgroup>
+					<option v-else :value="item.value">{{ item.text }}</option>
+				</template>
+			</template>
+		</MkSelect>
 		<div v-if="(showOkButton || showCancelButton) && !actions" :class="$style.buttons">
 			<MkButton v-if="showOkButton" data-cy-modal-dialog-ok inline primary rounded :autofocus="!input && !select" :disabled="okButtonDisabledReason != null" @click="ok">{{ okText ?? ((showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt) }}</MkButton>
 			<MkButton v-if="showCancelButton || input || select" data-cy-modal-dialog-cancel inline rounded @click="cancel">{{ cancelText ?? i18n.ts.cancel }}</MkButton>
@@ -47,8 +56,6 @@ import MkModal from '@/components/MkModal.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
-import type { MkSelectItem, OptionValue } from '@/components/MkSelect.vue';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import { i18n } from '@/i18n.js';
 
 type Input = {
@@ -60,9 +67,17 @@ type Input = {
 	maxLength?: number;
 };
 
+type SelectItem = {
+	value: any;
+	text: string;
+};
+
 type Select = {
-	items: MkSelectItem[];
-	default: OptionValue | null;
+	items: (SelectItem | {
+		sectionTitle: string;
+		items: SelectItem[];
+	})[];
+	default: string | null;
 };
 
 type Result = string | number | true | null;
@@ -100,6 +115,7 @@ const emit = defineEmits<{
 const modal = useTemplateRef('modal');
 
 const inputValue = ref<string | number | null>(props.input?.default ?? null);
+const selectedValue = ref(props.select?.default ?? null);
 
 const okButtonDisabledReason = computed<null | 'charactersExceeded' | 'charactersBelow'>(() => {
 	if (props.input) {
@@ -118,14 +134,6 @@ const okButtonDisabledReason = computed<null | 'charactersExceeded' | 'character
 	return null;
 });
 
-const {
-	def: selectDef,
-	model: selectedValue,
-} = useMkSelect({
-	items: computed(() => props.select?.items ?? []),
-	initialValue: props.select?.default ?? null,
-});
-
 // overload function を使いたいので lint エラーを無視する
 function done(canceled: true): void;
 function done(canceled: false, result: Result): void; // eslint-disable-line no-redeclare

packages/frontend/src/components/MkEmbedCodeGenDialog.vue

@@ -52,8 +52,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #suffix>px</template>
 						<template #caption>{{ i18n.ts._embedCodeGen.maxHeightDescription }}</template>
 					</MkInput>
-					<MkSelect v-model="colorMode" :items="colorModeDef">
+					<MkSelect v-model="colorMode">
 						<template #label>{{ i18n.ts.theme }}</template>
+						<option value="auto">{{ i18n.ts.syncDeviceDarkMode }}</option>
+						<option value="light">{{ i18n.ts.light }}</option>
+						<option value="dark">{{ i18n.ts.dark }}</option>
 					</MkSelect>
 					<MkSwitch v-if="isEmbedWithScrollbar" v-model="header">{{ i18n.ts._embedCodeGen.header }}</MkSwitch>
 					<MkSwitch v-model="rounded">{{ i18n.ts._embedCodeGen.rounded }}</MkSwitch>
@@ -102,7 +105,6 @@ import MkInfo from '@/components/MkInfo.vue';
 
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
 import { normalizeEmbedParams, getEmbedCode } from '@/utility/get-embed-code.js';
 
@@ -160,18 +162,7 @@ const isEmbedWithScrollbar = computed(() => embedRouteWithScrollbar.includes(pro
 const header = ref(props.params?.header ?? true);
 const maxHeight = ref(props.params?.maxHeight !== 0 ? props.params?.maxHeight ?? null : 500);
 
-const {
-	model: colorMode,
-	def: colorModeDef,
-} = useMkSelect({
-	items: [
-		{ value: 'auto', label: i18n.ts.syncDeviceDarkMode },
-		{ value: 'light', label: i18n.ts.light },
-		{ value: 'dark', label: i18n.ts.dark },
-	],
-	initialValue: props.params?.colorMode ?? 'auto',
-});
-
+const colorMode = ref<'light' | 'dark' | 'auto'>(props.params?.colorMode ?? 'auto');
 const rounded = ref(props.params?.rounded ?? true);
 const border = ref(props.params?.border ?? true);
 

packages/frontend/src/components/MkEmojiPicker.vue

@@ -530,14 +530,6 @@ defineExpose({
 		--eachSize: 50px;
 	}
 
-	&.s4 {
-		--eachSize: 55px;
-	}
-
-	&.s5 {
-		--eachSize: 60px;
-	}
-
 	&.w1 {
 		width: calc((var(--eachSize) * 5) + (#{$pad} * 2));
 		--columns: 1fr 1fr 1fr 1fr 1fr;

packages/frontend/src/components/MkFormDialog.vue

@@ -39,8 +39,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<span v-text="v.label || k"></span>
 					<template v-if="v.description" #caption>{{ v.description }}</template>
 				</MkSwitch>
-				<MkSelect v-else-if="v.type === 'enum'" v-model="values[k]" :items="getMkSelectDef(v)">
+				<MkSelect v-else-if="v.type === 'enum'" v-model="values[k]">
 					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
+					<option v-for="option in v.enum" :key="getEnumKey(option)" :value="getEnumValue(option)">{{ getEnumLabel(option) }}</option>
 				</MkSelect>
 				<MkRadios v-else-if="v.type === 'radio'" v-model="values[k]">
 					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
@@ -76,8 +77,7 @@ import MkRange from './MkRange.vue';
 import MkButton from './MkButton.vue';
 import MkRadios from './MkRadios.vue';
 import XFile from './MkFormDialog.file.vue';
-import type { MkSelectItem } from '@/components/MkSelect.vue';
-import type { Form, EnumFormItem, RadioFormItem } from '@/utility/form.js';
+import type { EnumItem, Form, RadioFormItem } from '@/utility/form.js';
 import MkModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n.js';
 
@@ -120,14 +120,16 @@ function cancel() {
 	dialog.value?.close();
 }
 
-function getMkSelectDef(def: EnumFormItem): MkSelectItem[] {
-	return def.enum.map((v) => {
-		if (typeof v === 'string') {
-			return { value: v, label: v };
-		} else {
-			return { value: v.value, label: v.label };
-		}
-	});
+function getEnumLabel(e: EnumItem) {
+	return typeof e === 'string' ? e : e.label;
+}
+
+function getEnumValue(e: EnumItem) {
+	return typeof e === 'string' ? e : e.value;
+}
+
+function getEnumKey(e: EnumItem) {
+	return typeof e === 'string' ? e : typeof e.value === 'string' ? e.value : JSON.stringify(e.value);
 }
 
 function getRadioKey(e: RadioFormItem['options'][number]) {

packages/frontend/src/components/MkImageEffectorDialog.vue

@@ -19,12 +19,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div :class="$style.root">
 		<div :class="$style.container">
 			<div :class="$style.preview">
-				<canvas ref="canvasEl" :class="$style.previewCanvas" @pointerdown="onImagePointerdown"></canvas>
+				<canvas ref="canvasEl" :class="$style.previewCanvas"></canvas>
 				<div :class="$style.previewContainer">
 					<div class="_acrylic" :class="$style.previewTitle">{{ i18n.ts.preview }}</div>
-					<div class="_acrylic" :class="$style.editControls">
-						<button class="_button" :class="[$style.previewControlsButton, penMode != null ? $style.active : null]" @click="showPenMenu"><i class="ti ti-pencil"></i></button>
-					</div>
 					<div class="_acrylic" :class="$style.previewControls">
 						<button class="_button" :class="[$style.previewControlsButton, !enabled ? $style.active : null]" @click="enabled = false">Before</button>
 						<button class="_button" :class="[$style.previewControlsButton, enabled ? $style.active : null]" @click="enabled = true">After</button>
@@ -215,147 +212,6 @@ watch(enabled, () => {
 		renderer.render();
 	}
 });
-
-const penMode = ref<'fill' | 'blur' | 'pixelate' | null>(null);
-
-function showPenMenu(ev: MouseEvent) {
-	os.popupMenu([{
-		text: i18n.ts._imageEffector._fxs.fill,
-		action: () => {
-			penMode.value = 'fill';
-		},
-	}, {
-		text: i18n.ts._imageEffector._fxs.blur,
-		action: () => {
-			penMode.value = 'blur';
-		},
-	}, {
-		text: i18n.ts._imageEffector._fxs.pixelate,
-		action: () => {
-			penMode.value = 'pixelate';
-		},
-	}], ev.currentTarget ?? ev.target);
-}
-
-function onImagePointerdown(ev: PointerEvent) {
-	if (canvasEl.value == null || imageBitmap == null || penMode.value == null) return;
-
-	const AW = canvasEl.value.clientWidth;
-	const AH = canvasEl.value.clientHeight;
-	const BW = imageBitmap.width;
-	const BH = imageBitmap.height;
-
-	let xOffset = 0;
-	let yOffset = 0;
-
-	if (AW / AH < BW / BH) { // 横長
-		yOffset = AH - BH * (AW / BW);
-	} else { // 縦長
-		xOffset = AW - BW * (AH / BH);
-	}
-
-	xOffset /= 2;
-	yOffset /= 2;
-
-	let startX = ev.offsetX - xOffset;
-	let startY = ev.offsetY - yOffset;
-
-	if (AW / AH < BW / BH) { // 横長
-		startX = startX / (Math.max(AW, AH) / Math.max(BH / BW, 1));
-		startY = startY / (Math.max(AW, AH) / Math.max(BW / BH, 1));
-	} else { // 縦長
-		startX = startX / (Math.min(AW, AH) / Math.max(BH / BW, 1));
-		startY = startY / (Math.min(AW, AH) / Math.max(BW / BH, 1));
-	}
-
-	const id = genId();
-	if (penMode.value === 'fill') {
-		layers.push({
-			id,
-			fxId: 'fill',
-			params: {
-				offsetX: 0,
-				offsetY: 0,
-				scaleX: 0.1,
-				scaleY: 0.1,
-				angle: 0,
-				opacity: 1,
-				color: [1, 1, 1],
-			},
-		});
-	} else if (penMode.value === 'blur') {
-		layers.push({
-			id,
-			fxId: 'blur',
-			params: {
-				offsetX: 0,
-				offsetY: 0,
-				scaleX: 0.1,
-				scaleY: 0.1,
-				angle: 0,
-				radius: 3,
-			},
-		});
-	} else if (penMode.value === 'pixelate') {
-		layers.push({
-			id,
-			fxId: 'pixelate',
-			params: {
-				offsetX: 0,
-				offsetY: 0,
-				scaleX: 0.1,
-				scaleY: 0.1,
-				angle: 0,
-				strength: 0.2,
-			},
-		});
-	}
-
-	_move(ev.offsetX, ev.offsetY);
-
-	function _move(pointerX: number, pointerY: number) {
-		let x = pointerX - xOffset;
-		let y = pointerY - yOffset;
-
-		if (AW / AH < BW / BH) { // 横長
-			x = x / (Math.max(AW, AH) / Math.max(BH / BW, 1));
-			y = y / (Math.max(AW, AH) / Math.max(BW / BH, 1));
-		} else { // 縦長
-			x = x / (Math.min(AW, AH) / Math.max(BH / BW, 1));
-			y = y / (Math.min(AW, AH) / Math.max(BW / BH, 1));
-		}
-
-		const scaleX = Math.abs(x - startX);
-		const scaleY = Math.abs(y - startY);
-
-		const layerIndex = layers.findIndex((l) => l.id === id);
-		const layer = layerIndex !== -1 ? layers[layerIndex] : null;
-		if (layer != null) {
-			layer.params.offsetX = (x + startX) - 1;
-			layer.params.offsetY = (y + startY) - 1;
-			layer.params.scaleX = scaleX;
-			layer.params.scaleY = scaleY;
-			layers[layerIndex] = layer;
-		}
-	}
-
-	function move(ev: PointerEvent) {
-		_move(ev.offsetX, ev.offsetY);
-	}
-
-	function up() {
-		canvasEl.value?.removeEventListener('pointermove', move);
-		canvasEl.value?.removeEventListener('pointerup', up);
-		canvasEl.value?.removeEventListener('pointercancel', up);
-		canvasEl.value?.releasePointerCapture(ev.pointerId);
-
-		penMode.value = null;
-	}
-
-	canvasEl.value.addEventListener('pointermove', move);
-	canvasEl.value.addEventListener('pointerup', up);
-	canvasEl.value.setPointerCapture(ev.pointerId);
-}
 </script>
 
 <style module>
@@ -395,18 +251,6 @@ function onImagePointerdown(ev: PointerEvent) {
 	font-size: 85%;
 }
 
-.editControls {
-	position: absolute;
-	z-index: 100;
-	bottom: 8px;
-	left: 8px;
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	padding: 6px 10px;
-	border-radius: 6px;
-}
-
 .previewControls {
 	position: absolute;
 	z-index: 100;
@@ -439,13 +283,9 @@ function onImagePointerdown(ev: PointerEvent) {
 	position: absolute;
 	top: 0;
 	left: 0;
-	/* なんかiOSでレンダリングがおかしい
-	width: stretch;
-	height: stretch;
-	*/
-	width: calc(100% - 40px);
-	height: calc(100% - 40px);
-	margin: 20px;
+	width: 100%;
+	height: 100%;
+	padding: 20px;
 	box-sizing: border-box;
 	object-fit: contain;
 }

packages/frontend/src/components/MkInstanceStats.vue

@@ -9,8 +9,31 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #header>Chart</template>
 		<div :class="$style.chart">
 			<div class="selects">
-				<MkSelect v-model="chartSrc" :items="chartSrcDef" style="margin: 0; flex: 1;"></MkSelect>
-				<MkSelect v-model="chartSpan" :items="chartSpanDef" style="margin: 0 0 0 10px;"></MkSelect>
+				<MkSelect v-model="chartSrc" style="margin: 0; flex: 1;">
+					<optgroup v-if="shouldShowFederation" :label="i18n.ts.federation">
+						<option value="federation">{{ i18n.ts._charts.federation }}</option>
+						<option value="ap-request">{{ i18n.ts._charts.apRequest }}</option>
+					</optgroup>
+					<optgroup :label="i18n.ts.users">
+						<option value="users">{{ i18n.ts._charts.usersIncDec }}</option>
+						<option value="users-total">{{ i18n.ts._charts.usersTotal }}</option>
+						<option value="active-users">{{ i18n.ts._charts.activeUsers }}</option>
+					</optgroup>
+					<optgroup :label="i18n.ts.notes">
+						<option value="notes">{{ i18n.ts._charts.notesIncDec }}</option>
+						<option value="local-notes">{{ i18n.ts._charts.localNotesIncDec }}</option>
+						<option v-if="shouldShowFederation" value="remote-notes">{{ i18n.ts._charts.remoteNotesIncDec }}</option>
+						<option value="notes-total">{{ i18n.ts._charts.notesTotal }}</option>
+					</optgroup>
+					<optgroup :label="i18n.ts.drive">
+						<option value="drive-files">{{ i18n.ts._charts.filesIncDec }}</option>
+						<option value="drive">{{ i18n.ts._charts.storageUsageIncDec }}</option>
+					</optgroup>
+				</MkSelect>
+				<MkSelect v-model="chartSpan" style="margin: 0 0 0 10px;">
+					<option value="hour">{{ i18n.ts.perHour }}</option>
+					<option value="day">{{ i18n.ts.perDay }}</option>
+				</MkSelect>
 			</div>
 			<div class="chart _panel">
 				<MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="true"></MkChart>
@@ -20,7 +43,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<MkFoldableSection class="item">
 		<template #header>Active users heatmap</template>
-		<MkSelect v-model="heatmapSrc" :items="heatmapSrcDef" style="margin: 0 0 12px 0;"></MkSelect>
+		<MkSelect v-model="heatmapSrc" style="margin: 0 0 12px 0;">
+			<option value="active-users">Active users</option>
+			<option value="notes">Notes</option>
+			<option v-if="shouldShowFederation" value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
+			<option v-if="shouldShowFederation" value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
+			<option v-if="shouldShowFederation" value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
+		</MkSelect>
 		<div class="_panel" :class="$style.heatmap">
 			<MkHeatmap :src="heatmapSrc" :label="'Read & Write'"/>
 		</div>
@@ -55,10 +84,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, computed, useTemplateRef } from 'vue';
+import { onMounted, ref, computed, useTemplateRef } from 'vue';
 import { Chart } from 'chart.js';
+import type { HeatmapSource } from '@/components/MkHeatmap.vue';
 import MkSelect from '@/components/MkSelect.vue';
-import type { MkSelectItem, ItemOption } from '@/components/MkSelect.vue';
 import MkChart from '@/components/MkChart.vue';
 import type { ChartSrc } from '@/components/MkChart.vue';
 import { useChartTooltip } from '@/composables/use-chart-tooltip.js';
@@ -72,96 +101,15 @@ import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import MkRetentionHeatmap from '@/components/MkRetentionHeatmap.vue';
 import MkRetentionLineChart from '@/components/MkRetentionLineChart.vue';
 import { initChart } from '@/utility/init-chart.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 initChart();
 
 const shouldShowFederation = computed(() => instance.federation !== 'none' || $i?.isModerator);
 
 const chartLimit = 500;
-const {
-	model: chartSpan,
-	def: chartSpanDef,
-} = useMkSelect({
-	items: [
-		{ value: 'hour', label: i18n.ts.perHour },
-		{ value: 'day', label: i18n.ts.perDay },
-	],
-	initialValue: 'hour',
-});
-const {
-	model: chartSrc,
-	def: chartSrcDef,
-} = useMkSelect({
-	items: computed<MkSelectItem<ChartSrc>[]>(() => {
-		const items: MkSelectItem<ChartSrc>[] = [];
-
-		if (shouldShowFederation.value) {
-			items.push({
-				type: 'group',
-				label: i18n.ts.federation,
-				items: [
-					{ value: 'federation', label: i18n.ts._charts.federation },
-					{ value: 'ap-request', label: i18n.ts._charts.apRequest },
-				],
-			});
-		}
-
-		items.push({
-			type: 'group',
-			label: i18n.ts.users,
-			items: [
-				{ value: 'users', label: i18n.ts._charts.usersIncDec },
-				{ value: 'users-total', label: i18n.ts._charts.usersTotal },
-				{ value: 'active-users', label: i18n.ts._charts.activeUsers },
-			],
-		});
-
-		const notesItems: ItemOption<ChartSrc>[] = [
-			{ value: 'notes', label: i18n.ts._charts.notesIncDec },
-			{ value: 'local-notes', label: i18n.ts._charts.localNotesIncDec },
-		];
-
-		if (shouldShowFederation.value) notesItems.push({ value: 'remote-notes', label: i18n.ts._charts.remoteNotesIncDec });
-
-		notesItems.push(
-			{ value: 'notes-total', label: i18n.ts._charts.notesTotal },
-		);
-
-		items.push({
-			type: 'group',
-			label: i18n.ts.notes,
-			items: notesItems,
-		});
-
-		items.push({
-			type: 'group',
-			label: i18n.ts.drive,
-			items: [
-				{ value: 'drive-files', label: i18n.ts._charts.filesIncDec },
-				{ value: 'drive', label: i18n.ts._charts.storageUsageIncDec },
-			],
-		});
-
-		return items;
-	}),
-	initialValue: 'active-users',
-});
-const {
-	model: heatmapSrc,
-	def: heatmapSrcDef,
-} = useMkSelect({
-	items: computed(() => [
-		{ value: 'active-users' as const, label: 'Active Users' },
-		{ value: 'notes' as const, label: 'Notes' },
-		...(shouldShowFederation.value ? [
-			{ value: 'ap-requests-inbox-received' as const, label: 'AP Requests: inboxReceived' },
-			{ value: 'ap-requests-deliver-succeeded' as const, label: 'AP Requests: deliverSucceeded' },
-			{ value: 'ap-requests-deliver-failed' as const, label: 'AP Requests: deliverFailed' },
-		] : []),
-	]),
-	initialValue: 'active-users',
-});
+const chartSpan = ref<'hour' | 'day'>('hour');
+const chartSrc = ref<ChartSrc>('active-users');
+const heatmapSrc = ref<HeatmapSource>('active-users');
 const subDoughnutEl = useTemplateRef('subDoughnutEl');
 const pubDoughnutEl = useTemplateRef('pubDoughnutEl');
 

packages/frontend/src/components/MkNoteDraftsDialog.vue

@@ -15,32 +15,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 	@esc="cancel()"
 >
 	<template #header>
-		{{ i18n.ts.draftsAndScheduledNotes }} ({{ currentDraftsCount }}/{{ $i?.policies.noteDraftLimit }})
+		{{ i18n.ts.drafts }} ({{ currentDraftsCount }}/{{ $i?.policies.noteDraftLimit }})
 	</template>
-
-	<MkStickyContainer>
-		<template #header>
-			<MkTabs
-				v-model:tab="tab"
-				centered
-				:class="$style.tabs"
-				:tabs="[
-					{
-						key: 'drafts',
-						title: i18n.ts.drafts,
-						icon: 'ti ti-pencil-question',
-					},
-					{
-						key: 'scheduled',
-						title: i18n.ts.scheduled,
-						icon: 'ti ti-calendar-clock',
-					},
-				]"
-			/>
-		</template>
-
 	<div class="_spacer">
-			<MkPagination :key="tab" :paginator="tab === 'scheduled' ? scheduledPaginator : draftsPaginator" withControl>
+		<MkPagination :paginator="paginator" withControl>
 			<template #empty>
 				<MkResult type="empty" :text="i18n.ts._drafts.noDrafts"/>
 			</template>
@@ -54,13 +32,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						:class="[$style.draft]"
 					>
 						<div :class="$style.draftBody" class="_gaps_s">
-								<MkInfo v-if="draft.scheduledAt != null && draft.isActuallyScheduled">
-									<I18n :src="i18n.ts.scheduledToPostOnX" tag="span">
-										<template #x>
-											<MkTime :time="draft.scheduledAt" :mode="'detail'" style="font-weight: bold;"/>
-										</template>
-									</I18n>
-								</MkInfo>
 							<div :class="$style.draftInfo">
 								<div :class="$style.draftMeta">
 									<div v-if="draft.reply" class="_nowrap">
@@ -114,33 +85,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkTime :time="draft.createdAt" :class="$style.draftCreatedAt" mode="detail" colored/>
 							</div>
 						</div>
-
 						<div :class="$style.draftActions" class="_buttons">
-								<template v-if="draft.scheduledAt != null && draft.isActuallyScheduled">
 							<MkButton
-										:class="$style.itemButton"
-										small
-										@click="cancelSchedule(draft)"
-									>
-										<i class="ti ti-calendar-x"></i> {{ i18n.ts._drafts.cancelSchedule }}
-									</MkButton>
-									<!-- TODO
-									<MkButton
-										:class="$style.itemButton"
-										small
-										@click="reSchedule(draft)"
-									>
-										<i class="ti ti-calendar-time"></i> {{ i18n.ts._drafts.reSchedule }}
-									</MkButton>
-									-->
-								</template>
-								<MkButton
-									v-else
 								:class="$style.itemButton"
 								small
 								@click="restoreDraft(draft)"
 							>
-									<i class="ti ti-corner-up-left"></i> {{ i18n.ts._drafts.restore }}
+								<i class="ti ti-corner-up-left"></i>
+								{{ i18n.ts._drafts.restore }}
 							</MkButton>
 							<MkButton
 								v-tooltip="i18n.ts._drafts.delete"
@@ -148,7 +100,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 								small
 								:iconOnly="true"
 								:class="$style.itemButton"
-									style="margin-left: auto;"
 								@click="deleteDraft(draft)"
 							>
 								<i class="ti ti-trash"></i>
@@ -159,7 +110,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</template>
 		</MkPagination>
 	</div>
-	</MkStickyContainer>
 </MkModalWindow>
 </template>
 
@@ -175,12 +125,6 @@ import * as os from '@/os.js';
 import { $i } from '@/i.js';
 import { misskeyApi } from '@/utility/misskey-api';
 import { Paginator } from '@/utility/paginator.js';
-import MkTabs from '@/components/MkTabs.vue';
-import MkInfo from '@/components/MkInfo.vue';
-
-const props = defineProps<{
-	scheduled?: boolean;
-}>();
 
 const emit = defineEmits<{
 	(ev: 'restore', draft: Misskey.entities.NoteDraft): void;
@@ -188,20 +132,8 @@ const emit = defineEmits<{
 	(ev: 'closed'): void;
 }>();
 
-const tab = ref<'drafts' | 'scheduled'>(props.scheduled ? 'scheduled' : 'drafts');
-
-const draftsPaginator = markRaw(new Paginator('notes/drafts/list', {
+const paginator = markRaw(new Paginator('notes/drafts/list', {
 	limit: 10,
-	params: {
-		scheduled: false,
-	},
-}));
-
-const scheduledPaginator = markRaw(new Paginator('notes/drafts/list', {
-	limit: 10,
-	params: {
-		scheduled: true,
-	},
 }));
 
 const currentDraftsCount = ref(0);
@@ -230,17 +162,7 @@ async function deleteDraft(draft: Misskey.entities.NoteDraft) {
 	if (canceled) return;
 
 	os.apiWithDialog('notes/drafts/delete', { draftId: draft.id }).then(() => {
-		draftsPaginator.reload();
-	});
-}
-
-async function cancelSchedule(draft: Misskey.entities.NoteDraft) {
-	os.apiWithDialog('notes/drafts/update', {
-		draftId: draft.id,
-		isActuallyScheduled: false,
-		scheduledAt: null,
-	}).then(() => {
-		scheduledPaginator.reload();
+		paginator.reload();
 	});
 }
 </script>
@@ -298,11 +220,4 @@ async function cancelSchedule(draft: Misskey.entities.NoteDraft) {
 	padding-top: 16px;
 	border-top: solid 1px var(--MI_THEME-divider);
 }
-
-.tabs {
-	background: color(from var(--MI_THEME-bg) srgb r g b / 0.75);
-	-webkit-backdrop-filter: var(--MI-blur, blur(15px));
-	backdrop-filter: var(--MI-blur, blur(15px));
-	border-bottom: solid 0.5px var(--MI_THEME-divider);
-}
 </style>

packages/frontend/src/components/MkNotification.vue

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div :class="$style.root">
 	<div :class="$style.head">
 		<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && 'note' in notification" :class="$style.icon" :user="notification.note.user" link preview/>
-		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'exportCompleted', 'login', 'createToken', 'scheduledNotePosted', 'scheduledNotePostFailed'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
+		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'exportCompleted', 'login', 'createToken'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
 		<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
@@ -23,8 +23,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				[$style.t_mention]: notification.type === 'mention',
 				[$style.t_quote]: notification.type === 'quote',
 				[$style.t_pollEnded]: notification.type === 'pollEnded',
-				[$style.t_scheduledNotePosted]: notification.type === 'scheduledNotePosted',
-				[$style.t_scheduledNotePostFailed]: notification.type === 'scheduledNotePostFailed',
 				[$style.t_achievementEarned]: notification.type === 'achievementEarned',
 				[$style.t_exportCompleted]: notification.type === 'exportCompleted',
 				[$style.t_login]: notification.type === 'login',
@@ -41,8 +39,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<i v-else-if="notification.type === 'mention'" class="ti ti-at"></i>
 			<i v-else-if="notification.type === 'quote'" class="ti ti-quote"></i>
 			<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
-			<i v-else-if="notification.type === 'scheduledNotePosted'" class="ti ti-send"></i>
-			<i v-else-if="notification.type === 'scheduledNotePostFailed'" class="ti ti-alert-triangle"></i>
 			<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-medal"></i>
 			<i v-else-if="notification.type === 'exportCompleted'" class="ti ti-archive"></i>
 			<i v-else-if="notification.type === 'login'" class="ti ti-login-2"></i>
@@ -64,8 +60,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div :class="$style.tail">
 		<header :class="$style.header">
 			<span v-if="notification.type === 'pollEnded'">{{ i18n.ts._notification.pollEnded }}</span>
-			<span v-else-if="notification.type === 'scheduledNotePosted'">{{ i18n.ts._notification.scheduledNotePosted }}</span>
-			<span v-else-if="notification.type === 'scheduledNotePostFailed'">{{ i18n.ts._notification.scheduledNotePostFailed }}</span>
 			<span v-else-if="notification.type === 'note'">{{ i18n.ts._notification.newNote }}: <MkUserName :user="notification.note.user"/></span>
 			<span v-else-if="notification.type === 'roleAssigned'">{{ i18n.ts._notification.roleAssigned }}</span>
 			<span v-else-if="notification.type === 'chatRoomInvitationReceived'">{{ i18n.ts._notification.chatRoomInvitationReceived }}</span>
@@ -109,11 +103,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
 				<i class="ti ti-quote" :class="$style.quote"></i>
 			</MkA>
-			<MkA v-else-if="notification.type === 'scheduledNotePosted'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
-				<i class="ti ti-quote" :class="$style.quote"></i>
-				<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
-				<i class="ti ti-quote" :class="$style.quote"></i>
-			</MkA>
 			<div v-else-if="notification.type === 'roleAssigned'" :class="$style.text">
 				{{ notification.role.name }}
 			</div>
@@ -349,16 +338,6 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
 	pointer-events: none;
 }
 
-.t_scheduledNotePosted {
-	background: var(--eventOther);
-	pointer-events: none;
-}
-
-.t_scheduledNotePostFailed {
-	background: var(--eventOther);
-	pointer-events: none;
-}
-
 .t_achievementEarned {
 	background: var(--eventAchievement);
 	pointer-events: none;

packages/frontend/src/components/MkPaginationControl.vue

@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div :class="$style.root">
 	<div :class="$style.control">
-		<MkSelect v-model="order" :class="$style.order" :items="orderDef">
+		<MkSelect v-model="order" :class="$style.order" :items="[{ label: i18n.ts._order.newest, value: 'newest' }, { label: i18n.ts._order.oldest, value: 'oldest' }]">
 			<template #prefix><i class="ti ti-arrows-sort"></i></template>
 		</MkSelect>
 		<MkButton v-if="paginator.canSearch" v-tooltip="i18n.ts.search" iconOnly transparent rounded :active="searchOpened" @click="searchOpened = !searchOpened"><i class="ti ti-search"></i></MkButton>
@@ -45,7 +45,6 @@ import { i18n } from '@/i18n.js';
 import MkSelect from '@/components/MkSelect.vue';
 import MkInput from '@/components/MkInput.vue';
 import { formatDateTimeString } from '@/utility/format-time-string.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 const props = withDefaults(defineProps<{
 	paginator: T;
@@ -59,16 +58,7 @@ const props = withDefaults(defineProps<{
 const searchOpened = ref(false);
 const filterOpened = ref(props.filterOpened);
 
-const {
-	model: order,
-	def: orderDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts._order.newest, value: 'newest' },
-		{ label: i18n.ts._order.oldest, value: 'oldest' },
-	],
-	initialValue: 'newest',
-});
+const order = ref<'newest' | 'oldest'>('newest');
 const date = ref<number | null>(null);
 const q = ref<string | null>(null);
 

packages/frontend/src/components/MkPolkadots.vue

@@ -4,18 +4,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="[$style.root, accented ? $style.accented : null, revered ? $style.revered : null]"/>
+<div :class="[$style.root, accented ? $style.accented : null]"></div>
 </template>
 
 <script lang="ts" setup>
 const props = withDefaults(defineProps<{
 	accented?: boolean;
-	revered?: boolean;
-	height?: number;
 }>(), {
 	accented: false,
-	revered: false,
-	height: 200,
 });
 </script>
 
@@ -31,17 +27,14 @@ const props = withDefaults(defineProps<{
 	--dot-size: 2px;
 	--gap-size: 40px;
 	--offset: calc(var(--gap-size) / 2);
-	--height: v-bind('props.height + "px"');
 
-	height: var(--height);
+	height: 200px;
+	margin-bottom: -200px;
+
 	background-image: linear-gradient(transparent 60%, transparent 100%), radial-gradient(var(--c) var(--dot-size), transparent var(--dot-size)), radial-gradient(var(--c) var(--dot-size), transparent var(--dot-size));
 	background-position: 0 0, 0 0, var(--offset) var(--offset);
 	background-size: 100% 100%, var(--gap-size) var(--gap-size), var(--gap-size) var(--gap-size);
 	mask-image: linear-gradient(to bottom, black 0%, transparent 100%);
 	pointer-events: none;
-
-	&.revered {
-		mask-image: linear-gradient(to top, black 0%, transparent 100%);
-	}
 }
 </style>

packages/frontend/src/components/MkPollEditor.vue

@@ -22,8 +22,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkSwitch v-model="multiple">{{ i18n.ts._poll.canMultipleVote }}</MkSwitch>
 	<section>
 		<div>
-			<MkSelect v-model="expiration" :items="expirationDef" small>
+			<MkSelect v-model="expiration" small>
 				<template #label>{{ i18n.ts._poll.expiration }}</template>
+				<option value="infinite">{{ i18n.ts._poll.infinite }}</option>
+				<option value="at">{{ i18n.ts._poll.at }}</option>
+				<option value="after">{{ i18n.ts._poll.after }}</option>
 			</MkSelect>
 			<section v-if="expiration === 'at'">
 				<MkInput v-model="atDate" small type="date" class="input">
@@ -37,7 +40,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkInput v-model="after" small type="number" :min="1" class="input">
 					<template #label>{{ i18n.ts._poll.duration }}</template>
 				</MkInput>
-				<MkSelect v-model="unit" :items="unitDef" small></MkSelect>
+				<MkSelect v-model="unit" small>
+					<option value="second">{{ i18n.ts._time.second }}</option>
+					<option value="minute">{{ i18n.ts._time.minute }}</option>
+					<option value="hour">{{ i18n.ts._time.hour }}</option>
+					<option value="day">{{ i18n.ts._time.day }}</option>
+				</MkSelect>
 			</section>
 		</div>
 	</section>
@@ -53,7 +61,6 @@ import MkButton from './MkButton.vue';
 import { formatDateTimeString } from '@/utility/format-time-string.js';
 import { addTime } from '@/utility/time.js';
 import { i18n } from '@/i18n.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 export type PollEditorModelValue = {
 	expiresAt: number | null;
@@ -71,32 +78,11 @@ const emit = defineEmits<{
 
 const choices = ref(props.modelValue.choices);
 const multiple = ref(props.modelValue.multiple);
-const {
-	model: expiration,
-	def: expirationDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts._poll.infinite, value: 'infinite' },
-		{ label: i18n.ts._poll.at, value: 'at' },
-		{ label: i18n.ts._poll.after, value: 'after' },
-	],
-	initialValue: 'infinite',
-});
+const expiration = ref('infinite');
 const atDate = ref(formatDateTimeString(addTime(new Date(), 1, 'day'), 'yyyy-MM-dd'));
 const atTime = ref('00:00');
 const after = ref(0);
-const {
-	model: unit,
-	def: unitDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts._time.second, value: 'second' },
-		{ label: i18n.ts._time.minute, value: 'minute' },
-		{ label: i18n.ts._time.hour, value: 'hour' },
-		{ label: i18n.ts._time.day, value: 'day' },
-	],
-	initialValue: 'second',
-});
+const unit = ref('second');
 
 if (props.modelValue.expiresAt) {
 	expiration.value = 'at';

packages/frontend/src/components/MkPositionSelector.vue

@@ -6,15 +6,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div :class="[$style.root]">
 	<div :class="$style.items">
-		<button v-panel class="_button" :class="[$style.item, x === 'left' && y === 'top' ? $style.active : null]" @click="() => { x = 'left'; y = 'top'; }"><i class="ti ti-arrow-up-left"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'center' && y === 'top' ? $style.active : null]" @click="() => { x = 'center'; y = 'top'; }"><i class="ti ti-arrow-up"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'right' && y === 'top' ? $style.active : null]" @click="() => { x = 'right'; y = 'top'; }"><i class="ti ti-arrow-up-right"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'left' && y === 'center' ? $style.active : null]" @click="() => { x = 'left'; y = 'center'; }"><i class="ti ti-arrow-left"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'center' && y === 'center' ? $style.active : null]" @click="() => { x = 'center'; y = 'center'; }"><i class="ti ti-focus-2"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'right' && y === 'center' ? $style.active : null]" @click="() => { x = 'right'; y = 'center'; }"><i class="ti ti-arrow-right"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'left' && y === 'bottom' ? $style.active : null]" @click="() => { x = 'left'; y = 'bottom'; }"><i class="ti ti-arrow-down-left"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'center' && y === 'bottom' ? $style.active : null]" @click="() => { x = 'center'; y = 'bottom'; }"><i class="ti ti-arrow-down"></i></button>
-		<button v-panel class="_button" :class="[$style.item, x === 'right' && y === 'bottom' ? $style.active : null]" @click="() => { x = 'right'; y = 'bottom'; }"><i class="ti ti-arrow-down-right"></i></button>
+		<button class="_button" :class="[$style.item, x === 'left' && y === 'top' ? $style.active : null]" @click="() => { x = 'left'; y = 'top'; }"><i class="ti ti-align-box-left-top"></i></button>
+		<button class="_button" :class="[$style.item, x === 'center' && y === 'top' ? $style.active : null]" @click="() => { x = 'center'; y = 'top'; }"><i class="ti ti-align-box-center-top"></i></button>
+		<button class="_button" :class="[$style.item, x === 'right' && y === 'top' ? $style.active : null]" @click="() => { x = 'right'; y = 'top'; }"><i class="ti ti-align-box-right-top"></i></button>
+		<button class="_button" :class="[$style.item, x === 'left' && y === 'center' ? $style.active : null]" @click="() => { x = 'left'; y = 'center'; }"><i class="ti ti-align-box-left-middle"></i></button>
+		<button class="_button" :class="[$style.item, x === 'center' && y === 'center' ? $style.active : null]" @click="() => { x = 'center'; y = 'center'; }"><i class="ti ti-align-box-center-middle"></i></button>
+		<button class="_button" :class="[$style.item, x === 'right' && y === 'center' ? $style.active : null]" @click="() => { x = 'right'; y = 'center'; }"><i class="ti ti-align-box-right-middle"></i></button>
+		<button class="_button" :class="[$style.item, x === 'left' && y === 'bottom' ? $style.active : null]" @click="() => { x = 'left'; y = 'bottom'; }"><i class="ti ti-align-box-left-bottom"></i></button>
+		<button class="_button" :class="[$style.item, x === 'center' && y === 'bottom' ? $style.active : null]" @click="() => { x = 'center'; y = 'bottom'; }"><i class="ti ti-align-box-center-bottom"></i></button>
+		<button class="_button" :class="[$style.item, x === 'right' && y === 'bottom' ? $style.active : null]" @click="() => { x = 'right'; y = 'bottom'; }"><i class="ti ti-align-box-right-bottom"></i></button>
 	</div>
 </div>
 </template>

packages/frontend/src/components/MkPostForm.vue

@@ -15,9 +15,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div :class="$style.headerLeft">
 			<button v-if="!fixed" :class="$style.cancel" class="_button" @click="cancel"><i class="ti ti-x"></i></button>
 			<button v-click-anime v-tooltip="i18n.ts.switchAccount" :class="$style.account" class="_button" @click="openAccountMenu">
-				<img :class="$style.avatar" :src="(postAccount ?? $i).avatarUrl" style="border-radius: 100%;"/>
+				<MkAvatar :user="postAccount ?? $i" :class="$style.avatar"/>
 			</button>
-			<button v-if="$i.policies.noteDraftLimit > 0" v-tooltip="(postAccount != null && postAccount.id !== $i.id) ? null : i18n.ts.draftsAndScheduledNotes" class="_button" :class="$style.draftButton" :disabled="postAccount != null && postAccount.id !== $i.id" @click="showDraftMenu"><i class="ti ti-list"></i></button>
+			<button v-if="$i.policies.noteDraftLimit > 0" v-tooltip="(postAccount != null && postAccount.id !== $i.id) ? null : i18n.ts.draft" class="_button" :class="$style.draftButton" :disabled="postAccount != null && postAccount.id !== $i.id" @click="showDraftMenu"><i class="ti ti-pencil-minus"></i></button>
 		</div>
 		<div :class="$style.headerRight">
 			<template v-if="!(targetChannel != null && fixed)">
@@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template v-if="posted"></template>
 					<template v-else-if="posting"><MkEllipsis/></template>
 					<template v-else>{{ submitText }}</template>
-					<i style="margin-left: 6px;" :class="submitIcon"></i>
+					<i style="margin-left: 6px;" :class="posted ? 'ti ti-check' : replyTargetNote ? 'ti ti-arrow-back-up' : renoteTargetNote ? 'ti ti-quote' : 'ti ti-send'"></i>
 				</div>
 			</button>
 		</div>
@@ -61,13 +61,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button class="_buttonPrimary" style="padding: 4px; border-radius: 8px;" @click="addVisibleUser"><i class="ti ti-plus ti-fw"></i></button>
 		</div>
 	</div>
-	<MkInfo v-if="scheduledAt != null" :class="$style.scheduledAt">
-		<I18n :src="i18n.ts.scheduleToPostOnX" tag="span">
-			<template #x>
-				<MkTime :time="scheduledAt" :mode="'detail'" style="font-weight: bold;"/>
-			</template>
-		</I18n> - <button class="_textButton" @click="cancelSchedule()">{{ i18n.ts.cancel }}</button>
-	</MkInfo>
 	<MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
 	<div v-show="useCw" :class="$style.cwOuter">
 		<input ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown" @keyup="onKeyup" @compositionend="onCompositionEnd">
@@ -112,7 +105,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { inject, watch, nextTick, onMounted, defineAsyncComponent, provide, shallowRef, ref, computed, useTemplateRef, onUnmounted } from 'vue';
+import { inject, watch, nextTick, onMounted, defineAsyncComponent, provide, shallowRef, ref, computed, useTemplateRef } from 'vue';
 import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import insertTextAtCursor from 'insert-text-at-cursor';
@@ -206,7 +199,6 @@ if (props.initialVisibleUsers) {
 	props.initialVisibleUsers.forEach(u => pushVisibleUser(u));
 }
 const reactionAcceptance = ref(store.s.reactionAcceptance);
-const scheduledAt = ref<number | null>(null);
 const draghover = ref(false);
 const quoteId = ref<string | null>(null);
 const hasNotSpecifiedMentions = ref(false);
@@ -226,10 +218,6 @@ const uploader = useUploader({
 	multiple: true,
 });
 
-onUnmounted(() => {
-	uploader.dispose();
-});
-
 uploader.events.on('itemUploaded', ctx => {
 	files.value.push(ctx.item.uploaded!);
 	uploader.removeItem(ctx.item);
@@ -270,19 +258,13 @@ const placeholder = computed((): string => {
 });
 
 const submitText = computed((): string => {
-	return scheduledAt.value != null
-		? i18n.ts.schedule
-		: renoteTargetNote.value
+	return renoteTargetNote.value
 		? i18n.ts.quote
 		: replyTargetNote.value
 			? i18n.ts.reply
 			: i18n.ts.note;
 });
 
-const submitIcon = computed((): string => {
-	return posted.value ? 'ti ti-check' : scheduledAt.value != null ? 'ti ti-calendar-time' : replyTargetNote.value ? 'ti ti-arrow-back-up' : renoteTargetNote.value ? 'ti ti-quote' : 'ti ti-send';
-});
-
 const textLength = computed((): number => {
 	return (text.value + imeText.value).length;
 });
@@ -428,7 +410,6 @@ function watchForDraft() {
 	watch(localOnly, () => saveDraft());
 	watch(quoteId, () => saveDraft());
 	watch(reactionAcceptance, () => saveDraft());
-	watch(scheduledAt, () => saveDraft());
 }
 
 function checkMissingMention() {
@@ -586,11 +567,11 @@ async function toggleReactionAcceptance() {
 	const select = await os.select({
 		title: i18n.ts.reactionAcceptance,
 		items: [
-			{ value: null, label: i18n.ts.all },
-			{ value: 'likeOnlyForRemote' as const, label: i18n.ts.likeOnlyForRemote },
-			{ value: 'nonSensitiveOnly' as const, label: i18n.ts.nonSensitiveOnly },
-			{ value: 'nonSensitiveOnlyForLocalLikeOnlyForRemote' as const, label: i18n.ts.nonSensitiveOnlyForLocalLikeOnlyForRemote },
-			{ value: 'likeOnly' as const, label: i18n.ts.likeOnly },
+			{ value: null, text: i18n.ts.all },
+			{ value: 'likeOnlyForRemote' as const, text: i18n.ts.likeOnlyForRemote },
+			{ value: 'nonSensitiveOnly' as const, text: i18n.ts.nonSensitiveOnly },
+			{ value: 'nonSensitiveOnlyForLocalLikeOnlyForRemote' as const, text: i18n.ts.nonSensitiveOnlyForLocalLikeOnlyForRemote },
+			{ value: 'likeOnly' as const, text: i18n.ts.likeOnly },
 		],
 		default: reactionAcceptance.value,
 	});
@@ -620,13 +601,7 @@ function showOtherSettings() {
 		action: () => {
 			toggleReactionAcceptance();
 		},
-	}, ...($i.policies.scheduledNoteLimit > 0 ? [{
-		icon: 'ti ti-calendar-time',
-		text: i18n.ts.schedulePost + '...',
-		action: () => {
-			schedule();
-		},
-	}] : []), { type: 'divider' }, {
+	}, { type: 'divider' }, {
 		type: 'switch',
 		icon: 'ti ti-eye',
 		text: i18n.ts.preview,
@@ -675,7 +650,6 @@ function clear() {
 	files.value = [];
 	poll.value = null;
 	quoteId.value = null;
-	scheduledAt.value = null;
 }
 
 function onKeydown(ev: KeyboardEvent) {
@@ -831,7 +805,6 @@ function saveDraft() {
 			...( visibleUsers.value.length > 0 ? { visibleUserIds: visibleUsers.value.map(x => x.id) } : {}),
 			quoteId: quoteId.value,
 			reactionAcceptance: reactionAcceptance.value,
-			scheduledAt: scheduledAt.value,
 		},
 	};
 
@@ -846,9 +819,7 @@ function deleteDraft() {
 	miLocalStorage.setItem('drafts', JSON.stringify(draftData));
 }
 
-async function saveServerDraft(options: {
-	isActuallyScheduled?: boolean;
-} = {}) {
+async function saveServerDraft(clearLocal = false) {
 	return await os.apiWithDialog(serverDraftId.value == null ? 'notes/drafts/create' : 'notes/drafts/update', {
 		...(serverDraftId.value == null ? {} : { draftId: serverDraftId.value }),
 		text: text.value,
@@ -856,15 +827,19 @@ async function saveServerDraft(options: {
 		visibility: visibility.value,
 		localOnly: localOnly.value,
 		hashtag: hashtags.value,
-		fileIds: files.value.map(f => f.id),
+		...(files.value.length > 0 ? { fileIds: files.value.map(f => f.id) } : {}),
 		poll: poll.value,
-		visibleUserIds: visibleUsers.value.map(x => x.id),
-		renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : quoteId.value ? quoteId.value : null,
-		replyId: replyTargetNote.value ? replyTargetNote.value.id : null,
-		channelId: targetChannel.value ? targetChannel.value.id : null,
+		...(visibleUsers.value.length > 0 ? { visibleUserIds: visibleUsers.value.map(x => x.id) } : {}),
+		renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : quoteId.value ? quoteId.value : undefined,
+		replyId: replyTargetNote.value ? replyTargetNote.value.id : undefined,
+		channelId: targetChannel.value ? targetChannel.value.id : undefined,
 		reactionAcceptance: reactionAcceptance.value,
-		scheduledAt: scheduledAt.value,
-		isActuallyScheduled: options.isActuallyScheduled ?? false,
+	}).then(() => {
+		if (clearLocal) {
+			clear();
+			deleteDraft();
+		}
+	}).catch((err) => {
 	});
 }
 
@@ -899,21 +874,6 @@ async function post(ev?: MouseEvent) {
 		}
 	}
 
-	if (scheduledAt.value != null) {
-		if (uploader.items.value.some(x => x.uploaded == null)) {
-			await uploadFiles();
-
-			// アップロード失敗したものがあったら中止
-			if (uploader.items.value.some(x => x.uploaded == null)) {
-				return;
-			}
-		}
-
-		await postAsScheduled();
-		clear();
-		return;
-	}
-
 	if (props.mock) return;
 
 	if (visibility.value === 'public' && (
@@ -1085,14 +1045,6 @@ async function post(ev?: MouseEvent) {
 	});
 }
 
-async function postAsScheduled() {
-	if (props.mock) return;
-
-	await saveServerDraft({
-		isActuallyScheduled: true,
-	});
-}
-
 function cancel() {
 	emit('cancel');
 }
@@ -1187,10 +1139,8 @@ function showPerUploadItemMenuViaContextmenu(item: UploaderItem, ev: MouseEvent)
 }
 
 function showDraftMenu(ev: MouseEvent) {
-	function showDraftsDialog(scheduled: boolean) {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNoteDraftsDialog.vue')), {
-			scheduled,
-		}, {
+	function showDraftsDialog() {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNoteDraftsDialog.vue')), {}, {
 			restore: async (draft: Misskey.entities.NoteDraft) => {
 				text.value = draft.text ?? '';
 				useCw.value = draft.cw != null;
@@ -1221,7 +1171,6 @@ function showDraftMenu(ev: MouseEvent) {
 				renoteTargetNote.value = draft.renote;
 				replyTargetNote.value = draft.reply;
 				reactionAcceptance.value = draft.reactionAcceptance;
-				scheduledAt.value = draft.scheduledAt ?? null;
 				if (draft.channel) targetChannel.value = draft.channel as unknown as Misskey.entities.Channel;
 
 				visibleUsers.value = [];
@@ -1262,32 +1211,11 @@ function showDraftMenu(ev: MouseEvent) {
 		text: i18n.ts._drafts.listDrafts,
 		icon: 'ti ti-cloud-download',
 		action: () => {
-			showDraftsDialog(false);
-		},
-	}, { type: 'divider' }, {
-		type: 'button',
-		text: i18n.ts._drafts.listScheduledNotes,
-		icon: 'ti ti-clock-down',
-		action: () => {
-			showDraftsDialog(true);
+			showDraftsDialog();
 		},
 	}], (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
 }
 
-async function schedule() {
-	const { canceled, result } = await os.inputDatetime({
-		title: i18n.ts.schedulePost,
-	});
-	if (canceled) return;
-	if (result.getTime() <= Date.now()) return;
-
-	scheduledAt.value = result.getTime();
-}
-
-function cancelSchedule() {
-	scheduledAt.value = null;
-}
-
 onMounted(() => {
 	if (props.autofocus) {
 		focus();
@@ -1323,7 +1251,6 @@ onMounted(() => {
 				}
 				quoteId.value = draft.data.quoteId;
 				reactionAcceptance.value = draft.data.reactionAcceptance;
-				scheduledAt.value = draft.data.scheduledAt ?? null;
 			}
 		}
 
@@ -1373,7 +1300,6 @@ async function canClose() {
 
 defineExpose({
 	clear,
-	abortUploader: () => uploader.abortAll(),
 	canClose,
 });
 </script>
@@ -1588,10 +1514,6 @@ html[data-color-scheme=light] .preview {
 	margin: 0 20px 16px 20px;
 }
 
-.scheduledAt {
-	margin: 0 20px 16px 20px;
-}
-
 .cw,
 .hashtags,
 .text {

packages/frontend/src/components/MkPostFormDialog.vue

@@ -54,7 +54,6 @@ function onPosted() {
 async function _close() {
 	const canClose = await form.value?.canClose();
 	if (!canClose) return;
-	form.value?.abortUploader();
 	modal.value?.close();
 }
 

packages/frontend/src/components/MkRoleSelectDialog.vue

@@ -102,12 +102,12 @@ async function addRole() {
 	const items = roles.value
 		.filter(r => r.isPublic)
 		.filter(r => !selectedRoleIds.value.includes(r.id))
-		.map(r => ({ label: r.name, value: r.id }));
+		.map(r => ({ text: r.name, value: r }));
 
-	const { canceled, result: roleId } = await os.select({ items });
-	if (canceled || roleId == null) return;
+	const { canceled, result: role } = await os.select({ items });
+	if (canceled || role == null) return;
 
-	selectedRoleIds.value.push(roleId);
+	selectedRoleIds.value.push(role.id);
 }
 
 async function removeRole(roleId: string) {

packages/frontend/src/components/MkSelect.vue

@@ -40,41 +40,46 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts">
-export type OptionValue = string | number | null;
-
-export type ItemOption<T extends OptionValue = OptionValue> = {
+type ItemOption = {
 	type?: 'option';
-	value: T;
+	value: string | number | null;
 	label: string;
 };
 
-export type ItemGroup<T extends OptionValue = OptionValue> = {
+type ItemGroup = {
 	type: 'group';
-	label?: string;
-	items: ItemOption<T>[];
+	label: string;
+	items: ItemOption[];
 };
 
-export type MkSelectItem<T extends OptionValue = OptionValue> = ItemOption<T> | ItemGroup<T>;
+export type MkSelectItem = ItemOption | ItemGroup;
 
-export type GetMkSelectValueType<T extends MkSelectItem> = T extends ItemGroup
-	? T['items'][number]['value']
-	: T extends ItemOption
-		? T['value']
-		: never;
-
-export type GetMkSelectValueTypesFromDef<T extends MkSelectItem[]> = T[number] extends MkSelectItem
-	? GetMkSelectValueType<T[number]>
+type ValuesOfItems<T> = T extends (infer U)[]
+	? U extends { type: 'group'; items: infer V }
+		? V extends (infer W)[]
+			? W extends { value: infer X }
+				? X
+				: never
+			: never
+		: U extends { value: infer Y }
+			? Y
+			: never
 	: never;
 </script>
 
-<script lang="ts" setup generic="const ITEMS extends MkSelectItem[], MODELT extends OptionValue">
-import { onMounted, nextTick, ref, watch, computed, toRefs } from 'vue';
+<script lang="ts" setup generic="T extends MkSelectItem[]">
+import { onMounted, nextTick, ref, watch, computed, toRefs, useSlots } from 'vue';
 import { useInterval } from '@@/js/use-interval.js';
+import type { VNode, VNodeChild } from 'vue';
 import type { MenuItem } from '@/types/menu.js';
 import * as os from '@/os.js';
 
+// TODO: itemsをslot内のoptionで指定する用法は廃止する(props.itemsを必須化する)
+// see: https://github.com/misskey-dev/misskey/issues/15558
+// あと型推論と相性が良くない
+
 const props = defineProps<{
-	items: ITEMS;
+	modelValue: ValuesOfItems<T>;
 	required?: boolean;
 	readonly?: boolean;
 	disabled?: boolean;
@@ -83,17 +88,16 @@ const props = defineProps<{
 	inline?: boolean;
 	small?: boolean;
 	large?: boolean;
+	items?: T;
 }>();
 
-type ModelTChecked = MODELT & (
-	MODELT extends GetMkSelectValueTypesFromDef<ITEMS>
-	? unknown
-	: 'Error: The type of model does not match the type of items.'
-);
+const emit = defineEmits<{
+	(ev: 'update:modelValue', value: ValuesOfItems<T>): void;
+}>();
 
-const model = defineModel<ModelTChecked>({ required: true });
+const slots = useSlots();
 
-const { autofocus } = toRefs(props);
+const { modelValue, autofocus } = toRefs(props);
 const focused = ref(false);
 const opening = ref(false);
 const currentValueText = ref<string | null>(null);
@@ -136,18 +140,19 @@ onMounted(() => {
 	});
 });
 
-watch([model, () => props.items], () => {
+watch([modelValue, () => props.items], () => {
+	if (props.items) {
 		let found: ItemOption | null = null;
 		for (const item of props.items) {
 			if (item.type === 'group') {
 				for (const option of item.items) {
-				if (option.value === model.value) {
+					if (option.value === modelValue.value) {
 						found = option;
 						break;
 					}
 				}
 			} else {
-			if (item.value === model.value) {
+				if (item.value === modelValue.value) {
 					found = item;
 					break;
 				}
@@ -156,6 +161,31 @@ watch([model, () => props.items], () => {
 		if (found) {
 			currentValueText.value = found.label;
 		}
+		return;
+	}
+
+	const scanOptions = (options: VNodeChild[]) => {
+		for (const vnode of options) {
+			if (typeof vnode !== 'object' || vnode === null || Array.isArray(vnode)) continue;
+			if (vnode.type === 'optgroup') {
+				const optgroup = vnode;
+				if (Array.isArray(optgroup.children)) scanOptions(optgroup.children);
+			} else if (Array.isArray(vnode.children)) { // 何故かフラグメントになってくることがある
+				const fragment = vnode;
+				if (Array.isArray(fragment.children)) scanOptions(fragment.children);
+			} else if (vnode.props == null) { // v-if で条件が false のときにこうなる
+				// nop?
+			} else {
+				const option = vnode;
+				if (option.props?.value === modelValue.value) {
+					currentValueText.value = option.children as string;
+					break;
+				}
+			}
+		}
+	};
+
+	scanOptions(slots.default!());
 }, { immediate: true, deep: true });
 
 function show() {
@@ -166,33 +196,69 @@ function show() {
 
 	const menu: MenuItem[] = [];
 
+	if (props.items) {
 		for (const item of props.items) {
 			if (item.type === 'group') {
-			if (item.label != null) {
 				menu.push({
 					type: 'label',
 					text: item.label,
 				});
-			}
 				for (const option of item.items) {
 					menu.push({
 						text: option.label,
-					active: computed(() => model.value === option.value),
+						active: computed(() => modelValue.value === option.value),
 						action: () => {
-						model.value = option.value as ModelTChecked;
+							emit('update:modelValue', option.value);
 						},
 					});
 				}
 			} else {
 				menu.push({
 					text: item.label,
-				active: computed(() => model.value === item.value),
+					active: computed(() => modelValue.value === item.value),
 					action: () => {
-					model.value = item.value as ModelTChecked;
+						emit('update:modelValue', item.value);
 					},
 				});
 			}
 		}
+	} else {
+		let options = slots.default!();
+
+		const pushOption = (option: VNode) => {
+			menu.push({
+				text: option.children as string,
+				active: computed(() => modelValue.value === option.props?.value),
+				action: () => {
+					emit('update:modelValue', option.props?.value);
+				},
+			});
+		};
+
+		const scanOptions = (options: VNodeChild[]) => {
+			for (const vnode of options) {
+				if (typeof vnode !== 'object' || vnode === null || Array.isArray(vnode)) continue;
+				if (vnode.type === 'optgroup') {
+					const optgroup = vnode;
+					menu.push({
+						type: 'label',
+						text: optgroup.props?.label,
+					});
+					if (Array.isArray(optgroup.children)) scanOptions(optgroup.children);
+				} else if (Array.isArray(vnode.children)) { // 何故かフラグメントになってくることがある
+					const fragment = vnode;
+					if (Array.isArray(fragment.children)) scanOptions(fragment.children);
+				} else if (vnode.props == null) { // v-if で条件が false のときにこうなる
+					// nop?
+				} else {
+					const option = vnode;
+					pushOption(option);
+				}
+			}
+		};
+
+		scanOptions(options);
+	}
 
 	os.popupMenu(menu, container.value, {
 		width: container.value?.offsetWidth,

packages/frontend/src/components/MkUploaderItems.vue

@@ -10,10 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		:key="item.id"
 		v-panel
 		:class="[$style.item, { [$style.itemWaiting]: item.preprocessing, [$style.itemCompleted]: item.uploaded, [$style.itemFailed]: item.uploadFailed }]"
-		:style="{
-			'--p': item.progress != null ? `${item.progress.value / item.progress.max * 100}%` : '0%',
-			'--pp': item.preprocessProgress != null ? `${item.preprocessProgress * 100}%` : '100%',
-		}"
+		:style="{ '--p': item.progress != null ? `${item.progress.value / item.progress.max * 100}%` : '0%' }"
 		@contextmenu.prevent.stop="onContextmenu(item, $event)"
 	>
 		<div :class="$style.itemInner">
@@ -22,15 +19,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div :class="$style.itemThumbnail" :style="{ backgroundImage: `url(${ item.thumbnail })` }" @click="onThumbnailClick(item, $event)"></div>
 			<div :class="$style.itemBody">
-				<div>
-					<i v-if="item.isSensitive" style="color: var(--MI_THEME-warn); margin-right: 0.5em;" class="ti ti-eye-exclamation"></i>
-					<MkCondensedLine :minScale="2 / 3">{{ item.name }}</MkCondensedLine>
-				</div>
+				<div><i v-if="item.isSensitive" style="color: var(--MI_THEME-warn); margin-right: 0.5em;" class="ti ti-eye-exclamation"></i><MkCondensedLine :minScale="2 / 3">{{ item.name }}</MkCondensedLine></div>
 				<div :class="$style.itemInfo">
 					<span>{{ item.file.type }}</span>
 					<span v-if="item.compressedSize">({{ i18n.tsx._uploader.compressedToX({ x: bytes(item.compressedSize) }) }} = {{ i18n.tsx._uploader.savedXPercent({ x: Math.round((1 - item.compressedSize / item.file.size) * 100) }) }})</span>
 					<span v-else>{{ bytes(item.file.size) }}</span>
-					<span v-if="item.preprocessing">{{ i18n.ts.preprocessing }}<MkLoading inline em style="margin-left: 0.5em;"/></span>
 				</div>
 				<div>
 				</div>
@@ -104,7 +97,7 @@ function onThumbnailClick(item: UploaderItem, ev: MouseEvent) {
 			position: absolute;
 			top: 0;
 			left: 0;
-			width: var(--pp, 100%);
+			width: 100%;
 			height: 100%;
 			background: linear-gradient(-45deg, transparent 25%, var(--c) 25%,var(--c) 50%, transparent 50%, transparent 75%, var(--c) 75%, var(--c));
 			background-size: 25px 25px;

packages/frontend/src/components/MkWatermarkEditorDialog.Layer.vue

@@ -18,18 +18,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			></MkPositionSelector>
 		</FormSlot>
 
-		<MkRange
-			:modelValue="layer.align.margin ?? 0"
-			:min="0"
-			:max="0.25"
-			:step="0.01"
-			:textConverter="(v) => (v * 100).toFixed(1) + '%'"
-			continuousUpdate
-			@update:modelValue="(v) => (layer as Extract<WatermarkPreset['layers'][number], { type: 'text' }>).align.margin = v"
-		>
-			<template #label>{{ i18n.ts._watermarkEditor.margin }}</template>
-		</MkRange>
-
 		<MkRange
 			v-model="layer.scale"
 			:min="0"
@@ -78,18 +66,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			></MkPositionSelector>
 		</FormSlot>
 
-		<MkRange
-			:modelValue="layer.align.margin ?? 0"
-			:min="0"
-			:max="0.25"
-			:step="0.01"
-			:textConverter="(v) => (v * 100).toFixed(1) + '%'"
-			continuousUpdate
-			@update:modelValue="(v) => (layer as Extract<WatermarkPreset['layers'][number], { type: 'image' }>).align.margin = v"
-		>
-			<template #label>{{ i18n.ts._watermarkEditor.margin }}</template>
-		</MkRange>
-
 		<MkRange
 			v-model="layer.scale"
 			:min="0"
@@ -131,55 +107,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkSwitch>
 	</template>
 
-	<template v-else-if="layer.type === 'qr'">
-		<MkInput v-model="layer.data" debounce>
-			<template #label>{{ i18n.ts._watermarkEditor.text }}</template>
-			<template #caption>{{ i18n.ts._watermarkEditor.leaveBlankToAccountUrl }}</template>
-		</MkInput>
-
-		<FormSlot>
-			<template #label>{{ i18n.ts._watermarkEditor.position }}</template>
-			<MkPositionSelector
-				v-model:x="layer.align.x"
-				v-model:y="layer.align.y"
-			></MkPositionSelector>
-		</FormSlot>
-
-		<MkRange
-			:modelValue="layer.align.margin ?? 0"
-			:min="0"
-			:max="0.25"
-			:step="0.01"
-			:textConverter="(v) => (v * 100).toFixed(1) + '%'"
-			continuousUpdate
-			@update:modelValue="(v) => (layer as Extract<WatermarkPreset['layers'][number], { type: 'qr' }>).align.margin = v"
-		>
-			<template #label>{{ i18n.ts._watermarkEditor.margin }}</template>
-		</MkRange>
-
-		<MkRange
-			v-model="layer.scale"
-			:min="0"
-			:max="1"
-			:step="0.01"
-			:textConverter="(v) => (v * 100).toFixed(1) + '%'"
-			continuousUpdate
-		>
-			<template #label>{{ i18n.ts._watermarkEditor.scale }}</template>
-		</MkRange>
-
-		<MkRange
-			v-model="layer.opacity"
-			:min="0"
-			:max="1"
-			:step="0.01"
-			:textConverter="(v) => (v * 100).toFixed(1) + '%'"
-			continuousUpdate
-		>
-			<template #label>{{ i18n.ts._watermarkEditor.opacity }}</template>
-		</MkRange>
-	</template>
-
 	<template v-else-if="layer.type === 'stripe'">
 		<MkRange
 			v-model="layer.frequency"

packages/frontend/src/components/MkWatermarkEditorDialog.vue

@@ -30,12 +30,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div :class="$style.controls">
 				<div class="_spacer _gaps">
-					<div class="_gaps_s">
+					<MkSelect v-model="type" :items="[{ label: i18n.ts._watermarkEditor.text, value: 'text' }, { label: i18n.ts._watermarkEditor.image, value: 'image' }, { label: i18n.ts._watermarkEditor.advanced, value: 'advanced' }]">
+						<template #label>{{ i18n.ts._watermarkEditor.type }}</template>
+					</MkSelect>
+
+					<div v-if="type === 'text' || type === 'image'">
+						<XLayer
+							v-for="(layer, i) in preset.layers"
+							:key="layer.id"
+							v-model:layer="preset.layers[i]"
+						></XLayer>
+					</div>
+					<div v-else-if="type === 'advanced'" class="_gaps_s">
 						<MkFolder v-for="(layer, i) in preset.layers" :key="layer.id" :defaultOpen="false" :canPage="false">
 							<template #label>
 								<div v-if="layer.type === 'text'">{{ i18n.ts._watermarkEditor.text }}</div>
 								<div v-if="layer.type === 'image'">{{ i18n.ts._watermarkEditor.image }}</div>
-								<div v-if="layer.type === 'qr'">{{ i18n.ts._watermarkEditor.qr }}</div>
 								<div v-if="layer.type === 'stripe'">{{ i18n.ts._watermarkEditor.stripe }}</div>
 								<div v-if="layer.type === 'polkadot'">{{ i18n.ts._watermarkEditor.polkadot }}</div>
 								<div v-if="layer.type === 'checker'">{{ i18n.ts._watermarkEditor.checker }}</div>
@@ -76,7 +86,6 @@ import * as os from '@/os.js';
 import { deepClone } from '@/utility/clone.js';
 import { ensureSignin } from '@/i.js';
 import { genId } from '@/utility/id.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 const $i = ensureSignin();
 
@@ -85,7 +94,7 @@ function createTextLayer(): WatermarkPreset['layers'][number] {
 		id: genId(),
 		type: 'text',
 		text: `(c) @${$i.username}`,
-		align: { x: 'right', y: 'bottom', margin: 0 },
+		align: { x: 'right', y: 'bottom' },
 		scale: 0.3,
 		angle: 0,
 		opacity: 0.75,
@@ -99,7 +108,7 @@ function createImageLayer(): WatermarkPreset['layers'][number] {
 		type: 'image',
 		imageId: null,
 		imageUrl: null,
-		align: { x: 'right', y: 'bottom', margin: 0 },
+		align: { x: 'right', y: 'bottom' },
 		scale: 0.3,
 		angle: 0,
 		opacity: 0.75,
@@ -108,17 +117,6 @@ function createImageLayer(): WatermarkPreset['layers'][number] {
 	};
 }
 
-function createQrLayer(): WatermarkPreset['layers'][number] {
-	return {
-		id: genId(),
-		type: 'qr',
-		data: '',
-		align: { x: 'right', y: 'bottom', margin: 0 },
-		scale: 0.3,
-		opacity: 1,
-	};
-}
-
 function createStripeLayer(): WatermarkPreset['layers'][number] {
 	return {
 		id: genId(),
@@ -166,7 +164,7 @@ const props = defineProps<{
 const preset = reactive<WatermarkPreset>(deepClone(props.preset) ?? {
 	id: genId(),
 	name: '',
-	layers: [],
+	layers: [createTextLayer()],
 });
 
 const emit = defineEmits<{
@@ -188,6 +186,17 @@ async function cancel() {
 	dialog.value?.close();
 }
 
+const type = ref(preset.layers.length > 1 ? 'advanced' : preset.layers[0].type);
+watch(type, () => {
+	if (type.value === 'text') {
+		preset.layers = [createTextLayer()];
+	} else if (type.value === 'image') {
+		preset.layers = [createImageLayer()];
+	} else if (type.value === 'advanced') {
+		// nop
+	}
+});
+
 watch(preset, async (newValue, oldValue) => {
 	if (renderer != null) {
 		renderer.setLayers(preset.layers);
@@ -317,11 +326,6 @@ function addLayer(ev: MouseEvent) {
 		action: () => {
 			preset.layers.push(createImageLayer());
 		},
-	}, {
-		text: i18n.ts._watermarkEditor.qr,
-		action: () => {
-			preset.layers.push(createQrLayer());
-		},
 	}, {
 		text: i18n.ts._watermarkEditor.stripe,
 		action: () => {

packages/frontend/src/components/MkWidgets.vue

@@ -7,8 +7,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div :class="$style.root">
 	<template v-if="edit">
 		<header :class="$style.editHeader">
-			<MkSelect v-model="widgetAdderSelected" :items="widgetAdderSelectedDef" style="margin-bottom: var(--MI-margin)" data-cy-widget-select>
+			<MkSelect v-model="widgetAdderSelected" style="margin-bottom: var(--MI-margin)" data-cy-widget-select>
 				<template #label>{{ i18n.ts.selectWidget }}</template>
+				<option v-for="widget in _widgetDefs" :key="widget" :value="widget">{{ i18n.ts._widgets[widget] }}</option>
 			</MkSelect>
 			<MkButton inline primary data-cy-widget-add @click="addWidget"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
 			<MkButton inline @click="emit('exit')">{{ i18n.ts.close }}</MkButton>
@@ -58,7 +59,6 @@ import { widgets as widgetDefs, federationWidgets } from '@/widgets/index.js';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
 
@@ -89,15 +89,7 @@ const widgetRefs = {};
 const configWidget = (id: string) => {
 	widgetRefs[id].configure();
 };
-
-const {
-	model: widgetAdderSelected,
-	def: widgetAdderSelectedDef,
-} = useMkSelect({
-	items: computed(() => [{ label: i18n.ts.none, value: null }, ..._widgetDefs.value.map(x => ({ label: i18n.ts._widgets[x], value: x }))]),
-	initialValue: null,
-});
-
+const widgetAdderSelected = ref<string | null>(null);
 const addWidget = () => {
 	if (widgetAdderSelected.value == null) return;
 

packages/frontend/src/components/global/MkAd.stories.impl.ts

@@ -75,7 +75,6 @@ const common = {
 			place: '',
 			imageUrl: '',
 			dayOfWeek: 7,
-			isSensitive: false,
 		},
 	},
 	parameters: {

packages/frontend/src/composables/use-mkselect.ts

@@ -1,38 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { ref } from 'vue';
-import type { Ref, MaybeRefOrGetter } from 'vue';
-import type { MkSelectItem, OptionValue, GetMkSelectValueTypesFromDef } from '@/components/MkSelect.vue';
-
-type UnwrapReadonlyItems<T> = T extends readonly (infer U)[] ? U[] : T;
-
-/** 指定したオプション定義をもとに型を狭めたrefを生成するコンポーサブル */
-export function useMkSelect<
-	const TItemsInput extends MaybeRefOrGetter<MkSelectItem[]>,
-	const TItems extends TItemsInput extends MaybeRefOrGetter<infer U> ? U : never,
-	TInitialValue extends OptionValue | void = void,
-	TItemsValue = GetMkSelectValueTypesFromDef<UnwrapReadonlyItems<TItems>>,
-	ModelType = TInitialValue extends void
-		? TItemsValue
-		: (TItemsValue | TInitialValue)
->(opts: {
-	items: TItemsInput;
-	initialValue?: (TInitialValue | (OptionValue extends TItemsValue ? OptionValue : TInitialValue)) & (
-		TItemsValue extends TInitialValue
-			? unknown
-			: { 'Error: Type of initialValue must include all types of items': TItemsValue }
-	);
-}): {
-	def: TItemsInput;
-	model: Ref<ModelType>;
-} {
-	const model = ref(opts.initialValue ?? null);
-
-	return {
-		def: opts.items,
-		model: model as Ref<ModelType>,
-	};
-}

packages/frontend/src/composables/use-uploader.ts

@@ -43,12 +43,6 @@ const IMAGE_EDITING_SUPPORTED_TYPES = [
 	'image/webp',
 ];
 
-const VIDEO_COMPRESSION_SUPPORTED_TYPES = [ // TODO
-	'video/mp4',
-	'video/quicktime',
-	'video/x-matroska',
-];
-
 const WATERMARK_SUPPORTED_TYPES = IMAGE_EDITING_SUPPORTED_TYPES;
 
 const IMAGE_PREPROCESS_NEEDED_TYPES = [
@@ -57,10 +51,6 @@ const IMAGE_PREPROCESS_NEEDED_TYPES = [
 	...IMAGE_EDITING_SUPPORTED_TYPES,
 ];
 
-const VIDEO_PREPROCESS_NEEDED_TYPES = [
-	...VIDEO_COMPRESSION_SUPPORTED_TYPES,
-];
-
 const mimeTypeMap = {
 	'image/webp': 'webp',
 	'image/jpeg': 'jpg',
@@ -74,7 +64,6 @@ export type UploaderItem = {
 	progress: { max: number; value: number } | null;
 	thumbnail: string | null;
 	preprocessing: boolean;
-	preprocessProgress: number | null;
 	uploading: boolean;
 	uploaded: Misskey.entities.DriveFile | null;
 	uploadFailed: boolean;
@@ -87,7 +76,6 @@ export type UploaderItem = {
 	isSensitive?: boolean;
 	caption?: string | null;
 	abort?: (() => void) | null;
-	abortPreprocess?: (() => void) | null;
 };
 
 function getCompressionSettings(level: 0 | 1 | 2 | 3) {
@@ -141,12 +129,11 @@ export function useUploader(options: {
 			progress: null,
 			thumbnail: THUMBNAIL_SUPPORTED_TYPES.includes(file.type) ? window.URL.createObjectURL(file) : null,
 			preprocessing: false,
-			preprocessProgress: null,
 			uploading: false,
 			aborted: false,
 			uploaded: null,
 			uploadFailed: false,
-			compressionLevel: IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultImageCompressionLevel : VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultVideoCompressionLevel : 0,
+			compressionLevel: prefer.s.defaultImageCompressionLevel,
 			watermarkPresetId: uploaderFeatures.value.watermark && $i.policies.watermarkAvailable ? prefer.s.defaultWatermarkPresetId : null,
 			file: markRaw(file),
 		});
@@ -331,7 +318,7 @@ export function useUploader(options: {
 		}
 
 		if (
-			(IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(item.file.type) || VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(item.file.type)) &&
+			IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(item.file.type) &&
 			!item.preprocessing &&
 			!item.uploading &&
 			!item.uploaded
@@ -404,19 +391,6 @@ export function useUploader(options: {
 					removeItem(item);
 				},
 			});
-		} else if (item.preprocessing && item.abortPreprocess != null) {
-			menu.push({
-				type: 'divider',
-			}, {
-				icon: 'ti ti-player-stop',
-				text: i18n.ts.abort,
-				danger: true,
-				action: () => {
-					if (item.abortPreprocess != null) {
-						item.abortPreprocess();
-					}
-				},
-			});
 		} else if (item.uploading) {
 			menu.push({
 				type: 'divider',
@@ -500,10 +474,6 @@ export function useUploader(options: {
 				continue;
 			}
 
-			if (item.abortPreprocess != null) {
-				item.abortPreprocess();
-			}
-
 			if (item.abort != null) {
 				item.abort();
 			}
@@ -514,30 +484,18 @@ export function useUploader(options: {
 
 	async function preprocess(item: UploaderItem): Promise<void> {
 		item.preprocessing = true;
-		item.preprocessProgress = null;
 
-		if (IMAGE_PREPROCESS_NEEDED_TYPES.includes(item.file.type)) {
 		try {
+			if (IMAGE_PREPROCESS_NEEDED_TYPES.includes(item.file.type)) {
 				await preprocessForImage(item);
+			}
 		} catch (err) {
 			console.error('Failed to preprocess image', err);
 
 			// nop
 		}
-		}
-
-		if (VIDEO_PREPROCESS_NEEDED_TYPES.includes(item.file.type)) {
-			try {
-				await preprocessForVideo(item);
-			} catch (err) {
-				console.error('Failed to preprocess video', err);
-
-				// nop
-			}
-		}
 
 		item.preprocessing = false;
-		item.preprocessProgress = null;
 	}
 
 	async function preprocessForImage(item: UploaderItem): Promise<void> {
@@ -606,74 +564,10 @@ export function useUploader(options: {
 		item.preprocessedFile = markRaw(preprocessedFile);
 	}
 
-	async function preprocessForVideo(item: UploaderItem): Promise<void> {
-		let preprocessedFile: Blob | File = item.file;
-
-		const needsCompress = item.compressionLevel !== 0 && VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(preprocessedFile.type);
-
-		if (needsCompress) {
-			const mediabunny = await import('mediabunny');
-
-			const source = new mediabunny.BlobSource(preprocessedFile);
-
-			const input = new mediabunny.Input({
-				source,
-				formats: mediabunny.ALL_FORMATS,
-			});
-
-			const output = new mediabunny.Output({
-				target: new mediabunny.BufferTarget(),
-				format: new mediabunny.Mp4OutputFormat(),
-			});
-
-			const currentConversion = await mediabunny.Conversion.init({
-				input,
-				output,
-				video: {
-					//width: 320, // Height will be deduced automatically to retain aspect ratio
-					bitrate: item.compressionLevel === 1 ? mediabunny.QUALITY_VERY_HIGH : item.compressionLevel === 2 ? mediabunny.QUALITY_MEDIUM : mediabunny.QUALITY_VERY_LOW,
-				},
-				audio: {
-					bitrate: item.compressionLevel === 1 ? mediabunny.QUALITY_VERY_HIGH : item.compressionLevel === 2 ? mediabunny.QUALITY_MEDIUM : mediabunny.QUALITY_VERY_LOW,
-				},
-			});
-
-			currentConversion.onProgress = newProgress => item.preprocessProgress = newProgress;
-
-			item.abortPreprocess = () => {
-				item.abortPreprocess = null;
-				currentConversion.cancel();
-				item.preprocessing = false;
-				item.preprocessProgress = null;
-			};
-
-			await currentConversion.execute();
-
-			item.abortPreprocess = null;
-
-			preprocessedFile = new Blob([output.target.buffer!], { type: output.format.mimeType });
-			item.compressedSize = output.target.buffer!.byteLength;
-			item.uploadName = `${item.name}.mp4`;
-		} else {
-			item.compressedSize = null;
-			item.uploadName = item.name;
-		}
-
-		if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
-		item.thumbnail = THUMBNAIL_SUPPORTED_TYPES.includes(preprocessedFile.type) ? window.URL.createObjectURL(preprocessedFile) : null;
-		item.preprocessedFile = markRaw(preprocessedFile);
-	}
-
-	function dispose() {
+	onUnmounted(() => {
 		for (const item of items.value) {
 			if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
 		}
-
-		abortAll();
-	}
-
-	onUnmounted(() => {
-		dispose();
 	});
 
 	return {
@@ -681,7 +575,6 @@ export function useUploader(options: {
 		addFiles,
 		removeItem,
 		abortAll,
-		dispose,
 		upload,
 		getMenu,
 		uploading: computed(() => items.value.some(item => item.uploading)),

packages/frontend/src/drag-and-drop.ts

@@ -23,15 +23,6 @@ export function setDragData<T extends keyof DragDataMap>(
 	event.dataTransfer.setData(`misskey/${type}`.toLowerCase(), JSON.stringify(data));
 }
 
-export function setPlainDragData(
-	event: DragEvent,
-	data: string,
-) {
-	if (event.dataTransfer == null) return;
-
-	event.dataTransfer.setData('text/plain', data);
-}
-
 export function getDragData<T extends keyof DragDataMap>(
 	event: DragEvent,
 	type: T,
@@ -44,17 +35,6 @@ export function getDragData<T extends keyof DragDataMap>(
 	return JSON.parse(data);
 }
 
-export function getPlainDragData(
-	event: DragEvent,
-): string | null {
-	if (event.dataTransfer == null) return null;
-
-	const data = event.dataTransfer.getData('text/plain');
-	if (data == null || data === '') return null;
-
-	return data;
-}
-
 export function checkDragDataType(
 	event: DragEvent,
 	types: (keyof DragDataMap)[],

packages/frontend/src/navbar.ts

@@ -66,12 +66,6 @@ export const navbarItemDef = reactive({
 			lookup();
 		},
 	},
-	qr: {
-		title: i18n.ts.qr,
-		icon: 'ti ti-qrcode',
-		show: computed(() => $i != null),
-		to: '/qr',
-	},
 	lists: {
 		title: i18n.ts.lists,
 		icon: 'ti ti-list',
@@ -117,7 +111,7 @@ export const navbarItemDef = reactive({
 		to: '/channels',
 	},
 	chat: {
-		title: i18n.ts.directMessage_short,
+		title: i18n.ts.chat,
 		icon: 'ti ti-messages',
 		to: '/chat',
 		show: computed(() => $i != null && $i.policies.chatAvailability !== 'unavailable'),

packages/frontend/src/os.ts

@@ -14,7 +14,6 @@ import type { Form, GetFormResultType } from '@/utility/form.js';
 import type { MenuItem } from '@/types/menu.js';
 import type { PostFormProps } from '@/types/post-form.js';
 import type { UploaderFeatures } from '@/composables/use-uploader.js';
-import type { MkSelectItem, OptionValue } from '@/components/MkSelect.vue';
 import type MkRoleSelectDialog_TypeReferenceOnly from '@/components/MkRoleSelectDialog.vue';
 import type MkEmojiPickerDialog_TypeReferenceOnly from '@/components/MkEmojiPickerDialog.vue';
 import { misskeyApi } from '@/utility/misskey-api.js';
@@ -76,7 +75,7 @@ export const apiWithDialog = (<E extends keyof Misskey.Endpoints>(
 		} else if (err.code === 'ROLE_PERMISSION_DENIED') {
 			title = i18n.ts.permissionDeniedError;
 			text = i18n.ts.permissionDeniedErrorDescription;
-		} else if (err.code.startsWith('TOO_MANY')) { // TODO: バックエンドに kind: client/contentsLimitExceeded みたいな感じで送るように統一してもらってそれで判定する
+		} else if (err.code.startsWith('TOO_MANY')) {
 			title = i18n.ts.youCannotCreateAnymore;
 			text = `${i18n.ts.error}: ${err.id}`;
 		} else if (err.message.startsWith('Unexpected token')) {
@@ -460,7 +459,7 @@ export function inputNumber(props: {
 	});
 }
 
-export function inputDatetime(props: {
+export function inputDate(props: {
 	title?: string;
 	text?: string;
 	placeholder?: string | null;
@@ -475,13 +474,13 @@ export function inputDatetime(props: {
 			title: props.title,
 			text: props.text,
 			input: {
-				type: 'datetime-local',
+				type: 'date',
 				placeholder: props.placeholder,
 				default: props.default ?? null,
 			},
 		}, {
 			done: result => {
-				resolve(result != null && result.result != null ? { result: new Date(result.result), canceled: false } : { result: undefined, canceled: true });
+				resolve(result ? { result: new Date(result.result), canceled: false } : { result: undefined, canceled: true });
 			},
 			closed: () => dispose(),
 		});
@@ -503,15 +502,50 @@ export function authenticateDialog(): Promise<{
 	});
 }
 
-export function select<C extends OptionValue, D extends C | null = null>(props: {
+type SelectItem<C> = {
+	value: C;
+	text: string;
+};
+
+// default が指定されていたら result は null になり得ないことを保証する overload function
+export function select<C = unknown>(props: {
 	title?: string;
 	text?: string;
-	default?: D;
-	items: (MkSelectItem<C> | undefined)[];
+	default: string;
+	items: (SelectItem<C> | {
+		sectionTitle: string;
+		items: SelectItem<C>[];
+	} | undefined)[];
 }): Promise<{
 	canceled: true; result: undefined;
 } | {
-	canceled: false; result: Exclude<D, undefined> extends null ? C | null : C;
+	canceled: false; result: C;
+}>;
+export function select<C = unknown>(props: {
+	title?: string;
+	text?: string;
+	default?: string | null;
+	items: (SelectItem<C> | {
+		sectionTitle: string;
+		items: SelectItem<C>[];
+	} | undefined)[];
+}): Promise<{
+	canceled: true; result: undefined;
+} | {
+	canceled: false; result: C | null;
+}>;
+export function select<C = unknown>(props: {
+	title?: string;
+	text?: string;
+	default?: string | null;
+	items: (SelectItem<C> | {
+		sectionTitle: string;
+		items: SelectItem<C>[];
+	} | undefined)[];
+}): Promise<{
+	canceled: true; result: undefined;
+} | {
+	canceled: false; result: C | null;
 }> {
 	return new Promise(resolve => {
 		const { dispose } = popup(MkDialog, {

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

@@ -11,10 +11,56 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<template #label>{{ i18n.ts.host }}</template>
 		</MkInput>
 		<FormSplit style="margin-top: var(--MI-margin);">
-			<MkSelect v-model="state" :items="stateDef">
+			<MkSelect v-model="state">
 				<template #label>{{ i18n.ts.state }}</template>
+				<option value="all">{{ i18n.ts.all }}</option>
+				<option value="federating">{{ i18n.ts.federating }}</option>
+				<option value="subscribing">{{ i18n.ts.subscribing }}</option>
+				<option value="publishing">{{ i18n.ts.publishing }}</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>
 			</MkSelect>
-			<MkSelect v-model="sort" :items="sortDef">
+			<MkSelect
+				v-model="sort" :items="[{
+					label: `${i18n.ts.pubSub} (${i18n.ts.descendingOrder})`,
+					value: '+pubSub',
+				}, {
+					label: `${i18n.ts.pubSub} (${i18n.ts.ascendingOrder})`,
+					value: '-pubSub',
+				}, {
+					label: `${i18n.ts.notes} (${i18n.ts.descendingOrder})`,
+					value: '+notes',
+				}, {
+					label: `${i18n.ts.notes} (${i18n.ts.ascendingOrder})`,
+					value: '-notes',
+				}, {
+					label: `${i18n.ts.users} (${i18n.ts.descendingOrder})`,
+					value: '+users',
+				}, {
+					label: `${i18n.ts.users} (${i18n.ts.ascendingOrder})`,
+					value: '-users',
+				}, {
+					label: `${i18n.ts.following} (${i18n.ts.descendingOrder})`,
+					value: '+following',
+				}, {
+					label: `${i18n.ts.following} (${i18n.ts.ascendingOrder})`,
+					value: '-following',
+				}, {
+					label: `${i18n.ts.followers} (${i18n.ts.descendingOrder})`,
+					value: '+followers',
+				}, {
+					label: `${i18n.ts.followers} (${i18n.ts.ascendingOrder})`,
+					value: '-followers',
+				}, {
+					label: `${i18n.ts.registeredAt} (${i18n.ts.descendingOrder})`,
+					value: '+firstRetrievedAt',
+				}, {
+					label: `${i18n.ts.registeredAt} (${i18n.ts.ascendingOrder})`,
+					value: '-firstRetrievedAt',
+				}]"
+			>
 				<template #label>{{ i18n.ts.sort }}</template>
 			</MkSelect>
 		</FormSplit>
@@ -39,46 +85,11 @@ import MkPagination from '@/components/MkPagination.vue';
 import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
 import FormSplit from '@/components/form/split.vue';
 import { i18n } from '@/i18n.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import { Paginator } from '@/utility/paginator.js';
 
 const host = ref('');
-const {
-	model: state,
-	def: stateDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'all' },
-		{ label: i18n.ts.federating, value: 'federating' },
-		{ label: i18n.ts.subscribing, value: 'subscribing' },
-		{ label: i18n.ts.publishing, value: 'publishing' },
-		{ label: i18n.ts.suspended, value: 'suspended' },
-		{ label: i18n.ts.silence, value: 'silenced' },
-		{ label: i18n.ts.blocked, value: 'blocked' },
-		{ label: i18n.ts.notResponding, value: 'notResponding' },
-	],
-	initialValue: 'federating',
-});
-const {
-	model: sort,
-	def: sortDef,
-} = useMkSelect({
-	items: [
-		{ label: `${i18n.ts.pubSub} (${i18n.ts.descendingOrder})`, value: '+pubSub' },
-		{ label: `${i18n.ts.pubSub} (${i18n.ts.ascendingOrder})`, value: '-pubSub' },
-		{ label: `${i18n.ts.notes} (${i18n.ts.descendingOrder})`, value: '+notes' },
-		{ label: `${i18n.ts.notes} (${i18n.ts.ascendingOrder})`, value: '-notes' },
-		{ label: `${i18n.ts.users} (${i18n.ts.descendingOrder})`, value: '+users' },
-		{ label: `${i18n.ts.users} (${i18n.ts.ascendingOrder})`, value: '-users' },
-		{ label: `${i18n.ts.following} (${i18n.ts.descendingOrder})`, value: '+following' },
-		{ label: `${i18n.ts.following} (${i18n.ts.ascendingOrder})`, value: '-following' },
-		{ label: `${i18n.ts.followers} (${i18n.ts.descendingOrder})`, value: '+followers' },
-		{ label: `${i18n.ts.followers} (${i18n.ts.ascendingOrder})`, value: '-followers' },
-		{ label: `${i18n.ts.registeredAt} (${i18n.ts.descendingOrder})`, value: '+firstRetrievedAt' },
-		{ label: `${i18n.ts.registeredAt} (${i18n.ts.ascendingOrder})`, value: '-firstRetrievedAt' },
-	],
-	initialValue: '+pubSub',
-});
+const state = ref('federating');
+const sort = ref<NonNullable<Misskey.entities.FederationInstancesRequest['sort']>>('+pubSub');
 const paginator = markRaw(new Paginator('federation/instances', {
 	limit: 10,
 	offsetMode: true,

packages/frontend/src/pages/admin-user.vue

@@ -153,15 +153,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-else-if="tab === 'announcements'" class="_gaps">
 			<MkButton primary rounded @click="createAnnouncement"><i class="ti ti-plus"></i> {{ i18n.ts.new }}</MkButton>
 
-			<MkSelect v-model="announcementsStatus" :items="announcementsStatusDef">
+			<MkSelect v-model="announcementsStatus">
 				<template #label>{{ i18n.ts.filter }}</template>
+				<option value="active">{{ i18n.ts.active }}</option>
+				<option value="archived">{{ i18n.ts.archived }}</option>
 			</MkSelect>
 
 			<MkPagination :paginator="announcementsPaginator">
 				<template #default="{ items }">
 					<div class="_gaps_s">
 						<div v-for="announcement in items" :key="announcement.id" v-panel :class="$style.announcementItem" @click="editAnnouncement(announcement)">
-							<span v-if="'icon' in announcement" style="margin-right: 0.5em;">
+							<span style="margin-right: 0.5em;">
 								<i v-if="announcement.icon === 'info'" class="ti ti-info-circle"></i>
 								<i v-else-if="announcement.icon === 'warning'" class="ti ti-alert-triangle" style="color: var(--MI_THEME-warn);"></i>
 								<i v-else-if="announcement.icon === 'error'" class="ti ti-circle-x" style="color: var(--MI_THEME-error);"></i>
@@ -182,7 +184,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-else-if="tab === 'chart'" class="_gaps_m">
 			<div class="cmhjzshm">
 				<div class="selects">
-					<MkSelect v-model="chartSrc" :items="chartSrcDef" style="margin: 0 10px 0 0; flex: 1;">
+					<MkSelect v-model="chartSrc" style="margin: 0 10px 0 0; flex: 1;">
+						<option value="per-user-notes">{{ i18n.ts.notes }}</option>
 					</MkSelect>
 				</div>
 				<div class="charts">
@@ -226,7 +229,6 @@ import { misskeyApi } from '@/utility/misskey-api.js';
 import { acct } from '@/filters/user.js';
 import { definePage } from '@/page.js';
 import { i18n } from '@/i18n.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import { ensureSignin, iAmAdmin, iAmModerator } from '@/i.js';
 import MkRolePreview from '@/components/MkRolePreview.vue';
 import MkPagination from '@/components/MkPagination.vue';
@@ -245,15 +247,7 @@ const props = withDefaults(defineProps<{
 const result = await _fetch_();
 
 const tab = ref(props.initialTab);
-const {
-	model: chartSrc,
-	def: chartSrcDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.notes, value: 'per-user-notes' },
-],
-	initialValue: 'per-user-notes',
-});
+const chartSrc = ref<ChartSrc>('per-user-notes');
 const user = ref(result.user);
 const info = ref(result.info);
 const ips = ref(result.ips);
@@ -270,16 +264,7 @@ const filesPaginator = markRaw(new Paginator('admin/drive/files', {
 	})),
 }));
 
-const {
-	model: announcementsStatus,
-	def: announcementsStatusDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.active, value: 'active' },
-		{ label: i18n.ts.archived, value: 'archived' },
-	],
-	initialValue: 'active',
-});
+const announcementsStatus = ref<'active' | 'archived'>('active');
 
 const announcementsPaginator = markRaw(new Paginator('admin/announcements/list', {
 	limit: 10,
@@ -443,22 +428,22 @@ async function assignRole() {
 
 	const { canceled, result: roleId } = await os.select({
 		title: i18n.ts._role.chooseRoleToAssign,
-		items: roles.map(r => ({ label: r.name, value: r.id })),
+		items: roles.map(r => ({ text: r.name, value: r.id })),
 	});
 	if (canceled || roleId == null) return;
 
 	const { canceled: canceled2, result: period } = await os.select({
 		title: i18n.ts.period + ': ' + roles.find(r => r.id === roleId)!.name,
 		items: [{
-			value: 'indefinitely', label: i18n.ts.indefinitely,
+			value: 'indefinitely', text: i18n.ts.indefinitely,
 		}, {
-			value: 'oneHour', label: i18n.ts.oneHour,
+			value: 'oneHour', text: i18n.ts.oneHour,
 		}, {
-			value: 'oneDay', label: i18n.ts.oneDay,
+			value: 'oneDay', text: i18n.ts.oneDay,
 		}, {
-			value: 'oneWeek', label: i18n.ts.oneWeek,
+			value: 'oneWeek', text: i18n.ts.oneWeek,
 		}, {
-			value: 'oneMonth', label: i18n.ts.oneMonth,
+			value: 'oneMonth', text: i18n.ts.oneMonth,
 		}],
 		default: 'indefinitely',
 	});

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

@@ -6,7 +6,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div class="_gaps">
 	<div :class="$style.header">
-		<MkSelect v-model="type" :items="typeDef" :class="$style.typeSelect">
+		<MkSelect v-model="type" :class="$style.typeSelect">
+			<option value="isLocal">{{ i18n.ts._role._condition.isLocal }}</option>
+			<option value="isRemote">{{ i18n.ts._role._condition.isRemote }}</option>
+			<option value="isSuspended">{{ i18n.ts._role._condition.isSuspended }}</option>
+			<option value="isLocked">{{ i18n.ts._role._condition.isLocked }}</option>
+			<option value="isBot">{{ i18n.ts._role._condition.isBot }}</option>
+			<option value="isCat">{{ i18n.ts._role._condition.isCat }}</option>
+			<option value="isExplorable">{{ i18n.ts._role._condition.isExplorable }}</option>
+			<option value="roleAssignedTo">{{ i18n.ts._role._condition.roleAssignedTo }}</option>
+			<option value="createdLessThan">{{ i18n.ts._role._condition.createdLessThan }}</option>
+			<option value="createdMoreThan">{{ i18n.ts._role._condition.createdMoreThan }}</option>
+			<option value="followersLessThanOrEq">{{ i18n.ts._role._condition.followersLessThanOrEq }}</option>
+			<option value="followersMoreThanOrEq">{{ i18n.ts._role._condition.followersMoreThanOrEq }}</option>
+			<option value="followingLessThanOrEq">{{ i18n.ts._role._condition.followingLessThanOrEq }}</option>
+			<option value="followingMoreThanOrEq">{{ i18n.ts._role._condition.followingMoreThanOrEq }}</option>
+			<option value="notesLessThanOrEq">{{ i18n.ts._role._condition.notesLessThanOrEq }}</option>
+			<option value="notesMoreThanOrEq">{{ i18n.ts._role._condition.notesMoreThanOrEq }}</option>
+			<option value="and">{{ i18n.ts._role._condition.and }}</option>
+			<option value="or">{{ i18n.ts._role._condition.or }}</option>
+			<option value="not">{{ i18n.ts._role._condition.not }}</option>
 		</MkSelect>
 		<button v-if="draggable" class="drag-handle _button" :class="$style.dragHandle">
 			<i class="ti ti-menu-2"></i>
@@ -39,7 +58,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkInput v-else-if="['followersLessThanOrEq', 'followersMoreThanOrEq', 'followingLessThanOrEq', 'followingMoreThanOrEq', 'notesLessThanOrEq', 'notesMoreThanOrEq'].includes(type)" v-model="v.value" type="number">
 	</MkInput>
 
-	<MkSelect v-else-if="type === 'roleAssignedTo'" v-model="v.roleId" :items="assignedToDef">
+	<MkSelect v-else-if="type === 'roleAssignedTo'" v-model="v.roleId">
+		<option v-for="role in roles.filter(r => r.target === 'manual')" :key="role.id" :value="role.id">{{ role.name }}</option>
 	</MkSelect>
 </div>
 </template>
@@ -49,7 +69,6 @@ import { computed, defineAsyncComponent, ref, watch } from 'vue';
 import { genId } from '@/utility/id.js';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
-import type { GetMkSelectValueTypesFromDef, MkSelectItem } from '@/components/MkSelect.vue';
 import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n.js';
 import { deepClone } from '@/utility/clone.js';
@@ -80,29 +99,7 @@ watch(v, () => {
 	emit('update:modelValue', v.value);
 }, { deep: true });
 
-const typeDef = [
-	{ label: i18n.ts._role._condition.isLocal, value: 'isLocal' },
-	{ label: i18n.ts._role._condition.isRemote, value: 'isRemote' },
-	{ label: i18n.ts._role._condition.isSuspended, value: 'isSuspended' },
-	{ label: i18n.ts._role._condition.isLocked, value: 'isLocked' },
-	{ label: i18n.ts._role._condition.isBot, value: 'isBot' },
-	{ label: i18n.ts._role._condition.isCat, value: 'isCat' },
-	{ label: i18n.ts._role._condition.isExplorable, value: 'isExplorable' },
-	{ label: i18n.ts._role._condition.roleAssignedTo, value: 'roleAssignedTo' },
-	{ label: i18n.ts._role._condition.createdLessThan, value: 'createdLessThan' },
-	{ label: i18n.ts._role._condition.createdMoreThan, value: 'createdMoreThan' },
-	{ label: i18n.ts._role._condition.followersLessThanOrEq, value: 'followersLessThanOrEq' },
-	{ label: i18n.ts._role._condition.followersMoreThanOrEq, value: 'followersMoreThanOrEq' },
-	{ label: i18n.ts._role._condition.followingLessThanOrEq, value: 'followingLessThanOrEq' },
-	{ label: i18n.ts._role._condition.followingMoreThanOrEq, value: 'followingMoreThanOrEq' },
-	{ label: i18n.ts._role._condition.notesLessThanOrEq, value: 'notesLessThanOrEq' },
-	{ label: i18n.ts._role._condition.notesMoreThanOrEq, value: 'notesMoreThanOrEq' },
-	{ label: i18n.ts._role._condition.and, value: 'and' },
-	{ label: i18n.ts._role._condition.or, value: 'or' },
-	{ label: i18n.ts._role._condition.not, value: 'not' },
-] as const satisfies MkSelectItem[];
-
-const type = computed<GetMkSelectValueTypesFromDef<typeof typeDef>>({
+const type = computed({
 	get: () => v.value.type,
 	set: (t) => {
 		if (t === 'and') v.value.values = [];
@@ -121,8 +118,6 @@ const type = computed<GetMkSelectValueTypesFromDef<typeof typeDef>>({
 	},
 });
 
-const assignedToDef = computed(() => roles.filter(r => r.target === 'manual').map(r => ({ label: r.name, value: r.id })) satisfies MkSelectItem[]);
-
 function addValue() {
 	v.value.values.push({ id: genId(), type: 'isRemote' });
 }

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

@@ -22,19 +22,27 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkInput v-model="title">
 					<template #label>{{ i18n.ts.title }}</template>
 				</MkInput>
-				<MkSelect v-model="method" :items="methodDef">
+				<MkSelect v-model="method">
 					<template #label>{{ i18n.ts._abuseReport._notificationRecipient.recipientType }}</template>
+					<option value="email">{{ i18n.ts._abuseReport._notificationRecipient._recipientType.mail }}</option>
+					<option value="webhook">{{ i18n.ts._abuseReport._notificationRecipient._recipientType.webhook }}</option>
 					<template #caption>
 						{{ methodCaption }}
 					</template>
 				</MkSelect>
 				<div>
-					<MkSelect v-if="method === 'email'" v-model="userId" :items="userIdDef">
+					<MkSelect v-if="method === 'email'" v-model="userId">
 						<template #label>{{ i18n.ts._abuseReport._notificationRecipient.notifiedUser }}</template>
+						<option v-for="user in moderators" :key="user.id" :value="user.id">
+							{{ user.name ? `${user.name}(${user.username})` : user.username }}
+						</option>
 					</MkSelect>
 					<div v-else-if="method === 'webhook'" :class="$style.systemWebhook">
-						<MkSelect v-model="systemWebhookId" :items="systemWebhookIdDef" style="flex: 1">
+						<MkSelect v-model="systemWebhookId" style="flex: 1">
 							<template #label>{{ i18n.ts._abuseReport._notificationRecipient.notifiedWebhook }}</template>
+							<option v-for="webhook in systemWebhooks" :key="webhook.id ?? undefined" :value="webhook.id">
+								{{ webhook.name }}
+							</option>
 						</MkSelect>
 						<MkButton rounded :class="$style.systemWebhookEditButton" @click="onEditSystemWebhookClicked">
 							<span v-if="systemWebhookId === null" class="ti ti-plus" style="line-height: normal"/>
@@ -71,13 +79,14 @@ import MkModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n.js';
 import MkInput from '@/components/MkInput.vue';
 import { misskeyApi } from '@/utility/misskey-api.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import MkSelect from '@/components/MkSelect.vue';
 import { showSystemWebhookEditorDialog } from '@/components/MkSystemWebhookEditor.impl.js';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkDivider from '@/components/MkDivider.vue';
 import * as os from '@/os.js';
 
+type NotificationRecipientMethod = 'email' | 'webhook';
+
 const emit = defineEmits<{
 	(ev: 'submitted'): void;
 	(ev: 'canceled'): void;
@@ -96,28 +105,9 @@ const dialogEl = useTemplateRef('dialogEl');
 const loading = ref<number>(0);
 
 const title = ref<string>('');
-const {
-	model: method,
-	def: methodDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts._abuseReport._notificationRecipient._recipientType.mail, value: 'email' },
-		{ label: i18n.ts._abuseReport._notificationRecipient._recipientType.webhook, value: 'webhook' },
-	],
-	initialValue: 'email',
-});
-const {
-	model: userId,
-	def: userIdDef,
-} = useMkSelect({
-	items: computed(() => moderators.value.map(u => ({ label: u.name ? `${u.name}(${u.username})` : u.username, value: u.id as string | null }))),
-});
-const {
-	model: systemWebhookId,
-	def: systemWebhookIdDef,
-} = useMkSelect({
-	items: computed(() => systemWebhooks.value.map(w => ({ label: w.name, value: w.id }))),
-});
+const method = ref<NotificationRecipientMethod>('email');
+const userId = ref<string | null>(null);
+const systemWebhookId = ref<string | null>(null);
 const isActive = ref<boolean>(true);
 
 const moderators = ref<entities.User[]>([]);

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

@@ -13,8 +13,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkButton>
 			</div>
 			<div :class="$style.subMenus" class="_gaps_s">
-				<MkSelect v-model="filterMethod" :items="filterMethodDef" style="flex: 1">
+				<MkSelect v-model="filterMethod" style="flex: 1">
 					<template #label>{{ i18n.ts._abuseReport._notificationRecipient.recipientType }}</template>
+					<option :value="null">-</option>
+					<option :value="'email'">{{ i18n.ts._abuseReport._notificationRecipient._recipientType.mail }}</option>
+					<option :value="'webhook'">{{ i18n.ts._abuseReport._notificationRecipient._recipientType.webhook }}</option>
 				</MkSelect>
 				<MkInput v-model="filterText" type="search" style="flex: 1">
 					<template #label>{{ i18n.ts._abuseReport._notificationRecipient.keywords }}</template>
@@ -48,21 +51,10 @@ import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
 import MkDivider from '@/components/MkDivider.vue';
 import { i18n } from '@/i18n.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 const recipients = ref<entities.AbuseReportNotificationRecipient[]>([]);
 
-const {
-	model: filterMethod,
-	def: filterMethodDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: null },
-		{ label: i18n.ts._abuseReport._notificationRecipient._recipientType.mail, value: 'email' },
-		{ label: i18n.ts._abuseReport._notificationRecipient._recipientType.webhook, value: 'webhook' },
-	],
-	initialValue: null,
-});
+const filterMethod = ref<string | null>(null);
 const filterText = ref<string>('');
 
 const filteredRecipients = computed(() => {

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

@@ -16,14 +16,23 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkTip>
 
 			<div :class="$style.inputs" class="_gaps">
-				<MkSelect v-model="state" :items="stateDef" style="margin: 0; flex: 1;">
+				<MkSelect v-model="state" style="margin: 0; flex: 1;">
 					<template #label>{{ i18n.ts.state }}</template>
+					<option value="all">{{ i18n.ts.all }}</option>
+					<option value="unresolved">{{ i18n.ts.unresolved }}</option>
+					<option value="resolved">{{ i18n.ts.resolved }}</option>
 				</MkSelect>
-				<MkSelect v-model="targetUserOrigin" :items="targetUserOriginDef" style="margin: 0; flex: 1;">
+				<MkSelect v-model="targetUserOrigin" style="margin: 0; flex: 1;">
 					<template #label>{{ i18n.ts.reporteeOrigin }}</template>
+					<option value="combined">{{ i18n.ts.all }}</option>
+					<option value="local">{{ i18n.ts.local }}</option>
+					<option value="remote">{{ i18n.ts.remote }}</option>
 				</MkSelect>
-				<MkSelect v-model="reporterOrigin" :items="reporterOriginDef" style="margin: 0; flex: 1;">
+				<MkSelect v-model="reporterOrigin" style="margin: 0; flex: 1;">
 					<template #label>{{ i18n.ts.reporterOrigin }}</template>
+					<option value="combined">{{ i18n.ts.all }}</option>
+					<option value="local">{{ i18n.ts.local }}</option>
+					<option value="remote">{{ i18n.ts.remote }}</option>
 				</MkSelect>
 			</div>
 
@@ -55,44 +64,13 @@ import MkPagination from '@/components/MkPagination.vue';
 import XAbuseReport from '@/components/MkAbuseReport.vue';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import MkButton from '@/components/MkButton.vue';
 import { store } from '@/store.js';
 import { Paginator } from '@/utility/paginator.js';
 
-const {
-	model: state,
-	def: stateDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'all' },
-		{ label: i18n.ts.unresolved, value: 'unresolved' },
-		{ label: i18n.ts.resolved, value: 'resolved' },
-	],
-	initialValue: 'unresolved',
-});
-const {
-	model: reporterOrigin,
-	def: reporterOriginDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'combined' },
-		{ label: i18n.ts.local, value: 'local' },
-		{ label: i18n.ts.remote, value: 'remote' },
-	],
-	initialValue: 'combined',
-});
-const {
-	model: targetUserOrigin,
-	def: targetUserOriginDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'combined' },
-		{ label: i18n.ts.local, value: 'local' },
-		{ label: i18n.ts.remote, value: 'remote' },
-	],
-	initialValue: 'combined',
-});
+const state = ref('unresolved');
+const reporterOrigin = ref('combined');
+const targetUserOrigin = ref('combined');
 const searchUsername = ref('');
 const searchHost = ref('');
 

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

@@ -6,29 +6,27 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <PageWithHeader :actions="headerActions" :tabs="headerTabs">
 	<div class="_spacer" style="--MI_SPACER-w: 900px;">
-		<MkSelect v-model="filterType" :items="filterTypeDef" :class="$style.input" @update:modelValue="filterItems">
+		<MkSelect v-model="filterType" :class="$style.input" @update:modelValue="filterItems">
 			<template #label>{{ i18n.ts.state }}</template>
+			<option value="all">{{ i18n.ts.all }}</option>
+			<option value="publishing">{{ i18n.ts.publishing }}</option>
+			<option value="expired">{{ i18n.ts.expired }}</option>
 		</MkSelect>
-
 		<div>
 			<div v-for="ad in ads" class="_panel _gaps_m" :class="$style.ad">
 				<MkAd v-if="ad.url" :key="ad.id" :specify="ad"/>
-
 				<MkInput v-model="ad.url" type="url">
 					<template #label>URL</template>
 				</MkInput>
-
 				<MkInput v-model="ad.imageUrl" type="url">
 					<template #label>{{ i18n.ts.imageUrl }}</template>
 				</MkInput>
-
 				<MkRadios v-model="ad.place">
 					<template #label>Form</template>
 					<option value="square">square</option>
 					<option value="horizontal">horizontal</option>
 					<option value="horizontal-big">horizontal-big</option>
 				</MkRadios>
-
 				<!--
 			<div style="margin: 32px 0;">
 				{{ i18n.ts.priority }}
@@ -37,7 +35,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkRadio v-model="ad.priority" value="low">{{ i18n.ts.low }}</MkRadio>
 			</div>
 			-->
-
 				<FormSplit>
 					<MkInput v-model="ad.ratio" type="number">
 						<template #label>{{ i18n.ts.ratio }}</template>
@@ -49,11 +46,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #label>{{ i18n.ts.expiration }}</template>
 					</MkInput>
 				</FormSplit>
-
-				<MkSwitch v-model="ad.isSensitive">
-					<template #label>{{ i18n.ts.sensitive }}</template>
-				</MkSwitch>
-
 				<MkFolder>
 					<template #label>{{ i18n.ts.advancedSettings }}</template>
 					<span>
@@ -67,11 +59,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</span>
 				</MkFolder>
-
 				<MkTextarea v-model="ad.memo">
 					<template #label>{{ i18n.ts.memo }}</template>
 				</MkTextarea>
-
 				<div class="_buttons">
 					<MkButton inline primary style="margin-right: 12px;" @click="save(ad)">
 						<i
@@ -83,7 +73,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkButton>
 				</div>
 			</div>
-
 			<MkButton @click="more()">
 				<i class="ti ti-reload"></i>{{ i18n.ts.more }}
 			</MkButton>
@@ -102,12 +91,10 @@ import MkRadios from '@/components/MkRadios.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import FormSplit from '@/components/form/split.vue';
-import MkSwitch from '@/components/MkSwitch.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 const ads = ref<Misskey.entities.Ad[]>([]);
 
@@ -115,17 +102,7 @@ const ads = ref<Misskey.entities.Ad[]>([]);
 const localTime = new Date();
 const localTimeDiff = localTime.getTimezoneOffset() * 60 * 1000;
 const daysOfWeek: string[] = [i18n.ts._weekday.sunday, i18n.ts._weekday.monday, i18n.ts._weekday.tuesday, i18n.ts._weekday.wednesday, i18n.ts._weekday.thursday, i18n.ts._weekday.friday, i18n.ts._weekday.saturday];
-const {
-	model: filterType,
-	def: filterTypeDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'all' },
-		{ label: i18n.ts.publishing, value: 'publishing' },
-		{ label: i18n.ts.expired, value: 'expired' },
-	],
-	initialValue: 'all',
-});
+const filterType = ref('all');
 let publishing: boolean | null = null;
 
 misskeyApi('admin/ad/list', { publishing: publishing }).then(adsResponse => {
@@ -144,7 +121,7 @@ misskeyApi('admin/ad/list', { publishing: publishing }).then(adsResponse => {
 	}
 });
 
-const filterItems = (v: typeof filterType.value) => {
+const filterItems = (v) => {
 	if (v === 'publishing') {
 		publishing = true;
 	} else if (v === 'expired') {
@@ -157,7 +134,7 @@ const filterItems = (v: typeof filterType.value) => {
 };
 
 // 選択された曜日(index)のビットフラグを操作する
-function toggleDayOfWeek(ad: Misskey.entities.Ad, index: number) {
+function toggleDayOfWeek(ad, index) {
 	ad.dayOfWeek ^= 1 << index;
 }
 
@@ -173,11 +150,10 @@ function add() {
 		expiresAt: new Date().toISOString(),
 		startsAt: new Date().toISOString(),
 		dayOfWeek: 0,
-		isSensitive: false,
 	});
 }
 
-function remove(ad: Misskey.entities.Ad) {
+function remove(ad) {
 	os.confirm({
 		type: 'warning',
 		text: i18n.tsx.removeAreYouSure({ x: ad.url }),
@@ -193,7 +169,7 @@ function remove(ad: Misskey.entities.Ad) {
 	});
 }
 
-function save(ad: Misskey.entities.Ad) {
+function save(ad) {
 	if (ad.id === '') {
 		misskeyApi('admin/ad/create', {
 			...ad,

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

@@ -10,8 +10,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkInfo>{{ i18n.ts._announcement.shouldNotBeUsedToPresentPermanentInfo }}</MkInfo>
 			<MkInfo v-if="announcements.length > 5" warn>{{ i18n.ts._announcement.tooManyActiveAnnouncementDescription }}</MkInfo>
 
-			<MkSelect v-model="announcementsStatus" :items="announcementsStatusDef">
+			<MkSelect v-model="announcementsStatus">
 				<template #label>{{ i18n.ts.filter }}</template>
+				<option value="active">{{ i18n.ts.active }}</option>
+				<option value="archived">{{ i18n.ts.archived }}</option>
 			</MkSelect>
 
 			<MkLoading v-if="loading"/>
@@ -96,18 +98,8 @@ import { definePage } from '@/page.js';
 import MkFolder from '@/components/MkFolder.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 import { genId } from '@/utility/id.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
-const {
-	model: announcementsStatus,
-	def: announcementsStatusDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.active, value: 'active' },
-		{ label: i18n.ts.archived, value: 'archived' },
-	],
-	initialValue: 'active',
-});
+const announcementsStatus = ref<'active' | 'archived'>('active');
 
 const loading = ref(true);
 const loadingMore = ref(false);

packages/frontend/src/pages/admin/custom-emojis-manager.local.list.search.vue

@@ -56,24 +56,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkInput>
 					<MkSelect
 						v-model="model.sensitive"
-						:items="[
-							{ label: '-', value: null },
-							{ label: 'true', value: 'true' },
-							{ label: 'false', value: 'false' },
-						]"
 					>
 						<template #label>sensitive</template>
+						<option :value="null">-</option>
+						<option :value="true">true</option>
+						<option :value="false">false</option>
 					</MkSelect>
 
 					<MkSelect
 						v-model="model.localOnly"
-						:items="[
-							{ label: '-', value: null },
-							{ label: 'true', value: 'true' },
-							{ label: 'false', value: 'false' },
-						]"
 					>
 						<template #label>localOnly</template>
+						<option :value="null">-</option>
+						<option :value="true">true</option>
+						<option :value="false">false</option>
 					</MkSelect>
 					<MkInput
 						v-model="model.updatedAtFrom"

packages/frontend/src/pages/admin/custom-emojis-manager.register.vue

@@ -12,8 +12,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<template #caption>{{ i18n.ts._customEmojisManager._local._register.uploadSettingDescription }}</template>
 
 			<div class="_gaps">
-				<MkSelect v-model="selectedFolderId" :items="selectedFolderIdDef">
+				<MkSelect v-model="selectedFolderId">
 					<template #label>{{ i18n.ts.uploadFolder }}</template>
+					<option v-for="folder in uploadFolders" :key="folder.id" :value="folder.id">
+						{{ folder.name }}
+					</option>
 				</MkSelect>
 
 				<MkSwitch v-model="directoryToCategory">
@@ -60,7 +63,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script setup lang="ts">
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import * as Misskey from 'misskey-js';
-import { computed, onMounted, ref, useCssModule } from 'vue';
+import { onMounted, ref, useCssModule } from 'vue';
 import type { RequestLogItem } from '@/pages/admin/custom-emojis-manager.impl.js';
 import type { GridCellValidationEvent, GridCellValueChangeEvent, GridEvent } from '@/components/grid/grid-event.js';
 import type { DroppedFile } from '@/utility/file-drop.js';
@@ -84,7 +87,6 @@ import { chooseDriveFile, chooseFileFromPcAndUpload } from '@/utility/drive.js';
 import { extractDroppedItems, flattenDroppedFiles } from '@/utility/file-drop.js';
 import XRegisterLogs from '@/pages/admin/custom-emojis-manager.logs.vue';
 import { copyGridDataToClipboard } from '@/components/grid/grid-utils.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 
 import { prefer } from '@/preferences.js';
 
@@ -227,13 +229,7 @@ function setupGrid(): GridSetting {
 
 const uploadFolders = ref<FolderItem[]>([]);
 const gridItems = ref<GridItem[]>([]);
-const {
-	model: selectedFolderId,
-	def: selectedFolderIdDef,
-} = useMkSelect({
-	items: computed(() => uploadFolders.value.map(folder => ({ label: folder.name, value: folder.id || '' }))),
-	initialValue: prefer.s.uploadFolder,
-});
+const selectedFolderId = ref(prefer.s.uploadFolder);
 const directoryToCategory = ref<boolean>(false);
 const registerButtonDisabled = ref<boolean>(false);
 const requestLogs = ref<RequestLogItem[]>([]);

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

@@ -13,11 +13,31 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #label>{{ i18n.ts.host }}</template>
 				</MkInput>
 				<FormSplit style="margin-top: var(--MI-margin);">
-					<MkSelect v-model="state" :items="stateDef">
+					<MkSelect v-model="state">
 						<template #label>{{ i18n.ts.state }}</template>
+						<option value="all">{{ i18n.ts.all }}</option>
+						<option value="federating">{{ i18n.ts.federating }}</option>
+						<option value="subscribing">{{ i18n.ts.subscribing }}</option>
+						<option value="publishing">{{ i18n.ts.publishing }}</option>
+						<option value="suspended">{{ i18n.ts.suspended }}</option>
+						<option value="blocked">{{ i18n.ts.blocked }}</option>
+						<option value="silenced">{{ i18n.ts.silence }}</option>
+						<option value="notResponding">{{ i18n.ts.notResponding }}</option>
 					</MkSelect>
-					<MkSelect v-model="sort" :items="sortDef">
+					<MkSelect v-model="sort">
 						<template #label>{{ i18n.ts.sort }}</template>
+						<option value="+pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+notes">{{ i18n.ts.notes }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-notes">{{ i18n.ts.notes }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+users">{{ i18n.ts.users }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-users">{{ i18n.ts.users }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+following">{{ i18n.ts.following }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-following">{{ i18n.ts.following }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+followers">{{ i18n.ts.followers }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-followers">{{ i18n.ts.followers }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.ascendingOrder }})</option>
 					</MkSelect>
 				</FormSplit>
 			</div>
@@ -44,46 +64,11 @@ import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue';
 import FormSplit from '@/components/form/split.vue';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import { Paginator } from '@/utility/paginator.js';
 
 const host = ref('');
-const {
-	model: state,
-	def: stateDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'all' },
-		{ label: i18n.ts.federating, value: 'federating' },
-		{ label: i18n.ts.subscribing, value: 'subscribing' },
-		{ label: i18n.ts.publishing, value: 'publishing' },
-		{ label: i18n.ts.suspended, value: 'suspended' },
-		{ label: i18n.ts.blocked, value: 'blocked' },
-		{ label: i18n.ts.silence, value: 'silenced' },
-		{ label: i18n.ts.notResponding, value: 'notResponding' },
-	],
-	initialValue: 'federating',
-});
-const {
-	model: sort,
-	def: sortDef,
-} = useMkSelect({
-	items: [
-		{ label: `${i18n.ts.pubSub} (${i18n.ts.descendingOrder})`, value: '+pubSub' },
-		{ label: `${i18n.ts.pubSub} (${i18n.ts.ascendingOrder})`, value: '-pubSub' },
-		{ label: `${i18n.ts.notes} (${i18n.ts.descendingOrder})`, value: '+notes' },
-		{ label: `${i18n.ts.notes} (${i18n.ts.ascendingOrder})`, value: '-notes' },
-		{ label: `${i18n.ts.users} (${i18n.ts.descendingOrder})`, value: '+users' },
-		{ label: `${i18n.ts.users} (${i18n.ts.ascendingOrder})`, value: '-users' },
-		{ label: `${i18n.ts.following} (${i18n.ts.descendingOrder})`, value: '+following' },
-		{ label: `${i18n.ts.following} (${i18n.ts.ascendingOrder})`, value: '-following' },
-		{ label: `${i18n.ts.followers} (${i18n.ts.descendingOrder})`, value: '+followers' },
-		{ label: `${i18n.ts.followers} (${i18n.ts.ascendingOrder})`, value: '-followers' },
-		{ label: `${i18n.ts.registeredAt} (${i18n.ts.descendingOrder})`, value: '+firstRetrievedAt' },
-		{ label: `${i18n.ts.registeredAt} (${i18n.ts.ascendingOrder})`, value: '-firstRetrievedAt' },
-	],
-	initialValue: '+pubSub',
-});
+const state = ref('federating');
+const sort = ref('+pubSub');
 const paginator = markRaw(new Paginator('federation/instances', {
 	limit: 10,
 	offsetMode: true,

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

@@ -8,8 +8,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div class="_spacer" style="--MI_SPACER-w: 900px;">
 		<div class="_gaps">
 			<div class="inputs" style="display: flex; gap: var(--MI-margin); flex-wrap: wrap;">
-				<MkSelect v-model="origin" :items="originDef" style="margin: 0; flex: 1;">
+				<MkSelect v-model="origin" style="margin: 0; 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>
 				<MkInput v-model="searchHost" :debounce="true" type="search" style="margin: 0; flex: 1;" :disabled="paginator.computedParams?.value?.origin === 'local'">
 					<template #label>{{ i18n.ts.host }}</template>
@@ -39,20 +42,9 @@ import * as os from '@/os.js';
 import { lookupFile } from '@/utility/admin-lookup.js';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import { Paginator } from '@/utility/paginator.js';
 
-const {
-	model: origin,
-	def: originDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'combined' },
-		{ label: i18n.ts.local, value: 'local' },
-		{ label: i18n.ts.remote, value: 'remote' },
-	],
-	initialValue: 'local',
-});
+const origin = ref<NonNullable<Misskey.entities.AdminDriveFilesRequest['origin']>>('local');
 const type = ref<string | null>(null);
 const searchHost = ref('');
 const userId = ref('');

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

@@ -26,11 +26,19 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkFolder>
 
 			<div :class="$style.inputs">
-				<MkSelect v-model="type" :items="typeDef" :class="$style.input">
+				<MkSelect v-model="type" :class="$style.input">
 					<template #label>{{ i18n.ts.state }}</template>
+					<option value="all">{{ i18n.ts.all }}</option>
+					<option value="unused">{{ i18n.ts.unused }}</option>
+					<option value="used">{{ i18n.ts.used }}</option>
+					<option value="expired">{{ i18n.ts.expired }}</option>
 				</MkSelect>
-				<MkSelect v-model="sort" :items="sortDef" :class="$style.input">
+				<MkSelect v-model="sort" :class="$style.input">
 					<template #label>{{ i18n.ts.sort }}</template>
+					<option value="+createdAt">{{ i18n.ts.createdAt }} ({{ i18n.ts.ascendingOrder }})</option>
+					<option value="-createdAt">{{ i18n.ts.createdAt }} ({{ i18n.ts.descendingOrder }})</option>
+					<option value="+usedAt">{{ i18n.ts.usedAt }} ({{ i18n.ts.ascendingOrder }})</option>
+					<option value="-usedAt">{{ i18n.ts.usedAt }} ({{ i18n.ts.descendingOrder }})</option>
 				</MkSelect>
 			</div>
 			<MkPagination :paginator="paginator">
@@ -59,33 +67,10 @@ import MkSwitch from '@/components/MkSwitch.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkInviteCode from '@/components/MkInviteCode.vue';
 import { definePage } from '@/page.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import { Paginator } from '@/utility/paginator.js';
 
-const {
-	model: type,
-	def: typeDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: 'all' },
-		{ label: i18n.ts.unused, value: 'unused' },
-		{ label: i18n.ts.used, value: 'used' },
-		{ label: i18n.ts.expired, value: 'expired' },
-	],
-	initialValue: 'all',
-});
-const {
-	model: sort,
-	def: sortDef,
-} = useMkSelect({
-	items: [
-		{ label: `${i18n.ts.createdAt} (${i18n.ts.ascendingOrder})`, value: '+createdAt' },
-		{ label: `${i18n.ts.createdAt} (${i18n.ts.descendingOrder})`, value: '-createdAt' },
-		{ label: `${i18n.ts.usedAt} (${i18n.ts.ascendingOrder})`, value: '+usedAt' },
-		{ label: `${i18n.ts.usedAt} (${i18n.ts.descendingOrder})`, value: '-usedAt' },
-	],
-	initialValue: '+createdAt',
-});
+const type = ref<NonNullable<Misskey.entities.AdminInviteListRequest['type']>>('all');
+const sort = ref<NonNullable<Misskey.entities.AdminInviteListRequest['sort']>>('+createdAt');
 
 const paginator = markRaw(new Paginator('admin/invite/list', {
 	limit: 10,

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

@@ -25,7 +25,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</SearchMarker>
 
 				<SearchMarker :keywords="['ugc', 'content', 'visibility', 'visitor', 'guest']">
-					<MkSelect v-model="ugcVisibilityForVisitor" :items="ugcVisibilityForVisitorDef" @update:modelValue="onChange_ugcVisibilityForVisitor">
+					<MkSelect
+						v-model="ugcVisibilityForVisitor" :items="[{
+							value: 'all',
+							label: i18n.ts._serverSettings._userGeneratedContentsVisibilityForVisitor.all,
+						}, {
+							value: 'local',
+							label: i18n.ts._serverSettings._userGeneratedContentsVisibilityForVisitor.localOnly + ' (' + i18n.ts.recommended + ')',
+						}, {
+							value: 'none',
+							label: i18n.ts._serverSettings._userGeneratedContentsVisibilityForVisitor.none,
+						}] as const" @update:modelValue="onChange_ugcVisibilityForVisitor"
+					>
 						<template #label><SearchLabel>{{ i18n.ts._serverSettings.userGeneratedContentsVisibilityForVisitor }}</SearchLabel></template>
 						<template #caption>
 							<div><SearchText>{{ i18n.ts._serverSettings.userGeneratedContentsVisibilityForVisitor_description }}</SearchText></div>
@@ -165,7 +176,6 @@ import { misskeyApi } from '@/utility/misskey-api.js';
 import { fetchInstance } from '@/instance.js';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import MkButton from '@/components/MkButton.vue';
 import FormLink from '@/components/form/link.vue';
 import MkFolder from '@/components/MkFolder.vue';
@@ -175,17 +185,7 @@ const meta = await misskeyApi('admin/meta');
 
 const enableRegistration = ref(!meta.disableRegistration);
 const emailRequiredForSignup = ref(meta.emailRequiredForSignup);
-const {
-	model: ugcVisibilityForVisitor,
-	def: ugcVisibilityForVisitorDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts._serverSettings._userGeneratedContentsVisibilityForVisitor.all, value: 'all' },
-		{ label: i18n.ts._serverSettings._userGeneratedContentsVisibilityForVisitor.localOnly, value: 'local' },
-		{ label: i18n.ts._serverSettings._userGeneratedContentsVisibilityForVisitor.none, value: 'none' },
-	],
-	initialValue: meta.ugcVisibilityForVisitor,
-});
+const ugcVisibilityForVisitor = ref(meta.ugcVisibilityForVisitor);
 const sensitiveWords = ref(meta.sensitiveWords.join('\n'));
 const prohibitedWords = ref(meta.prohibitedWords.join('\n'));
 const prohibitedWordsForNameOfUser = ref(meta.prohibitedWordsForNameOfUser.join('\n'));
@@ -221,7 +221,7 @@ function onChange_emailRequiredForSignup(value: boolean) {
 	});
 }
 
-function onChange_ugcVisibilityForVisitor(value: typeof ugcVisibilityForVisitor.value) {
+function onChange_ugcVisibilityForVisitor(value: Misskey.entities.AdminUpdateMetaRequest['ugcVisibilityForVisitor']) {
 	os.apiWithDialog('admin/update-meta', {
 		ugcVisibilityForVisitor: value,
 	}).then(() => {

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

@@ -8,8 +8,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div class="_spacer" style="--MI_SPACER-w: 900px;">
 		<div class="_gaps">
 			<MkPaginationControl :paginator="paginator" canFilter>
-				<MkSelect v-model="type" :items="typeDef" style="margin: 0; flex: 1;">
+				<MkSelect v-model="type" style="margin: 0; flex: 1;">
 					<template #label>{{ i18n.ts.type }}</template>
+					<option :value="null">{{ i18n.ts.all }}</option>
+					<option v-for="t in Misskey.moderationLogTypes" :key="t" :value="t">{{ i18n.ts._moderationLogTypes[t] ?? t }}</option>
 				</MkSelect>
 
 				<MkInput v-model="moderatorId" style="margin: 0; flex: 1;">
@@ -52,22 +54,12 @@ import MkTl from '@/components/MkTl.vue';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
 import { prefer } from '@/preferences.js';
-import { useMkSelect } from '@/composables/use-mkselect.js';
 import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkPaginationControl from '@/components/MkPaginationControl.vue';
 import { Paginator } from '@/utility/paginator.js';
 
-const {
-	model: type,
-	def: typeDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts.all, value: null },
-		...Misskey.moderationLogTypes.map(t => ({ label: i18n.ts._moderationLogTypes[t] ?? t, value: t })),
-	],
-	initialValue: null,
-});
+const type = ref<string | null>(null);
 const moderatorId = ref('');
 
 const paginator = markRaw(new Paginator('admin/show-moderation-logs', {

packages/frontend/src/pages/admin/overview.heatmap.vue

@@ -5,30 +5,24 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_panel" :class="$style.root">
-	<MkSelect v-model="src" :items="srcDef" style="margin: 0 0 12px 0;" small>
+	<MkSelect v-model="src" style="margin: 0 0 12px 0;" small>
+		<option value="active-users">Active users</option>
+		<option value="notes">Notes</option>
+		<option value="ap-requests-inbox-received">AP Requests: inboxReceived</option>
+		<option value="ap-requests-deliver-succeeded">AP Requests: deliverSucceeded</option>
+		<option value="ap-requests-deliver-failed">AP Requests: deliverFailed</option>
 	</MkSelect>
 	<MkHeatmap :src="src"/>
 </div>
 </template>
 
 <script lang="ts" setup>
+import { ref } from 'vue';
 import MkHeatmap from '@/components/MkHeatmap.vue';
 import MkSelect from '@/components/MkSelect.vue';
-import { useMkSelect } from '@/composables/use-mkselect.js';
+import type { HeatmapSource } from '@/components/MkHeatmap.vue';
 
-const {
-	model: src,
-	def: srcDef,
-} = useMkSelect({
-	items: [
-		{ label: 'Active users', value: 'active-users' },
-		{ label: 'Notes', value: 'notes' },
-		{ label: 'AP Requests: inboxReceived', value: 'ap-requests-inbox-received' },
-		{ label: 'AP Requests: deliverSucceeded', value: 'ap-requests-deliver-succeeded' },
-		{ label: 'AP Requests: deliverFailed', value: 'ap-requests-deliver-failed' },
-	],
-	initialValue: 'active-users',
-});
+const src = ref<HeatmapSource>('active-users');
 </script>
 
 <style lang="scss" module>

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

@@ -30,14 +30,19 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #caption>{{ i18n.ts._role.descriptionOfDisplayOrder }}</template>
 	</MkInput>
 
-	<MkSelect v-model="rolePermission" :items="rolePermissionDef" :readonly="readonly">
+	<MkSelect v-model="rolePermission" :readonly="readonly">
 		<template #label><i class="ti ti-shield-lock"></i> {{ i18n.ts._role.permission }}</template>
 		<template #caption><div v-html="i18n.ts._role.descriptionOfPermission.replaceAll('\n', '<br>')"></div></template>
+		<option value="normal">{{ i18n.ts.normalUser }}</option>
+		<option value="moderator">{{ i18n.ts.moderator }}</option>
+		<option value="administrator">{{ i18n.ts.administrator }}</option>
 	</MkSelect>
 
-	<MkSelect v-model="role.target" :items="[{ label: i18n.ts._role.manual, value: 'manual' }, { label: i18n.ts._role.conditional, value: 'conditional' }]" :readonly="readonly">
+	<MkSelect v-model="role.target" :readonly="readonly">
 		<template #label><i class="ti ti-users"></i> {{ i18n.ts._role.assignTarget }}</template>
 		<template #caption><div v-html="i18n.ts._role.descriptionOfAssignTarget.replaceAll('\n', '<br>')"></div></template>
+		<option value="manual">{{ i18n.ts._role.manual }}</option>
+		<option value="conditional">{{ i18n.ts._role.conditional }}</option>
 	</MkSelect>
 
 	<MkFolder v-if="role.target === 'conditional'" defaultOpen>
@@ -171,17 +176,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkSwitch v-model="role.policies.chatAvailability.useDefault" :readonly="readonly">
 						<template #label>{{ i18n.ts._role.useBaseValue }}</template>
 					</MkSwitch>
-					<MkSelect
-						v-model="role.policies.chatAvailability.value"
-						:items="[
-							{ label: i18n.ts.enabled, value: 'available' },
-							{ label: i18n.ts.readonly, value: 'readonly' },
-							{ label: i18n.ts.disabled, value: 'unavailable' },
-						]"
-						:disabled="role.policies.chatAvailability.useDefault"
-						:readonly="readonly"
-					>
+					<MkSelect v-model="role.policies.chatAvailability.value" :disabled="role.policies.chatAvailability.useDefault" :readonly="readonly">
 						<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>
 					<MkRange v-model="role.policies.chatAvailability.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
 						<template #label>{{ i18n.ts._role.priority }}</template>
@@ -802,25 +801,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</MkFolder>
 
-			<MkFolder v-if="matchQuery([i18n.ts._role._options.scheduledNoteLimit, 'scheduledNoteLimit'])">
-				<template #label>{{ i18n.ts._role._options.scheduledNoteLimit }}</template>
-				<template #suffix>
-					<span v-if="role.policies.scheduledNoteLimit.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
-					<span v-else>{{ role.policies.scheduledNoteLimit.value }}</span>
-					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.scheduledNoteLimit)"></i></span>
-				</template>
-				<div class="_gaps">
-					<MkSwitch v-model="role.policies.scheduledNoteLimit.useDefault" :readonly="readonly">
-						<template #label>{{ i18n.ts._role.useBaseValue }}</template>
-					</MkSwitch>
-					<MkInput v-model="role.policies.scheduledNoteLimit.value" :disabled="role.policies.scheduledNoteLimit.useDefault" type="number" :readonly="readonly">
-					</MkInput>
-					<MkRange v-model="role.policies.scheduledNoteLimit.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
-						<template #label>{{ i18n.ts._role.priority }}</template>
-					</MkRange>
-				</div>
-			</MkFolder>
-
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.watermarkAvailable, 'watermarkAvailable'])">
 				<template #label>{{ i18n.ts._role._options.watermarkAvailable }}</template>
 				<template #suffix>
@@ -850,7 +830,6 @@ import { watch, ref, computed } from 'vue';
 import { throttle } from 'throttle-debounce';
 import * as Misskey from 'misskey-js';
 import RolesEditorFormula from './RolesEditorFormula.vue';
-import type { MkSelectItem, GetMkSelectValueTypesFromDef } from '@/components/MkSelect.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkColorInput from '@/components/MkColorInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
@@ -891,17 +870,11 @@ function updateAvatarDecorationLimit(value: string | number) {
 	role.value.policies.avatarDecorationLimit.value = limited;
 }
 
-const rolePermissionDef = [
-	{ label: i18n.ts.normalUser, value: 'normal' },
-	{ label: i18n.ts.moderator, value: 'moderator' },
-	{ label: i18n.ts.administrator, value: 'administrator' },
-] as const satisfies MkSelectItem[];
-
-const rolePermission = computed<GetMkSelectValueTypesFromDef<typeof rolePermissionDef>>({
+const rolePermission = computed({
 	get: () => role.value.isAdministrator ? 'administrator' : role.value.isModerator ? 'moderator' : 'normal',
 	set: (val) => {
-		role.value.isAdministrator = (val === 'administrator');
-		role.value.isModerator = (val === 'moderator');
+		role.value.isAdministrator = val === 'administrator';
+		role.value.isModerator = val === 'moderator';
 	},
 });