CHANGELOG.md

@@ -1,32 +1,20 @@
-## Unreleased
+## 2025.9.0
 
 ### General
-- Enhance: 広告ごとにセンシティブフラグを設定できるようになりました
-
-### Client
-- Enhance: チャットの日本語名称がダイレクトメッセージに戻るとともに、ベータ版機能ではなくなりました
-- Enhance: 画像編集にマスクエフェクトを追加
-- Enhance: 時刻計算のための基準値を一か所で管理するようにし、パフォーマンスを向上
-
-### Server
 -
 
-
-## 2025.9.0
-
 ### Client
 - Enhance: AiScriptAppウィジェットで構文エラーを検知してもダイアログではなくウィジェット内にエラーを表示するように
 - Enhance: /flushページでサイトキャッシュをクリアできるようになりました
 - Enhance: クリップ/リスト/アンテナ/ロール追加系メニュー項目において、表示件数を拡張
-- Enhance: 「キャッシュを削除」ボタンでブラウザの内部キャッシュの削除も行えるように
-- Enhance: Ctrlキー（Commandキー）を押下しながらリンクをクリックすると新しいタブで開くように
 - Fix: プッシュ通知を有効にできない問題を修正
 - Fix: RSSティッカーウィジェットが正しく動作しない問題を修正
 - Fix: プロファイルを復元後アカウントの切り替えができない問題を修正
 - Fix: エラー画像が横に引き伸ばされてしまう問題に対応
 
 ### Server
-- Fix: webpなどの画像に対してセンシティブなメディアの検出が適用されていなかった問題を修正
+-
+
 
 ## 2025.8.0
 

locales/ca-ES.yml

@@ -1644,7 +1644,7 @@ _serverSettings:
   reactionsBufferingDescription: "Quan s'activa aquesta opció millora bastant el rendiment en recuperar les línies de temps reduint la càrrega de la base. Com a contrapunt, augmentarà  l'ús de memòria de Redís. Desactiva aquesta opció en cas de tenir un servidor amb poca memòria o si tens problemes d'inestabilitat."
   remoteNotesCleaning: "Neteja automàtica de notes remotes"
   remoteNotesCleaning_description: "Quan activis aquesta opció, periòdicament es netejaran les notes remotes que no es consultin, això evitarà que la base de dades se"
-  remoteNotesCleaningMaxProcessingDuration: "Duració màxima del temps de funcionament del procés de neteja"
+  remoteNotesCleaningMaxProcessingDuration: "D'oració màxima del temps de funcionament del procés de neteja"
   remoteNotesCleaningExpiryDaysForEachNotes: "Duració mínima de conservació de les notes"
   inquiryUrl: "URL de consulta "
   inquiryUrlDescription: "Escriu adreça URL per al formulari de consulta per al mantenidor del servidor o una pàgina web amb el contacte d'informació."

locales/es-ES.yml

@@ -2137,7 +2137,7 @@ _aboutMisskey:
 _displayOfSensitiveMedia:
   respect: "Esconder medios marcados como sensibles"
   ignore: "Mostrar medios marcados como sensibles"
-  force: "Esconder toda la multimedia"
+  force: "Esconder todala multimedia"
 _instanceTicker:
   none: "No mostrar"
   remote: "Mostrar a usuarios remotos"

locales/index.d.ts

@@ -1227,7 +1227,7 @@ export interface Locale extends ILocale {
      */
     "noMoreHistory": string;
     /**
-     * メッセージを送る
+     * チャットを始める
      */
     "startChat": string;
     /**
@@ -1927,7 +1927,7 @@ export interface Locale extends ILocale {
      */
     "markAsReadAllUnreadNotes": string;
     /**
-     * すべてのダイレクトメッセージを既読にする
+     * すべてのチャットを既読にする
      */
     "markAsReadAllTalkMessages": string;
     /**
@@ -5390,14 +5390,6 @@ export interface Locale extends ILocale {
      * チャット
      */
     "chat": string;
-    /**
-     * ダイレクトメッセージ
-     */
-    "directMessage": string;
-    /**
-     * メッセージ
-     */
-    "directMessage_short": string;
     /**
      * 旧設定情報を移行
      */
@@ -5537,10 +5529,6 @@ export interface Locale extends ILocale {
      * ベータ版の検証にご協力いただきありがとうございます！
      */
     "thankYouForTestingBeta": string;
-    /**
-     * ユーザー指定ノートを作成
-     */
-    "createUserSpecifiedNote": string;
     "_order": {
         /**
          * 新しい順
@@ -5552,10 +5540,6 @@ export interface Locale extends ILocale {
         "oldest": string;
     };
     "_chat": {
-        /**
-         * メッセージ
-         */
-        "messages": string;
         /**
          * まだメッセージはありません
          */
@@ -5565,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;
         /**
@@ -5614,7 +5598,7 @@ export interface Locale extends ILocale {
          */
         "noHistory": string;
         /**
-         * グループはありません
+         * ルームはありません
          */
         "noRooms": string;
         /**
@@ -5634,7 +5618,7 @@ export interface Locale extends ILocale {
          */
         "ignore": string;
         /**
-         * グループから退出
+         * ルームから退出
          */
         "leave": string;
         /**
@@ -5658,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;
         /**
@@ -5694,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": {
@@ -7872,7 +7856,7 @@ export interface Locale extends ILocale {
              */
             "canImportUserLists": string;
             /**
-             * ダイレクトメッセージを許可
+             * チャットを許可
              */
             "chatAvailability": string;
             /**
@@ -8722,7 +8706,7 @@ export interface Locale extends ILocale {
              */
             "badge": string;
             /**
-             * メッセージの背景
+             * チャットの背景
              */
             "messageBg": string;
             /**
@@ -8749,7 +8733,7 @@ export interface Locale extends ILocale {
          */
         "reaction": string;
         /**
-         * ダイレクトメッセージ
+         * チャットのメッセージ
          */
         "chatMessage": string;
     };
@@ -9033,11 +9017,11 @@ export interface Locale extends ILocale {
          */
         "write:following": string;
         /**
-         * ダイレクトメッセージを見る
+         * チャットを見る
          */
         "read:messaging": string;
         /**
-         * ダイレクトメッセージを操作する
+         * チャットを操作する
          */
         "write:messaging": string;
         /**
@@ -9329,11 +9313,11 @@ export interface Locale extends ILocale {
          */
         "write:report-abuse": string;
         /**
-         * ダイレクトメッセージを操作する
+         * チャットを操作する
          */
         "write:chat": string;
         /**
-         * ダイレクトメッセージを閲覧する
+         * チャットを閲覧する
          */
         "read:chat": string;
     };
@@ -9559,7 +9543,7 @@ export interface Locale extends ILocale {
          */
         "birthdayFollowings": string;
         /**
-         * ダイレクトメッセージ
+         * チャット
          */
         "chat": string;
     };
@@ -10299,7 +10283,7 @@ export interface Locale extends ILocale {
          */
         "roleAssigned": string;
         /**
-         * ダイレクトメッセージのグループへ招待されました
+         * チャットルームへ招待されました
          */
         "chatRoomInvitationReceived": string;
         /**
@@ -10412,7 +10396,7 @@ export interface Locale extends ILocale {
              */
             "roleAssigned": string;
             /**
-             * ダイレクトメッセージのグループへ招待された
+             * チャットルームへ招待された
              */
             "chatRoomInvitationReceived": string;
             /**
@@ -10594,7 +10578,7 @@ export interface Locale extends ILocale {
              */
             "roleTimeline": string;
             /**
-             * ダイレクトメッセージ
+             * チャット
              */
             "chat": string;
         };
@@ -10961,7 +10945,7 @@ export interface Locale extends ILocale {
          */
         "deleteGalleryPost": string;
         /**
-         * ダイレクトメッセージのグループを削除
+         * チャットルームを削除
          */
         "deleteChatRoom": string;
         /**
@@ -12378,10 +12362,6 @@ export interface Locale extends ILocale {
              * ティアリング
              */
             "tearing": string;
-            /**
-             * 塗りつぶし(四角)
-             */
-            "fillSquare": string;
         };
         "_fxProps": {
             /**
@@ -12396,10 +12376,6 @@ export interface Locale extends ILocale {
              * サイズ
              */
             "size": string;
-            /**
-             * 位置
-             */
-            "offset": string;
             /**
              * 色
              */

locales/ja-JP.yml

@@ -302,7 +302,7 @@ uploadNFiles: "{n}個のファイルをアップロード"
 explore: "みつける"
 messageRead: "既読"
 noMoreHistory: "これより過去の履歴はありません"
-startChat: "メッセージを送る"
+startChat: "チャットを始める"
 nUsersRead: "{n}人が読みました"
 agreeTo: "{0}に同意"
 agree: "同意する"
@@ -477,7 +477,7 @@ notFoundDescription: "指定されたURLに該当するページはありませ
 uploadFolder: "既定アップロード先"
 markAsReadAllNotifications: "すべての通知を既読にする"
 markAsReadAllUnreadNotes: "すべての投稿を既読にする"
-markAsReadAllTalkMessages: "すべてのダイレクトメッセージを既読にする"
+markAsReadAllTalkMessages: "すべてのチャットを既読にする"
 help: "ヘルプ"
 inputMessageHere: "ここにメッセージを入力"
 close: "閉じる"
@@ -1343,8 +1343,6 @@ postForm: "投稿フォーム"
 textCount: "文字数"
 information: "情報"
 chat: "チャット"
-directMessage: "ダイレクトメッセージ"
-directMessage_short: "メッセージ"
 migrateOldSettings: "旧設定情報を移行"
 migrateOldSettings_description: "通常これは自動で行われていますが、何らかの理由により上手く移行されなかった場合は手動で移行処理をトリガーできます。現在の設定情報は上書きされます。"
 compress: "圧縮"
@@ -1379,55 +1377,53 @@ pluginsAreDisabledBecauseSafeMode: "セーフモードが有効なため、プ
 customCssIsDisabledBecauseSafeMode: "セーフモードが有効なため、カスタムCSSは適用されていません。"
 themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。"
 thankYouForTestingBeta: "ベータ版の検証にご協力いただきありがとうございます！"
-createUserSpecifiedNote: "ユーザー指定ノートを作成"
 
 _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: "自分のフォロワーのみ"
@@ -2038,7 +2034,7 @@ _role:
     canImportFollowing: "フォローのインポートを許可"
     canImportMuting: "ミュートのインポートを許可"
     canImportUserLists: "リストのインポートを許可"
-    chatAvailability: "ダイレクトメッセージを許可"
+    chatAvailability: "チャットを許可"
     uploadableFileTypes: "アップロード可能なファイル種別"
     uploadableFileTypes_caption: "MIMEタイプを指定します。改行で区切って複数指定できるほか、アスタリスク(*)でワイルドカード指定できます。(例: image/*)"
     uploadableFileTypes_caption2: "ファイルによっては種別を判定できないことがあります。そのようなファイルを許可する場合は {x} を指定に追加してください。"
@@ -2285,7 +2281,7 @@ _theme:
     buttonHoverBg: "ボタンの背景 (ホバー)"
     inputBorder: "入力ボックスの縁取り"
     badge: "バッジ"
-    messageBg: "メッセージの背景"
+    messageBg: "チャットの背景"
     fgHighlighted: "強調された文字"
 
 _sfx:
@@ -2293,7 +2289,7 @@ _sfx:
   noteMy: "ノート(自分)"
   notification: "通知"
   reaction: "リアクション選択時"
-  chatMessage: "ダイレクトメッセージ"
+  chatMessage: "チャットのメッセージ"
 
 _soundSettings:
   driveFile: "ドライブの音声を使用"
@@ -2373,8 +2369,8 @@ _permissions:
   "write:favorites": "お気に入りを操作する"
   "read:following": "フォローの情報を見る"
   "write:following": "フォロー・フォロー解除する"
-  "read:messaging": "ダイレクトメッセージを見る"
-  "write:messaging": "ダイレクトメッセージを操作する"
+  "read:messaging": "チャットを見る"
+  "write:messaging": "チャットを操作する"
   "read:mutes": "ミュートを見る"
   "write:mutes": "ミュートを操作する"
   "write:notes": "ノートを作成・削除する"
@@ -2447,8 +2443,8 @@ _permissions:
   "read:clip-favorite": "クリップのいいねを見る"
   "read:federation": "連合に関する情報を取得する"
   "write:report-abuse": "違反を報告する"
-  "write:chat": "ダイレクトメッセージを操作する"
-  "read:chat": "ダイレクトメッセージを閲覧する"
+  "write:chat": "チャットを操作する"
+  "read:chat": "チャットを閲覧する"
 
 _auth:
   shareAccessTitle: "アプリへのアクセス許可"
@@ -2511,7 +2507,7 @@ _widgets:
     chooseList: "リストを選択"
   clicker: "クリッカー"
   birthdayFollowings: "今日誕生日のユーザー"
-  chat: "ダイレクトメッセージ"
+  chat: "チャット"
 
 _cw:
   hide: "隠す"
@@ -2718,7 +2714,7 @@ _notification:
   newNote: "新しい投稿"
   unreadAntennaNote: "アンテナ {name}"
   roleAssigned: "ロールが付与されました"
-  chatRoomInvitationReceived: "ダイレクトメッセージのグループへ招待されました"
+  chatRoomInvitationReceived: "チャットルームへ招待されました"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
   achievementEarned: "実績を獲得"
   testNotification: "通知テスト"
@@ -2748,7 +2744,7 @@ _notification:
     receiveFollowRequest: "フォロー申請を受け取った"
     followRequestAccepted: "フォローが受理された"
     roleAssigned: "ロールが付与された"
-    chatRoomInvitationReceived: "ダイレクトメッセージのグループへ招待された"
+    chatRoomInvitationReceived: "チャットルームへ招待された"
     achievementEarned: "実績の獲得"
     exportCompleted: "エクスポートが完了した"
     login: "ログイン"
@@ -2798,7 +2794,7 @@ _deck:
     mentions: "メンション"
     direct: "指名"
     roleTimeline: "ロールタイムライン"
-    chat: "ダイレクトメッセージ"
+    chat: "チャット"
 
 _dialog:
   charactersExceeded: "最大文字数を超えています！ 現在 {current} / 制限 {max}"
@@ -2901,7 +2897,7 @@ _moderationLogTypes:
   deletePage: "ページを削除"
   deleteFlash: "Playを削除"
   deleteGalleryPost: "ギャラリーの投稿を削除"
-  deleteChatRoom: "ダイレクトメッセージのグループを削除"
+  deleteChatRoom: "チャットルームを削除"
   updateProxyAccountDescription: "プロキシアカウントの説明を更新"
 
 _fileViewer:
@@ -3314,13 +3310,11 @@ _imageEffector:
     checker: "チェッカー"
     blockNoise: "ブロックノイズ"
     tearing: "ティアリング"
-    fillSquare: "塗りつぶし(四角)"
 
   _fxProps:
     angle: "角度"
     scale: "サイズ"
     size: "サイズ"
-    offset: "位置"
     color: "色"
     opacity: "不透明度"
     normalize: "正規化"

locales/ru-RU.yml

@@ -1215,7 +1215,6 @@ privacyPolicyUrl: "Ссылка на Политику Конфиденциаль
 tosAndPrivacyPolicy: "Условия использования и политика конфиденциальности"
 avatarDecorations: "Украшения для аватара"
 attach: "Прикрепить"
-detachAll: "Убрать всё"
 angle: "Угол"
 flip: "Переворот"
 showAvatarDecorations: "Показать украшения для аватара"
@@ -1254,7 +1253,7 @@ clipNoteLimitExceeded: "К этому клипу больше нельзя до
 performance: "Производительность"
 modified: "Изменено"
 signinWithPasskey: "Войдите в систему, используя свой пароль"
-unknownWebAuthnKey: "Неизвестный ключ"
+unknownWebAuthnKey: "Не известный ключ "
 passkeyVerificationFailed: "Ошибка проверка ключа доступа "
 messageToFollower: "Сообщение подписчикам"
 testCaptchaWarning: "Эта функция предназначена для тестирования CAPTCHA. <strong>Не использовать это в рабочей среде</strong>"
@@ -1269,11 +1268,8 @@ availableRoles: "Доступные роли"
 federationDisabled: "Федерация отключена для этого сервера. Вы не можете взаимодействовать с пользователями на других серверах."
 draft: "Черновик"
 markAsSensitiveConfirm: "Отметить контент как чувствительный?"
-preferences: "Основное"
 resetToDefaultValue: "Сбросить настройки до стандартных"
-syncBetweenDevices: "Синхронизировать между устройствами"
 postForm: "Форма отправки"
-textCount: "Количество символов"
 information: "Описание"
 inMinutes: "мин"
 inDays: "сут"
@@ -1285,11 +1281,6 @@ _chat:
   send: "Отправить"
 _settings:
   webhook: "Вебхук"
-  preferencesBanner: "Вы можете настроить общее поведение клиента по вашим предпочтениям"
-  timelineAndNote: "Лента и заметки"
-  _chat:
-    showSenderName: "Показывать имя отправителя"
-    sendOnEnter: "Использовать Enter для отправки"
 _delivery:
   stop: "Заморожено"
   _type:
@@ -1538,7 +1529,7 @@ _achievements:
       description: "Нажато здесь"
     _justPlainLucky:
       title: "Чистая удача"
-      description: "Может достаться с вероятностью 0,005% каждые 10 секунд."
+      description: "Может достаться с вероятностью 0,01% каждые 10 секунд."
     _setNameToSyuilo:
       title: "Комплекс бога"
       description: "Установлено «syuilo» в качестве имени"
@@ -1566,12 +1557,6 @@ _achievements:
       title: "Brain Diver"
       description: "Опубликована ссылка на песню «Brain Diver»"
       flavor: "Мисски-Мисски Ла-Ту-Ма"
-    _bubbleGameExplodingHead:
-      title: "🤯"
-      description: "Самый большой объект в Bubble game"
-    _bubbleGameDoubleExplodingHead:
-      title: "Двойной🤯"
-      description: "Два самых больших объекта в Bubble game одновременно!"
 _role:
   new: "Новая роль"
   edit: "Изменить роль"

locales/tr-TR.yml

@@ -360,7 +360,7 @@ whenServerDisconnected: "Sunucu ile bağlantı kesildiğinde"
 disconnectedFromServer: "Sunucu bağlantısı kesildi"
 reload: "Yenile"
 doNothing: "Yoksay"
-reloadConfirm: "Panoyu yenilemek ister misin?"
+reloadConfirm: "Zaman çizelgesini yenilemek ister misin?"
 watch: "İzle"
 unwatch: "İzlemeyi bırak"
 accept: "Kabul et"
@@ -573,9 +573,9 @@ objectStorageSetPublicRead: "Yükleme sırasında \"genel-okuma\" ayarını yap
 s3ForcePathStyleDesc: "s3ForcePathStyle etkinleştirilirse, kova adı URL'nin ana bilgisayar adı yerine URL yoluna eklenmelidir. Kendi kendine barındırılan bir Minio örneği gibi hizmetleri kullanırken bu ayarı etkinleştirmen gerekebilir."
 serverLogs: "Sunucu log kayıtları"
 deleteAll: "Tümünü sil"
-showFixedPostForm: "Gönderi formunu pano üstünde görüntüle"
-showFixedPostFormInChannel: "Gönderi formunu pano üstünde görüntüle (Kanallar)"
-withRepliesByDefaultForNewlyFollowed: "Yeni takip edilen kullanıcıların yanıtlarını varsayılan olarak panoya dahil et"
+showFixedPostForm: "Gönderi formunu zaman çizelgesinin en üstünde görüntüle"
+showFixedPostFormInChannel: "Gönderi formunu zaman çizelgesinin en üstünde görüntüle (Kanallar)"
+withRepliesByDefaultForNewlyFollowed: "Yeni takip edilen kullanıcıların yanıtlarını varsayılan olarak zaman çizelgesine dahil et"
 newNoteRecived: "Yeni Not'lar var"
 newNote: "Yeni Not"
 sounds: "Sesler"
@@ -1059,7 +1059,7 @@ achievements: "Başarılar"
 gotInvalidResponseError: "Geçersiz sunucu yanıtı"
 gotInvalidResponseErrorDescription: "Sunucu erişilemez durumda olabilir veya bakım çalışması yapılmaktadır. Lütfen daha sonra tekrar dene."
 thisPostMayBeAnnoying: "Bu not başkalarını rahatsız edebilir."
-thisPostMayBeAnnoyingHome: "Ana panoya gönder"
+thisPostMayBeAnnoyingHome: "Ana zaman çizelgesine gönder"
 thisPostMayBeAnnoyingCancel: "İptal"
 thisPostMayBeAnnoyingIgnore: "Yine de gönder"
 collapseRenotes: "Daha önce görüntülenen Renote'lari kısaltılmış olarak göster"
@@ -1218,8 +1218,8 @@ showRepliesToOthersInTimeline: "Pano'da diğer kişilere verilen yanıtları gö
 hideRepliesToOthersInTimeline: "Pano'dan diğer kişilerin yanıtlarını gizle"
 showRepliesToOthersInTimelineAll: "Pano'da takip ettiğin herkesin diğerlerine verdiği yanıtları göster"
 hideRepliesToOthersInTimelineAll: "Pano'da takip ettiğin herkesten diğer kişilere verilen yanıtları gizle"
-confirmShowRepliesAll: "Bu işlem geri alınamaz. Takip ettiğin herkesin yanıtlarını panoda diğer kullanıcılara göstermek istiyor musun?"
-confirmHideRepliesAll: "Bu işlem geri alınamaz. Şu anda takip ettiğin tüm kullanıcıların yanıtlarını panoda cidden göstermeyecek misin?"
+confirmShowRepliesAll: "Bu işlem geri alınamaz. Takip ettiğin herkesin yanıtlarını zaman çizelgende diğer kullanıcılara göstermek istiyor musun?"
+confirmHideRepliesAll: "Bu işlem geri alınamaz. Şu anda takip ettiğin tüm kullanıcıların yanıtlarını zaman tünelinde cidden göstermeyecek misin?"
 externalServices: "Dış Hizmetler"
 sourceCode: "Kaynak kodu"
 sourceCodeIsNotYetProvided: "Kaynak kodu henüz mevcut değildir. Bu sorunu gidermek için yöneticiyle iletişime geçin."
@@ -1570,9 +1570,9 @@ _initialTutorial:
     description: "Burada, Misskey'i kullanmanın temellerini ve özelliklerini öğrenebilirsin."
   _note:
     title: "Not nedir?"
-    description: "Misskey'deki gönderiler “Notlar” olarak adlandırılır. Notlar panoda kronolojik olarak düzenlenir ve gerçek zamanlı olarak güncellenir."
+    description: "Misskey'deki gönderiler “Notlar” olarak adlandırılır. Notlar zaman çizelgesinde kronolojik olarak düzenlenir ve gerçek zamanlı olarak güncellenir."
     reply: "Bir mesaja yanıt vermek için bu düğmeye tıklayın. Yanıtlara yanıt vermek de mümkündür, böylece konuşma bir konu başlığı gibi devam eder."
-    renote: "Bu notu kendi panonda paylaşabilirsin. Ayrıca yorumlarınla birlikte alıntı da yapabilirsin."
+    renote: "Bu notu kendi zaman çizelgende paylaşabilirsiniz. Ayrıca yorumlarınızla birlikte alıntı da yapabilirsin."
     reaction: "Not'a tepkiler ekleyebilirsin. Daha fazla ayrıntı bir sonraki sayfada açıklanacak."
     menu: "Not ayrıntılarını görüntüleyebilir, bağlantıları kopyalayabilir ve çeşitli diğer işlemleri gerçekleştirebilirsin."
   _reaction:
@@ -1640,7 +1640,7 @@ _serverSettings:
   shortNameDescription: "Resmi adın uzun olması durumunda görüntülenebilen, örneğin adının kısaltması."
   fanoutTimelineDescription: "Etkinleştirildiğinde Pano alma performansını büyük ölçüde artırır ve veritabanı yükünü azaltır. Bunun karşılığında Redis'in bellek kullanımı artacaktır. Sunucu belleği düşükse veya sunucu kararsızsa bunu devre dışı bırakmayı düşün."
   fanoutTimelineDbFallback: "Veritabanına geri dön"
-  fanoutTimelineDbFallbackDescription: "Etkinleştirildiğinde, Pano önbelleğe alınmamışsa ek sorgular için veritabanına geri döner. Bu özelliği devre dışı bırakmak, geri dönüş sürecini ortadan kaldırarak sunucu yükünü daha da azaltır, ancak alınabilecek panoların aralığını sınırlar."
+  fanoutTimelineDbFallbackDescription: "Etkinleştirildiğinde, Pano önbelleğe alınmamışsa ek sorgular için veritabanına geri döner. Bu özelliği devre dışı bırakmak, geri dönüş sürecini ortadan kaldırarak sunucu yükünü daha da azaltır, ancak alınabilecek zaman çizelgelerinin aralığını sınırlar."
   reactionsBufferingDescription: "Etkinleştirildiğinde, reaksiyon oluşturma sırasında performans büyük ölçüde artacak ve veritabanı üzerindeki yük azalacaktır. Ancak, Redis bellek kullanımı artacakt."
   remoteNotesCleaning: "Uzak notların otomatik olarak temizlenmesi"
   remoteNotesCleaning_description: "Etkinleştirildiğinde, kullanılmayan ve güncelliğini yitirmiş uzak notlar, veritabanının şişmesini önlemek için periyodik olarak temizlenecek."
@@ -1668,7 +1668,6 @@ _serverSettings:
   restartServerSetupWizardConfirm_text: "Bazı mevcut ayarlar sıfırlanacaktır."
   entrancePageStyle: "Giriş sayfası stili"
   showTimelineForVisitor: "Panoyu göster"
-  showActivitiesForVisitor: "Aktiviteleri göster"
   _userGeneratedContentsVisibilityForVisitor:
     all: "Her şey halka açıktır."
     localOnly: "Yalnızca yerel içerik yayınlanır, uzak içerik gizli tutulur."
@@ -1877,7 +1876,7 @@ _achievements:
       title: "Öz Referans"
       description: "Kendi notunuzu alıntı yapın"
     _htl20npm:
-      title: "Akış Panosu"
+      title: "Akış Zaman Çizelgesi"
       description: "Ev zaman çizelgenizin hızı 20 npm'yi (dakika başına not sayısı) aşıyor mu?"
     _viewInstanceChart:
       title: "Analist"
@@ -1966,7 +1965,7 @@ _role:
   asBadge: "Rozet olarak göster"
   descriptionOfAsBadge: "This role's icon will be displayed next to the username of users with this role if turned on."
   isExplorable: "Rolü keşfedilebilir hale getir"
-  descriptionOfIsExplorable: "Bu rolün panosu ve bu role sahip kullanıcıların listesi, etkinleştirilirse kamuya açık hale getirilecek."
+  descriptionOfIsExplorable: "Bu rolün zaman çizelgesi ve bu role sahip kullanıcıların listesi, etkinleştirilirse kamuya açık hale getirilecek."
   displayOrder: "Pozisyon"
   descriptionOfDisplayOrder: "Sayı ne kadar yüksekse, UI pozisyonu da o kadar yüksek olur."
   preserveAssignmentOnMoveAccount: "Geçiş sırasında rol atamalarını koruyun"
@@ -1980,7 +1979,7 @@ _role:
     high: "Yüksek"
   _options:
     gtlAvailable: "Global Pano'yu görüntüleyebilir"
-    ltlAvailable: "Yerel panoyu görüntüleyebilir"
+    ltlAvailable: "Yerel zaman çizelgesini görüntüleyebilir"
     canPublicNote: "Halka açık notlar gönderebilir"
     mentionMax: "Bir notta maksimum bahsetme sayısı"
     canInvite: "Sunucu davet kodları oluşturabilir"
@@ -2485,7 +2484,7 @@ _visibility:
   public: "Halka açık"
   publicDescription: "Notunuz tüm kullanıcılar tarafından görülebilir olacaktır."
   home: "Pano"
-  homeDescription: "Yalnızca ana panoya gönder"
+  homeDescription: "Yalnızca ana zaman çizelgesine gönder"
   followers: "Takipçiler"
   followersDescription: "Sadece takipçilerine görünür hale getir"
   specified: "Doğrudan"
@@ -2532,7 +2531,7 @@ _exportOrImport:
   userLists: "Kullanıcı listeleri"
   excludeMutingUsers: "Sessize alınan kullanıcıları hariç tut"
   excludeInactiveUsers: "Etkin olmayan kullanıcıları hariç tut"
-  withReplies: "İçe aktarılan kullanıcıların yanıtlarını panoya dahil edin"
+  withReplies: "İçe aktarılan kullanıcıların yanıtlarını zaman çizelgesine dahil edin"
 _charts:
   federation: "Federasyon"
   apRequest: "Talepler"
@@ -2926,7 +2925,7 @@ _reversi:
   freeMatch: "Ücretsiz Eşleştirme"
   lookingForPlayer: "Rakip aranıyor..."
   gameCanceled: "Oyun iptal edildi."
-  shareToTlTheGameWhenStart: "Oyun başlatıldığında panoda paylaş"
+  shareToTlTheGameWhenStart: "Oyun başlatıldığında zaman çizelgesinde paylaş"
   iStartedAGame: "Oyun başladı! #MisskeyReversi"
   opponentHasSettingsChanged: "Rakip ayarlarını değiştirmiş."
   allowIrregularRules: "Düzensiz kurallar (tamamen ücretsiz)"
@@ -3154,7 +3153,7 @@ _clientPerformanceIssueTip:
 _clip:
   tip: "Klip, notları gruplandırmanıza olanak tanıyan bir özelliktir."
 _userLists:
-  tip: "Listeler, oluşturulurken belirttiğin herhangi bir kullanıcıyı içerebilir. Oluşturulan liste, yalnızca belirtilen kullanıcıları gösteren bir pano olarak görüntülenebilir."
+  tip: "Listeler, oluşturulurken belirttiğin herhangi bir kullanıcıyı içerebilir. Oluşturulan liste, yalnızca belirtilen kullanıcıları gösteren bir zaman çizelgesi olarak görüntülenebilir."
 watermark: "Filigran"
 defaultPreset: "Varsayılan Ön Ayar"
 _watermarkEditor:

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2025.9.0",
+	"version": "2025.9.0-alpha.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@10.15.1",
+	"packageManager": "pnpm@10.15.0",
 	"workspaces": [
 		"packages/frontend-shared",
 		"packages/frontend",
@@ -62,22 +62,22 @@
 		"js-yaml": "4.1.0",
 		"postcss": "8.5.6",
 		"tar": "7.4.3",
-		"terser": "5.44.0",
+		"terser": "5.43.1",
 		"typescript": "5.9.2"
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "2.1.0",
 		"@types/js-yaml": "4.0.9",
-		"@types/node": "22.18.1",
-		"@typescript-eslint/eslint-plugin": "8.42.0",
-		"@typescript-eslint/parser": "8.42.0",
+		"@types/node": "22.17.2",
+		"@typescript-eslint/eslint-plugin": "8.40.0",
+		"@typescript-eslint/parser": "8.40.0",
 		"cross-env": "7.0.3",
 		"cypress": "14.5.4",
-		"eslint": "9.35.0",
+		"eslint": "9.34.0",
 		"globals": "16.3.0",
 		"ncp": "2.0.0",
-		"pnpm": "10.15.1",
-		"start-server-and-test": "2.1.0"
+		"pnpm": "10.15.0",
+		"start-server-and-test": "2.0.13"
 	},
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "4.22.0"

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/package.json

@@ -39,17 +39,17 @@
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
-		"@swc/core-darwin-arm64": "1.13.5",
-		"@swc/core-darwin-x64": "1.13.5",
+		"@swc/core-darwin-arm64": "1.13.4",
+		"@swc/core-darwin-x64": "1.13.4",
 		"@swc/core-freebsd-x64": "1.3.11",
-		"@swc/core-linux-arm-gnueabihf": "1.13.5",
-		"@swc/core-linux-arm64-gnu": "1.13.5",
-		"@swc/core-linux-arm64-musl": "1.13.5",
-		"@swc/core-linux-x64-gnu": "1.13.5",
-		"@swc/core-linux-x64-musl": "1.13.5",
-		"@swc/core-win32-arm64-msvc": "1.13.5",
-		"@swc/core-win32-ia32-msvc": "1.13.5",
-		"@swc/core-win32-x64-msvc": "1.13.5",
+		"@swc/core-linux-arm-gnueabihf": "1.13.4",
+		"@swc/core-linux-arm64-gnu": "1.13.4",
+		"@swc/core-linux-arm64-musl": "1.13.4",
+		"@swc/core-linux-x64-gnu": "1.13.4",
+		"@swc/core-linux-x64-musl": "1.13.4",
+		"@swc/core-win32-arm64-msvc": "1.13.4",
+		"@swc/core-win32-ia32-msvc": "1.13.4",
+		"@swc/core-win32-x64-msvc": "1.13.4",
 		"@tensorflow/tfjs": "4.22.0",
 		"@tensorflow/tfjs-node": "4.22.0",
 		"bufferutil": "4.0.9",
@@ -69,20 +69,20 @@
 		"utf-8-validate": "6.0.5"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.883.0",
-		"@aws-sdk/lib-storage": "3.883.0",
+		"@aws-sdk/client-s3": "3.873.0",
+		"@aws-sdk/lib-storage": "3.873.0",
 		"@discordapp/twemoji": "16.0.1",
 		"@fastify/accepts": "5.0.2",
 		"@fastify/cookie": "11.0.2",
 		"@fastify/cors": "10.1.0",
 		"@fastify/express": "4.0.2",
 		"@fastify/http-proxy": "10.0.2",
-		"@fastify/multipart": "9.2.1",
+		"@fastify/multipart": "9.0.3",
 		"@fastify/static": "8.2.0",
 		"@fastify/view": "10.0.2",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.2.3",
-		"@napi-rs/canvas": "0.1.79",
+		"@napi-rs/canvas": "0.1.77",
 		"@nestjs/common": "11.1.6",
 		"@nestjs/core": "11.1.6",
 		"@nestjs/testing": "11.1.6",
@@ -93,7 +93,7 @@
 		"@sinonjs/fake-timers": "11.3.1",
 		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.7.8",
-		"@swc/core": "1.13.5",
+		"@swc/core": "1.13.4",
 		"@twemoji/parser": "16.0.0",
 		"@types/redis-info": "3.0.3",
 		"accepts": "1.3.8",
@@ -103,7 +103,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.3",
-		"bullmq": "5.58.5",
+		"bullmq": "5.58.1",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.6.0",
@@ -114,13 +114,13 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "5.6.0",
+		"fastify": "5.5.0",
 		"fastify-raw-body": "5.0.0",
 		"feed": "4.2.2",
 		"file-type": "19.6.0",
 		"fluent-ffmpeg": "2.1.3",
 		"form-data": "4.0.4",
-		"got": "14.4.8",
+		"got": "14.4.7",
 		"happy-dom": "16.8.1",
 		"hpagent": "1.2.0",
 		"htmlescape": "1.1.1",
@@ -141,7 +141,7 @@
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
-		"ms": "3.0.0-canary.202508261828",
+		"ms": "3.0.0-canary.1",
 		"nanoid": "5.1.5",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
@@ -175,7 +175,7 @@
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"systeminformation": "5.27.8",
+		"systeminformation": "5.27.7",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.5",
 		"tsc-alias": "1.8.16",
@@ -210,7 +210,7 @@
 		"@types/jsrsasign": "10.5.15",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "22.18.1",
+		"@types/node": "22.17.2",
 		"@types/nodemailer": "6.4.19",
 		"@types/oauth": "0.9.6",
 		"@types/oauth2orize": "1.11.5",
@@ -222,7 +222,7 @@
 		"@types/ratelimiter": "3.4.6",
 		"@types/rename": "1.0.7",
 		"@types/sanitize-html": "2.16.0",
-		"@types/semver": "7.7.1",
+		"@types/semver": "7.7.0",
 		"@types/simple-oauth2": "5.0.7",
 		"@types/sinonjs__fake-timers": "8.1.5",
 		"@types/supertest": "6.0.3",
@@ -231,8 +231,8 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.4",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.42.0",
-		"@typescript-eslint/parser": "8.42.0",
+		"@typescript-eslint/eslint-plugin": "8.40.0",
+		"@typescript-eslint/parser": "8.40.0",
 		"aws-sdk-client-mock": "4.1.0",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.32.0",

packages/backend/src/core/AiService.ts

@@ -29,7 +29,7 @@ export class AiService {
 	}
 
 	@bindThis
-	public async detectSensitive(source: string | Buffer): Promise<nsfw.PredictionType[] | null> {
+	public async detectSensitive(path: string): Promise<nsfw.PredictionType[] | null> {
 		try {
 			if (isSupportedCpu === undefined) {
 				isSupportedCpu = await this.computeIsSupportedCpu();
@@ -51,7 +51,7 @@ export class AiService {
 				});
 			}
 
-			const buffer = source instanceof Buffer ? source : await fs.promises.readFile(source);
+			const buffer = await fs.promises.readFile(path);
 			const image = await tf.node.decodeImage(buffer, 3) as any;
 			try {
 				const predictions = await this.model.classify(image);

packages/backend/src/core/FileInfoService.ts

@@ -21,7 +21,6 @@ import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import type { PredictionType } from 'nsfwjs';
-import { isMimeImage } from '@/misc/is-mime-image.js';
 
 export type FileInfo = {
 	size: number;
@@ -205,7 +204,16 @@ export class FileInfoService {
 			return [sensitive, porn];
 		}
 
-		if (analyzeVideo && (mime === 'image/apng' || mime.startsWith('video/'))) {
+		if ([
+			'image/jpeg',
+			'image/png',
+			'image/webp',
+		].includes(mime)) {
+			const result = await this.aiService.detectSensitive(source);
+			if (result) {
+				[sensitive, porn] = judgePrediction(result);
+			}
+		} else if (analyzeVideo && (mime === 'image/apng' || mime.startsWith('video/'))) {
 			const [outDir, disposeOutDir] = await createTempDir();
 			try {
 				const command = FFmpeg()
@@ -273,23 +281,6 @@ export class FileInfoService {
 			} finally {
 				disposeOutDir();
 			}
-		} else if (isMimeImage(mime, 'sharp-convertible-image-with-bmp')) {
-			/*
-			 * tfjs-node は限られた画像形式しか受け付けないため、sharp で PNG に変換する
-			 * せっかくなので内部処理で使われる最大サイズの299x299に事前にリサイズする
-			 */
-			const png = await (await sharpBmp(source, mime))
-				.resize(299, 299, {
-					withoutEnlargement: false,
-				})
-				.rotate()
-				.flatten({ background: { r: 119, g: 119, b: 119 } }) // 透過部分を18%グレーで塗りつぶす
-				.png()
-				.toBuffer();
-			const result = await this.aiService.detectSensitive(png);
-			if (result) {
-				[sensitive, porn] = judgePrediction(result);
-			}
 		}
 
 		return [sensitive, porn];

packages/backend/src/core/QueueService.ts

@@ -756,8 +756,8 @@ export class QueueService {
 	@bindThis
 	public async queueRetryJob(queueType: typeof QUEUE_TYPES[number], jobId: string) {
 		const queue = this.getQueue(queueType);
-		const job = await queue.getJob(jobId);
-		if (job != null) {
+		const job: Bull.Job | null = await queue.getJob(jobId);
+		if (job) {
 			if (job.finishedOn != null) {
 				await job.retry();
 			} else {
@@ -769,8 +769,8 @@ export class QueueService {
 	@bindThis
 	public async queueRemoveJob(queueType: typeof QUEUE_TYPES[number], jobId: string) {
 		const queue = this.getQueue(queueType);
-		const job = await queue.getJob(jobId);
-		if (job != null) {
+		const job: Bull.Job | null = await queue.getJob(jobId);
+		if (job) {
 			await job.remove();
 		}
 	}
@@ -803,8 +803,8 @@ export class QueueService {
 	@bindThis
 	public async queueGetJob(queueType: typeof QUEUE_TYPES[number], jobId: string) {
 		const queue = this.getQueue(queueType);
-		const job = await queue.getJob(jobId);
-		if (job != null) {
+		const job: Bull.Job | null = await queue.getJob(jobId);
+		if (job) {
 			return this.packJobData(job);
 		} else {
 			throw new Error(`Job not found: ${jobId}`);

packages/backend/src/core/RoleService.ts

@@ -101,15 +101,14 @@ 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/*',

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/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/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/server/api/ApiServerService.ts

@@ -176,17 +176,6 @@ export class ApiServerService {
 			}
 		});
 
-		fastify.all('/clear-browser-cache', (request, reply) => {
-			if (['GET', 'POST'].includes(request.method)) {
-				reply.header('Clear-Site-Data', '"cache", "prefetchCache", "prerenderCache", "executionContexts"');
-				reply.code(204);
-				reply.send();
-			} else {
-				reply.code(405);
-				reply.send();
-			}
-		});
-
 		// Make sure any unknown path under /api returns HTTP 404 Not Found,
 		// because otherwise ClientServerService will return the base client HTML
 		// page with HTTP 200.

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

@@ -34,22 +34,13 @@ export const meta = {
 	res: {
 		type: 'object',
 		optional: false, nullable: false,
-		allOf: [
-			{
-				type: 'object',
-				ref: 'MeDetailed',
-			},
-			{
-				type: 'object',
+		ref: 'MeDetailed',
+		properties: {
+			token: {
+				type: 'string',
 				optional: false, nullable: false,
-				properties: {
-					token: {
-						type: 'string',
-						optional: false, nullable: false,
-					},
-				},
-			}
-		],
+			},
+		},
 	},
 } as const;
 

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/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/api/endpoints/users/lists/show.ts

@@ -22,26 +22,17 @@ export const meta = {
 	res: {
 		type: 'object',
 		optional: false, nullable: false,
-		allOf: [
-			{
-				type: 'object',
-				ref: 'UserList',
+		ref: 'UserList',
+		properties: {
+			likedCount: {
+				type: 'number',
+				optional: true, nullable: false,
 			},
-			{
-				type: 'object',
-				optional: false, nullable: false,
-				properties: {
-					likedCount: {
-						type: 'number',
-						optional: true, nullable: false,
-					},
-					isLiked: {
-						type: 'boolean',
-						optional: true, nullable: false,
-					},
-				},
+			isLiked: {
+				type: 'boolean',
+				optional: true, nullable: false,
 			},
-		],
+		},
 	},
 
 	errors: {

packages/backend/test-federation/test/utils.ts

@@ -68,6 +68,7 @@ async function createAdmin(host: Host): Promise<Misskey.entities.SignupResponse
 	return await client.request('admin/accounts/create', ADMIN_PARAMS).then(res => {
 		ADMIN_CACHE.set(host, {
 			id: res.id,
+			// @ts-expect-error FIXME: openapi-typescript generates incorrect response type for this endpoint, so ignore this
 			i: res.token,
 		});
 		return res as Misskey.entities.SignupResponse;

packages/frontend-builder/package.json

@@ -20,6 +20,6 @@
 	"dependencies": {
 		"estree-walker": "3.0.3",
 		"magic-string": "0.30.17",
-		"vite": "7.0.7"
+		"vite": "7.0.6"
 	}
 }

packages/frontend-embed/eslint.config.js

@@ -46,71 +46,9 @@ export default [
 				allowSingleExtends: true,
 			}],
 			'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
-			// window ... グローバルスコープと衝突し、予期せぬ結果を招くため
-			// e ... error や event など、複数のキーワードの頭文字であり分かりにくいため
-			// close ... window.closeと衝突 or 紛らわしい
-			// open ... window.openと衝突 or 紛らわしい
-			// fetch ... window.fetchと衝突 or 紛らわしい
-			// location ... window.locationと衝突 or 紛らわしい
-			// document ... window.documentと衝突 or 紛らわしい
-			// history ... window.historyと衝突 or 紛らわしい
-			// scroll ... window.scrollと衝突 or 紛らわしい
-			// setTimeout ... window.setTimeoutと衝突 or 紛らわしい
-			// setInterval ... window.setIntervalと衝突 or 紛らわしい
-			// clearTimeout ... window.clearTimeoutと衝突 or 紛らわしい
-			// clearInterval ... window.clearIntervalと衝突 or 紛らわしい
-			'id-denylist': ['error', 'window', 'e', 'close', 'open', 'fetch', 'location', 'document', 'history', 'scroll', 'setTimeout', 'setInterval', 'clearTimeout', 'clearInterval'],
-			'no-restricted-globals': [
-				'error',
-				{
-					'name': 'open',
-					'message': 'Use `window.open`.',
-				},
-				{
-					'name': 'close',
-					'message': 'Use `window.close`.',
-				},
-				{
-					'name': 'fetch',
-					'message': 'Use `window.fetch`.',
-				},
-				{
-					'name': 'location',
-					'message': 'Use `window.location`.',
-				},
-				{
-					'name': 'document',
-					'message': 'Use `window.document`.',
-				},
-				{
-					'name': 'history',
-					'message': 'Use `window.history`.',
-				},
-				{
-					'name': 'scroll',
-					'message': 'Use `window.scroll`.',
-				},
-				{
-					'name': 'setTimeout',
-					'message': 'Use `window.setTimeout`.',
-				},
-				{
-					'name': 'setInterval',
-					'message': 'Use `window.setInterval`.',
-				},
-				{
-					'name': 'clearTimeout',
-					'message': 'Use `window.clearTimeout`.',
-				},
-				{
-					'name': 'clearInterval',
-					'message': 'Use `window.clearInterval`.',
-				},
-				{
-					'name': 'name',
-					'message': 'Use `window.name`. もしくは name という変数名を定義し忘れている',
-				},
-			],
+			// window の禁止理由: グローバルスコープと衝突し、予期せぬ結果を招くため
+			// e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため
+			'id-denylist': ['error', 'window', 'e'],
 			'no-shadow': ['warn'],
 			'vue/attributes-order': ['error', {
 				alphabetical: false,

packages/frontend-embed/package.json

@@ -13,10 +13,10 @@
 		"@discordapp/twemoji": "16.0.1",
 		"@rollup/plugin-json": "6.1.0",
 		"@rollup/plugin-replace": "6.0.2",
-		"@rollup/pluginutils": "5.3.0",
+		"@rollup/pluginutils": "5.2.0",
 		"@twemoji/parser": "16.0.0",
 		"@vitejs/plugin-vue": "6.0.1",
-		"@vue/compiler-sfc": "3.5.21",
+		"@vue/compiler-sfc": "3.5.19",
 		"astring": "1.9.0",
 		"buraha": "0.0.1",
 		"estree-walker": "3.0.3",
@@ -26,16 +26,16 @@
 		"mfm-js": "0.25.0",
 		"misskey-js": "workspace:*",
 		"punycode.js": "2.3.1",
-		"rollup": "4.50.1",
-		"sass": "1.92.1",
-		"shiki": "3.12.2",
+		"rollup": "4.48.0",
+		"sass": "1.90.0",
+		"shiki": "3.11.0",
 		"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.5",
-		"vue": "3.5.21"
+		"vite": "7.1.3",
+		"vue": "3.5.19"
 	},
 	"devDependencies": {
 		"@misskey-dev/summaly": "5.2.3",
@@ -43,14 +43,14 @@
 		"@testing-library/vue": "8.1.0",
 		"@types/estree": "1.0.8",
 		"@types/micromatch": "4.0.9",
-		"@types/node": "22.18.1",
+		"@types/node": "22.17.2",
 		"@types/punycode.js": "npm:@types/punycode@2.1.4",
 		"@types/tinycolor2": "1.4.6",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.42.0",
-		"@typescript-eslint/parser": "8.42.0",
+		"@typescript-eslint/eslint-plugin": "8.40.0",
+		"@typescript-eslint/parser": "8.40.0",
 		"@vitest/coverage-v8": "3.2.4",
-		"@vue/runtime-core": "3.5.21",
+		"@vue/runtime-core": "3.5.19",
 		"acorn": "8.15.0",
 		"cross-env": "10.0.0",
 		"eslint-plugin-import": "2.32.0",
@@ -59,11 +59,11 @@
 		"happy-dom": "18.0.1",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.8",
-		"msw": "2.11.1",
+		"msw": "2.10.5",
 		"nodemon": "3.1.10",
 		"prettier": "3.6.2",
-		"start-server-and-test": "2.1.0",
-		"tsx": "4.20.5",
+		"start-server-and-test": "2.0.13",
+		"tsx": "4.20.4",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vue-component-type-helpers": "3.0.6",
 		"vue-eslint-parser": "10.2.0",

packages/frontend-embed/src/boot.ts

@@ -33,7 +33,7 @@ import type { Theme } from '@/theme.js';
 console.log('Misskey Embed');
 
 //#region Embedパラメータの取得・パース
-const params = new URLSearchParams(window.location.search);
+const params = new URLSearchParams(location.search);
 const embedParams = parseEmbedParams(params);
 if (_DEV_) console.log(embedParams);
 //#endregion
@@ -81,7 +81,7 @@ storeBootloaderErrors({ ...i18n.ts._bootErrors, reload: i18n.ts.reload });
 //#endregion
 
 // サイズの制限
-window.document.documentElement.style.maxWidth = '500px';
+document.documentElement.style.maxWidth = '500px';
 
 // iframeIdの設定
 function setIframeIdHandler(event: MessageEvent) {
@@ -114,16 +114,16 @@ app.provide(DI.embedParams, embedParams);
 const rootEl = ((): HTMLElement => {
 	const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
 
-	const currentRoot = window.document.getElementById(MISSKEY_MOUNT_DIV_ID);
+	const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID);
 
 	if (currentRoot) {
 		console.warn('multiple import detected');
 		return currentRoot;
 	}
 
-	const root = window.document.createElement('div');
+	const root = document.createElement('div');
 	root.id = MISSKEY_MOUNT_DIV_ID;
-	window.document.body.appendChild(root);
+	document.body.appendChild(root);
 	return root;
 })();
 
@@ -159,7 +159,7 @@ console.log(i18n.tsx._selfXssPrevention.description3({ link: 'https://misskey-hu
 //#endregion
 
 function removeSplash() {
-	const splash = window.document.getElementById('splash');
+	const splash = document.getElementById('splash');
 	if (splash) {
 		splash.style.opacity = '0';
 		splash.style.pointerEvents = 'none';

packages/frontend-embed/src/components/EmImgWithBlurhash.vue

@@ -19,7 +19,7 @@ import { extractAvgColorFromBlurhash } from '@@/js/extract-avg-color-from-blurha
 const canvasPromise = new Promise<WorkerMultiDispatch | HTMLCanvasElement>(resolve => {
 	// テスト環境で Web Worker インスタンスは作成できない
 	if (import.meta.env.MODE === 'test') {
-		const canvas = window.document.createElement('canvas');
+		const canvas = document.createElement('canvas');
 		canvas.width = 64;
 		canvas.height = 64;
 		resolve(canvas);
@@ -34,7 +34,7 @@ const canvasPromise = new Promise<WorkerMultiDispatch | HTMLCanvasElement>(resol
 			);
 			resolve(workers);
 		} else {
-			const canvas = window.document.createElement('canvas');
+			const canvas = document.createElement('canvas');
 			canvas.width = 64;
 			canvas.height = 64;
 			resolve(canvas);

packages/frontend-embed/src/components/EmInstanceTicker.vue

@@ -29,7 +29,7 @@ const props = defineProps<{
 // if no instance data is given, this is for the local instance
 const instance = props.instance ?? {
 	name: serverMetadata.name,
-	themeColor: (window.document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement)?.content,
+	themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement)?.content,
 };
 
 const faviconUrl = computed(() => props.instance ? mediaProxy.getProxiedImageUrlNullable(props.instance.faviconUrl, 'preview') : mediaProxy.getProxiedImageUrlNullable(serverMetadata.iconUrl, 'preview') ?? '/favicon.ico');

packages/frontend-embed/src/components/EmMention.vue

@@ -27,7 +27,7 @@ const canonical = props.host === localHost ? `@${props.username}` : `@${props.us
 
 const url = `/${canonical}`;
 
-const bg = tinycolor(getComputedStyle(window.document.documentElement).getPropertyValue('--MI_THEME-mention'));
+const bg = tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--MI_THEME-mention'));
 bg.setAlpha(0.1);
 const bgCss = bg.toRgbString();
 </script>

packages/frontend-embed/src/components/EmPagination.vue

@@ -134,7 +134,7 @@ const isBackTop = ref(false);
 const empty = computed(() => items.value.size === 0);
 const error = ref(false);
 
-const scrollableElement = computed(() => rootEl.value ? getScrollContainer(rootEl.value) : window.document.body);
+const scrollableElement = computed(() => rootEl.value ? getScrollContainer(rootEl.value) : document.body);
 
 const visibility = useDocumentVisibility();
 
@@ -353,7 +353,7 @@ watch(visibility, () => {
 		BACKGROUND_PAUSE_WAIT_SEC * 1000);
 	} else { // 'visible'
 		if (timerForSetPause) {
-			window.clearTimeout(timerForSetPause);
+			clearTimeout(timerForSetPause);
 			timerForSetPause = null;
 		} else {
 			isPausingUpdate = false;
@@ -447,11 +447,11 @@ onBeforeMount(() => {
 	init().then(() => {
 		if (props.pagination.reversed) {
 			nextTick(() => {
-				window.setTimeout(toBottom, 800);
+				setTimeout(toBottom, 800);
 
 				// scrollToBottomでmoreFetchingボタンが画面外まで出るまで
 				// more = trueを遅らせる
-				window.setTimeout(() => {
+				setTimeout(() => {
 					moreFetching.value = false;
 				}, 2000);
 			});
@@ -461,11 +461,11 @@ onBeforeMount(() => {
 
 onBeforeUnmount(() => {
 	if (timerForSetPause) {
-		window.clearTimeout(timerForSetPause);
+		clearTimeout(timerForSetPause);
 		timerForSetPause = null;
 	}
 	if (preventAppearFetchMoreTimer.value) {
-		window.clearTimeout(preventAppearFetchMoreTimer.value);
+		clearTimeout(preventAppearFetchMoreTimer.value);
 		preventAppearFetchMoreTimer.value = null;
 	}
 	scrollObserver.value?.disconnect();

packages/frontend-embed/src/server-context.ts

@@ -4,7 +4,7 @@
  */
 import * as Misskey from 'misskey-js';
 
-const providedContextEl = window.document.getElementById('misskey_embedCtx');
+const providedContextEl = document.getElementById('misskey_embedCtx');
 
 export type ServerContext = {
 	clip?: Misskey.entities.Clip;

packages/frontend-embed/src/server-metadata.ts

@@ -6,7 +6,7 @@
 import * as Misskey from 'misskey-js';
 import { misskeyApi } from '@/misskey-api.js';
 
-const providedMetaEl = window.document.getElementById('misskey_meta');
+const providedMetaEl = document.getElementById('misskey_meta');
 
 const _serverMetadata: Misskey.entities.MetaDetailed | null = (providedMetaEl && providedMetaEl.textContent) ? JSON.parse(providedMetaEl.textContent) : null;
 

packages/frontend-embed/src/theme.ts

@@ -35,15 +35,15 @@ export function assertIsTheme(theme: Record<string, unknown>): theme is Theme {
 export function applyTheme(theme: Theme, persist = true) {
 	if (timeout) window.clearTimeout(timeout);
 
-	window.document.documentElement.classList.add('_themeChanging_');
+	document.documentElement.classList.add('_themeChanging_');
 
 	timeout = window.setTimeout(() => {
-		window.document.documentElement.classList.remove('_themeChanging_');
+		document.documentElement.classList.remove('_themeChanging_');
 	}, 1000);
 
 	const colorScheme = theme.base === 'dark' ? 'dark' : 'light';
 
-	window.document.documentElement.dataset.colorScheme = colorScheme;
+	document.documentElement.dataset.colorScheme = colorScheme;
 
 	// Deep copy
 	const _theme = JSON.parse(JSON.stringify(theme));
@@ -55,7 +55,7 @@ export function applyTheme(theme: Theme, persist = true) {
 
 	const props = compile(_theme);
 
-	for (const tag of window.document.head.children) {
+	for (const tag of document.head.children) {
 		if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') {
 			tag.setAttribute('content', props['htmlThemeColor']);
 			break;
@@ -63,7 +63,7 @@ export function applyTheme(theme: Theme, persist = true) {
 	}
 
 	for (const [k, v] of Object.entries(props)) {
-		window.document.documentElement.style.setProperty(`--MI_THEME-${k}`, v.toString());
+		document.documentElement.style.setProperty(`--MI_THEME-${k}`, v.toString());
 	}
 
 	// iframeを正常に透過させるために、cssのcolor-schemeは `light dark;` 固定にしてある。style.scss参照

packages/frontend-embed/src/ui.vue

@@ -52,8 +52,8 @@ function safeURIDecode(str: string): string {
 	}
 }
 
-const page = window.location.pathname.split('/')[2];
-const contentId = safeURIDecode(window.location.pathname.split('/')[3]);
+const page = location.pathname.split('/')[2];
+const contentId = safeURIDecode(location.pathname.split('/')[3]);
 if (_DEV_) console.log(page, contentId);
 
 const embedParams = inject(DI.embedParams, defaultEmbedParams);

packages/frontend-shared/eslint.config.js

@@ -51,71 +51,9 @@ export default [
 				allowSingleExtends: true,
 			}],
 			'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
-			// window ... グローバルスコープと衝突し、予期せぬ結果を招くため
-			// e ... error や event など、複数のキーワードの頭文字であり分かりにくいため
-			// close ... window.closeと衝突 or 紛らわしい
-			// open ... window.openと衝突 or 紛らわしい
-			// fetch ... window.fetchと衝突 or 紛らわしい
-			// location ... window.locationと衝突 or 紛らわしい
-			// document ... window.documentと衝突 or 紛らわしい
-			// history ... window.historyと衝突 or 紛らわしい
-			// scroll ... window.scrollと衝突 or 紛らわしい
-			// setTimeout ... window.setTimeoutと衝突 or 紛らわしい
-			// setInterval ... window.setIntervalと衝突 or 紛らわしい
-			// clearTimeout ... window.clearTimeoutと衝突 or 紛らわしい
-			// clearInterval ... window.clearIntervalと衝突 or 紛らわしい
-			'id-denylist': ['error', 'window', 'e', 'close', 'open', 'fetch', 'location', 'document', 'history', 'scroll', 'setTimeout', 'setInterval', 'clearTimeout', 'clearInterval'],
-			'no-restricted-globals': [
-				'error',
-				{
-					'name': 'open',
-					'message': 'Use `window.open`.',
-				},
-				{
-					'name': 'close',
-					'message': 'Use `window.close`.',
-				},
-				{
-					'name': 'fetch',
-					'message': 'Use `window.fetch`.',
-				},
-				{
-					'name': 'location',
-					'message': 'Use `window.location`.',
-				},
-				{
-					'name': 'document',
-					'message': 'Use `window.document`.',
-				},
-				{
-					'name': 'history',
-					'message': 'Use `window.history`.',
-				},
-				{
-					'name': 'scroll',
-					'message': 'Use `window.scroll`.',
-				},
-				{
-					'name': 'setTimeout',
-					'message': 'Use `window.setTimeout`.',
-				},
-				{
-					'name': 'setInterval',
-					'message': 'Use `window.setInterval`.',
-				},
-				{
-					'name': 'clearTimeout',
-					'message': 'Use `window.clearTimeout`.',
-				},
-				{
-					'name': 'clearInterval',
-					'message': 'Use `window.clearInterval`.',
-				},
-				{
-					'name': 'name',
-					'message': 'Use `window.name`. もしくは name という変数名を定義し忘れている',
-				},
-			],
+			// window の禁止理由: グローバルスコープと衝突し、予期せぬ結果を招くため
+			// e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため
+			'id-denylist': ['error', 'window', 'e'],
 			'no-shadow': ['warn'],
 			'vue/attributes-order': ['error', {
 				alphabetical: false,

packages/frontend-shared/js/config.ts

@@ -4,15 +4,15 @@
  */
 
 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-const address = new URL(window.document.querySelector<HTMLMetaElement>('meta[property="instance_url"]')?.content || window.location.href);
-const siteName = window.document.querySelector<HTMLMetaElement>('meta[property="og:site_name"]')?.content;
+const address = new URL(document.querySelector<HTMLMetaElement>('meta[property="instance_url"]')?.content || location.href);
+const siteName = document.querySelector<HTMLMetaElement>('meta[property="og:site_name"]')?.content;
 
 export const host = address.host;
 export const hostname = address.hostname;
 export const url = address.origin;
 export const port = address.port;
-export const apiUrl = window.location.origin + '/api';
-export const wsOrigin = window.location.origin;
+export const apiUrl = location.origin + '/api';
+export const wsOrigin = location.origin;
 export const lang = localStorage.getItem('lang') ?? 'en-US';
 export const langs = _LANGS_;
 export const version = _VERSION_;

packages/frontend-shared/js/scroll.ts

@@ -51,7 +51,7 @@ export function onScrollTop(el: HTMLElement, cb: (topVisible: boolean) => unknow
 	// - toleranceの範囲内に収まる程度の微量なスクロールが発生した
 	let prevTopVisible = firstTopVisible;
 	const onScroll = () => {
-		if (!window.document.body.contains(el)) return;
+		if (!document.body.contains(el)) return;
 
 		const topVisible = isHeadVisible(el, tolerance);
 		if (topVisible !== prevTopVisible) {
@@ -78,7 +78,7 @@ export function onScrollBottom(el: HTMLElement, cb: () => unknown, tolerance = 1
 
 	const containerOrWindow = container ?? window;
 	const onScroll = () => {
-		if (!window.document.body.contains(el)) return;
+		if (!document.body.contains(el)) return;
 		if (isTailVisible(el, 1, container)) {
 			cb();
 			if (once) removeListener();
@@ -145,8 +145,8 @@ export function isTailVisible(el: HTMLElement, tolerance = 1, container = getScr
 // https://ja.javascript.info/size-and-scroll-window#ref-932
 export function getBodyScrollHeight() {
 	return Math.max(
-		window.document.body.scrollHeight, window.document.documentElement.scrollHeight,
-		window.document.body.offsetHeight, window.document.documentElement.offsetHeight,
-		window.document.body.clientHeight, window.document.documentElement.clientHeight,
+		document.body.scrollHeight, document.documentElement.scrollHeight,
+		document.body.offsetHeight, document.documentElement.offsetHeight,
+		document.body.clientHeight, document.documentElement.clientHeight,
 	);
 }

packages/frontend-shared/js/use-document-visibility.ts

@@ -7,18 +7,18 @@ import { onMounted, onUnmounted, ref } from 'vue';
 import type { Ref } from 'vue';
 
 export function useDocumentVisibility(): Ref<DocumentVisibilityState> {
-	const visibility = ref(window.document.visibilityState);
+	const visibility = ref(document.visibilityState);
 
 	const onChange = (): void => {
-		visibility.value = window.document.visibilityState;
+		visibility.value = document.visibilityState;
 	};
 
 	onMounted(() => {
-		window.document.addEventListener('visibilitychange', onChange);
+		document.addEventListener('visibilitychange', onChange);
 	});
 
 	onUnmounted(() => {
-		window.document.removeEventListener('visibilitychange', onChange);
+		document.removeEventListener('visibilitychange', onChange);
 	});
 
 	return visibility;

packages/frontend-shared/package.json

@@ -21,9 +21,9 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"devDependencies": {
-		"@types/node": "22.18.1",
-		"@typescript-eslint/eslint-plugin": "8.42.0",
-		"@typescript-eslint/parser": "8.42.0",
+		"@types/node": "22.17.2",
+		"@typescript-eslint/eslint-plugin": "8.40.0",
+		"@typescript-eslint/parser": "8.40.0",
 		"esbuild": "0.25.9",
 		"eslint-plugin-vue": "10.4.0",
 		"nodemon": "3.1.10",
@@ -35,6 +35,6 @@
 	],
 	"dependencies": {
 		"misskey-js": "workspace:*",
-		"vue": "3.5.21"
+		"vue": "3.5.19"
 	}
 }

packages/frontend/package.json

@@ -23,13 +23,13 @@
 		"@misskey-dev/browser-image-resizer": "2024.1.0",
 		"@rollup/plugin-json": "6.1.0",
 		"@rollup/plugin-replace": "6.0.2",
-		"@rollup/pluginutils": "5.3.0",
-		"@sentry/vue": "10.10.0",
+		"@rollup/pluginutils": "5.2.0",
+		"@sentry/vue": "10.5.0",
 		"@syuilo/aiscript": "1.1.0",
 		"@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0",
 		"@twemoji/parser": "16.0.0",
 		"@vitejs/plugin-vue": "6.0.1",
-		"@vue/compiler-sfc": "3.5.21",
+		"@vue/compiler-sfc": "3.5.19",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.15",
 		"analytics": "0.8.19",
 		"astring": "1.9.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.1.4",
+		"chromatic": "13.1.3",
 		"compare-versions": "6.1.1",
 		"cropperjs": "2.0.1",
 		"date-fns": "4.1.0",
@@ -63,21 +63,21 @@
 		"misskey-reversi": "workspace:*",
 		"photoswipe": "5.4.4",
 		"punycode.js": "2.3.1",
-		"rollup": "4.50.1",
+		"rollup": "4.48.0",
 		"sanitize-html": "2.17.0",
-		"sass": "1.92.1",
-		"shiki": "3.12.2",
+		"sass": "1.90.0",
+		"shiki": "3.11.0",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
-		"three": "0.180.0",
+		"three": "0.179.1",
 		"throttle-debounce": "5.0.2",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.16",
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.9.2",
 		"v-code-diff": "1.13.1",
-		"vite": "7.1.5",
-		"vue": "3.5.21",
+		"vite": "7.1.3",
+		"vue": "3.5.19",
 		"vuedraggable": "next",
 		"wanakana": "5.3.1"
 	},
@@ -85,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.5",
+		"@storybook/addon-links": "9.1.3",
 		"@storybook/addon-mdx-gfm": "8.6.14",
 		"@storybook/addon-storysource": "8.6.14",
 		"@storybook/blocks": "8.6.14",
@@ -93,31 +93,31 @@
 		"@storybook/core-events": "8.6.14",
 		"@storybook/manager-api": "8.6.14",
 		"@storybook/preview-api": "8.6.14",
-		"@storybook/react": "9.1.5",
-		"@storybook/react-vite": "9.1.5",
+		"@storybook/react": "9.1.3",
+		"@storybook/react-vite": "9.1.3",
 		"@storybook/test": "8.6.14",
 		"@storybook/theming": "8.6.14",
 		"@storybook/types": "8.6.14",
-		"@storybook/vue3": "9.1.5",
-		"@storybook/vue3-vite": "9.1.5",
+		"@storybook/vue3": "9.1.3",
+		"@storybook/vue3-vite": "9.1.3",
 		"@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.0",
 		"@types/micromatch": "4.0.9",
-		"@types/node": "22.18.1",
+		"@types/node": "22.17.2",
 		"@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.42.0",
-		"@typescript-eslint/parser": "8.42.0",
+		"@typescript-eslint/eslint-plugin": "8.40.0",
+		"@typescript-eslint/parser": "8.40.0",
 		"@vitest/coverage-v8": "3.2.4",
-		"@vue/compiler-core": "3.5.21",
-		"@vue/runtime-core": "3.5.21",
+		"@vue/compiler-core": "3.5.19",
+		"@vue/runtime-core": "3.5.19",
 		"acorn": "8.15.0",
 		"cross-env": "10.0.0",
 		"cypress": "14.5.4",
@@ -128,17 +128,17 @@
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.8",
 		"minimatch": "10.0.3",
-		"msw": "2.11.1",
+		"msw": "2.10.5",
 		"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.0",
-		"storybook": "9.1.5",
+		"start-server-and-test": "2.0.13",
+		"storybook": "9.1.3",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
-		"tsx": "4.20.5",
+		"tsx": "4.20.4",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vitest": "3.2.4",
 		"vitest-fetch-mock": "0.4.5",

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/MkAvatars.vue

@@ -29,6 +29,6 @@ const users = ref<Misskey.entities.UserLite[]>([]);
 onMounted(async () => {
 	users.value = await misskeyApi('users/show', {
 		userIds: props.userIds,
-	});
+	}) as unknown as Misskey.entities.UserLite[];
 });
 </script>

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/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, fillSquare ? $style.active : null]" @click="fillSquare = true"><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,100 +212,6 @@ watch(enabled, () => {
 		renderer.render();
 	}
 });
-
-const fillSquare = ref(false);
-
-function onImagePointerdown(ev: PointerEvent) {
-	if (canvasEl.value == null || imageBitmap == null || !fillSquare.value) 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();
-	layers.push({
-		id,
-		fxId: 'fillSquare',
-		params: {
-			offsetX: 0,
-			offsetY: 0,
-			scaleX: 0.1,
-			scaleY: 0.1,
-			angle: 0,
-			opacity: 1,
-			color: [1, 1, 1],
-		},
-	});
-
-	_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);
-
-		fillSquare.value = false;
-	}
-
-	canvasEl.value.addEventListener('pointermove', move);
-	canvasEl.value.addEventListener('pointerup', up);
-	canvasEl.value.setPointerCapture(ev.pointerId);
-}
 </script>
 
 <style module>
@@ -348,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;
@@ -392,11 +283,9 @@ function onImagePointerdown(ev: PointerEvent) {
 	position: absolute;
 	top: 0;
 	left: 0;
-	width: -webkit-fill-available;
-	width: stretch;
-	height: -webkit-fill-available;
-	height: stretch;
-	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/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/MkPoll.vue

@@ -27,16 +27,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { host } from '@@/js/config.js';
+import { useInterval } from '@@/js/use-interval.js';
 import type { OpenOnRemoteOptions } from '@/utility/please-login.js';
 import { sum } from '@/utility/array.js';
 import { pleaseLogin } from '@/utility/please-login.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
-import { useLowresTime } from '@/composables/use-lowres-time.js';
 
 const props = defineProps<{
 	noteId: string;
@@ -48,21 +48,7 @@ const props = defineProps<{
 	author?: Misskey.entities.UserLite;
 }>();
 
-const now = useLowresTime();
-
-const expiresAtTime = computed(() => props.expiresAt ? new Date(props.expiresAt).getTime() : null);
-
-const remaining = computed(() => {
-	if (expiresAtTime.value == null) return -1;
-	return Math.floor(Math.max(expiresAtTime.value - now.value, 0) / 1000);
-});
-
-const remainingWatchStop = watch(remaining, (to) => {
-	if (to <= 0) {
-		showResult.value = true;
-		remainingWatchStop();
-	}
-}, { immediate: true });
+const remaining = ref(-1);
 
 const total = computed(() => sum(props.choices.map(x => x.votes)));
 const closed = computed(() => remaining.value === 0);
@@ -85,7 +71,22 @@ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	url: `https://${host}/notes/${props.noteId}`,
 }));
 
-const vote = async (id: number) => {
+// 期限付きアンケート
+if (props.expiresAt) {
+	const tick = () => {
+		remaining.value = Math.floor(Math.max(new Date(props.expiresAt!).getTime() - Date.now(), 0) / 1000);
+		if (remaining.value === 0) {
+			showResult.value = true;
+		}
+	};
+
+	useInterval(tick, 3000, {
+		immediate: true,
+		afterMounted: false,
+	});
+}
+
+const vote = async (id) => {
 	if (props.readOnly || closed.value || isVoted.value) return;
 
 	pleaseLogin({ openOnRemote: pleaseLoginContext.value });

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/MkPostForm.vue

@@ -567,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,
 	});
@@ -823,15 +823,17 @@ 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,
-		cw: useCw.value ? cw.value || null : null,
+		useCw: useCw.value,
+		cw: cw.value,
 		visibility: visibility.value,
 		localOnly: localOnly.value,
 		hashtag: hashtags.value,
 		...(files.value.length > 0 ? { fileIds: files.value.map(f => f.id) } : {}),
 		poll: poll.value,
 		...(visibleUsers.value.length > 0 ? { visibleUserIds: visibleUsers.value.map(x => x.id) } : {}),
-		renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : quoteId.value ? quoteId.value : undefined,
+		renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : undefined,
 		replyId: replyTargetNote.value ? replyTargetNote.value.id : undefined,
+		quoteId: quoteId.value,
 		channelId: targetChannel.value ? targetChannel.value.id : undefined,
 		reactionAcceptance: reactionAcceptance.value,
 	}).then(() => {

packages/frontend/src/components/MkPushNotificationAllowButton.vue

@@ -90,7 +90,7 @@ function subscribe() {
 				publickey: encode(subscription.getKey('p256dh')),
 			});
 		}, async err => { // When subscribe failed
-			// 通知が許可されていなかったとき
+		// 通知が許可されていなかったとき
 			if (err?.name === 'NotAllowedError') {
 				console.info('User denied the notification permission request.');
 				return;
@@ -114,13 +114,14 @@ async function unsubscribe() {
 
 	if ($i && accounts.length >= 2) {
 		apiWithDialog('sw/unregister', {
+			i: $i.token,
 			endpoint,
-		}, $i.token);
+		});
 	} else {
 		pushSubscription.value.unsubscribe();
 		apiWithDialog('sw/unregister', {
 			endpoint,
-		}, null);
+		});
 		pushSubscription.value = null;
 	}
 }
@@ -133,7 +134,7 @@ function encode(buffer: ArrayBuffer | null) {
  * Convert the URL safe base64 string to a Uint8Array
  * @param base64String base64 string
  */
-function urlBase64ToUint8Array(base64String: string): BufferSource {
+function urlBase64ToUint8Array(base64String: string): Uint8Array {
 	const padding = '='.repeat((4 - base64String.length % 4) % 4);
 	const base64 = (base64String + padding)
 		.replace(/-/g, '+')

packages/frontend/src/components/MkRolePreview.vue

@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkA :to="forModeration ? `/admin/roles/${role.id}` : `/roles/${role.id}`" :class="$style.root" tabindex="-1" :style="{ '--color': role.color }">
 	<template v-if="forModeration">
-		<i v-if="'isPublic' in role && role.isPublic" class="ti ti-world" :class="$style.icon" style="color: var(--MI_THEME-success)"></i>
+		<i v-if="role.isPublic" class="ti ti-world" :class="$style.icon" style="color: var(--MI_THEME-success)"></i>
 		<i v-else class="ti ti-lock" :class="$style.icon" style="color: var(--MI_THEME-warn)"></i>
 	</template>
 
@@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</template>
 			</span>
 			<span :class="$style.bodyName">{{ role.name }}</span>
-			<template v-if="detailed && 'target' in role && 'usersCount' in role">
+			<template v-if="detailed">
 				<span v-if="role.target === 'manual'" :class="$style.bodyUsers">{{ role.usersCount }} users</span>
 				<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">? users</span>
 			</template>
@@ -39,7 +39,7 @@ import * as Misskey from 'misskey-js';
 import { i18n } from '@/i18n.js';
 
 const props = withDefaults(defineProps<{
-	role: Misskey.entities.Role | Misskey.entities.IResponse['roles'][number];
+	role: Misskey.entities.Role;
 	forModeration: boolean;
 	detailed?: boolean;
 }>(), {

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,26 +140,52 @@ onMounted(() => {
 	});
 });
 
-watch([model, () => 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) {
-					found = option;
+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 === modelValue.value) {
+						found = option;
+						break;
+					}
+				}
+			} else {
+				if (item.value === modelValue.value) {
+					found = item;
 					break;
 				}
 			}
-		} else {
-			if (item.value === model.value) {
-				found = item;
-				break;
+		}
+		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;
+				}
 			}
 		}
-	}
-	if (found) {
-		currentValueText.value = found.label;
-	}
+	};
+
+	scanOptions(slots.default!());
 }, { immediate: true, deep: true });
 
 function show() {
@@ -166,32 +196,68 @@ function show() {
 
 	const menu: MenuItem[] = [];
 
-	for (const item of props.items) {
-		if (item.type === 'group') {
-			if (item.label != null) {
+	if (props.items) {
+		for (const item of props.items) {
+			if (item.type === 'group') {
 				menu.push({
 					type: 'label',
 					text: item.label,
 				});
-			}
-			for (const option of item.items) {
+				for (const option of item.items) {
+					menu.push({
+						text: option.label,
+						active: computed(() => modelValue.value === option.value),
+						action: () => {
+							emit('update:modelValue', option.value);
+						},
+					});
+				}
+			} else {
 				menu.push({
-					text: option.label,
-					active: computed(() => model.value === option.value),
+					text: item.label,
+					active: computed(() => modelValue.value === item.value),
 					action: () => {
-						model.value = option.value as ModelTChecked;
+						emit('update:modelValue', item.value);
 					},
 				});
 			}
-		} else {
+		}
+	} else {
+		let options = slots.default!();
+
+		const pushOption = (option: VNode) => {
 			menu.push({
-				text: item.label,
-				active: computed(() => model.value === item.value),
+				text: option.children as string,
+				active: computed(() => modelValue.value === option.props?.value),
 				action: () => {
-					model.value = item.value as ModelTChecked;
+					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, {

packages/frontend/src/components/MkUserPopup.vue

@@ -72,7 +72,7 @@ import { getStaticImageUrl } from '@/utility/media-proxy.js';
 
 const props = defineProps<{
 	showing: boolean;
-	q: string | Misskey.entities.UserDetailed;
+	q: string;
 	source: HTMLElement;
 }>();
 
@@ -99,11 +99,10 @@ async function fetchUser() {
 		user.value = props.q;
 		error.value = false;
 	} else {
-		const query: Misskey.entities.UsersShowRequest = props.q.startsWith('@') ?
+		const query: Omit<Misskey.entities.UsersShowRequest, 'userIds'> = props.q.startsWith('@') ?
 			Misskey.acct.parse(props.q.substring(1)) :
 			{ userId: props.q };
 
-		// @ts-expect-error payloadの引数側の型が正常に解決されない
 		misskeyApi('users/show', query).then(res => {
 			if (!props.showing) return;
 			user.value = res;

packages/frontend/src/components/MkWatermarkEditorDialog.vue

@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div :class="$style.controls">
 				<div class="_spacer _gaps">
-					<MkSelect v-model="type" :items="typeDef">
+					<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>
 
@@ -86,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();
 
@@ -187,18 +186,7 @@ async function cancel() {
 	dialog.value?.close();
 }
 
-const {
-	model: type,
-	def: typeDef,
-} = useMkSelect({
-	items: [
-		{ label: i18n.ts._watermarkEditor.text, value: 'text' },
-		{ label: i18n.ts._watermarkEditor.image, value: 'image' },
-		{ label: i18n.ts._watermarkEditor.advanced, value: 'advanced' },
-	],
-	initialValue: preset.layers.length > 1 ? 'advanced' : preset.layers[0].type,
-});
-
+const type = ref(preset.layers.length > 1 ? 'advanced' : preset.layers[0].type);
 watch(type, () => {
 	if (type.value === 'text') {
 		preset.layers = [createTextLayer()];

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/form/link.vue

@@ -4,39 +4,31 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<component
-	:is="to ? 'div' : 'button'"
-	:class="[
-		$style.root,
-		{
-			[$style.inline]: inline,
-			'_button': !to,
-		},
-	]"
->
-	<component
-		:is="to ? (external ? 'a' : 'MkA') : 'div'"
-		:class="[$style.main, { [$style.active]: active }]"
-		class="_button"
-		v-bind="to ? (external ? { href: to, target: '_blank' } : { to, behavior }) : {}"
-	>
+<div :class="[$style.root, { [$style.inline]: inline }]">
+	<a v-if="external" :class="$style.main" class="_button" :href="to" target="_blank">
 		<span :class="$style.icon"><slot name="icon"></slot></span>
-		<div :class="$style.headerText">
-			<div>
-				<MkCondensedLine :minScale="2 / 3"><slot></slot></MkCondensedLine>
-			</div>
-		</div>
+		<span :class="$style.text"><slot></slot></span>
 		<span :class="$style.suffix">
 			<span :class="$style.suffixText"><slot name="suffix"></slot></span>
-			<i :class="to && external ? 'ti ti-external-link' : 'ti ti-chevron-right'"></i>
+			<i class="ti ti-external-link"></i>
 		</span>
-	</component>
-</component>
+	</a>
+	<MkA v-else :class="[$style.main, { [$style.active]: active }]" class="_button" :to="to" :behavior="behavior">
+		<span :class="$style.icon"><slot name="icon"></slot></span>
+		<span :class="$style.text"><slot></slot></span>
+		<span :class="$style.suffix">
+			<span :class="$style.suffixText"><slot name="suffix"></slot></span>
+			<i class="ti ti-chevron-right"></i>
+		</span>
+	</MkA>
+</div>
 </template>
 
 <script lang="ts" setup>
-defineProps<{
-	to?: string;
+import { } from 'vue';
+
+const props = defineProps<{
+	to: string;
 	active?: boolean;
 	external?: boolean;
 	behavior?: null | 'window' | 'browser';
@@ -83,18 +75,17 @@ defineProps<{
 	&:empty {
 		display: none;
 
-		& + .headerText {
+		& + .text {
 			padding-left: 4px;
 		}
 	}
 }
 
-.headerText {
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	text-align: start;
-	overflow: hidden;
+.text {
+	flex-shrink: 1;
+	white-space: normal;
 	padding-right: 12px;
+	text-align: center;
 }
 
 .suffix {

packages/frontend/src/components/global/MkA.vue

@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<a ref="el" :href="to" :class="active ? activeClass : null" @click="nav" @contextmenu.prevent.stop="onContextmenu">
+<a ref="el" :href="to" :class="active ? activeClass : null" @click.prevent="nav" @contextmenu.prevent.stop="onContextmenu">
 	<slot></slot>
 </a>
 </template>
@@ -86,11 +86,6 @@ function openWindow() {
 }
 
 function nav(ev: MouseEvent) {
-	// 制御キーとの組み合わせは無視（shiftを除く）
-	if (ev.metaKey || ev.altKey || ev.ctrlKey) return;
-
-	ev.preventDefault();
-
 	if (behavior === 'browser') {
 		window.location.href = props.to;
 		return;

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

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: syuilo and misskey-project
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+ 
 import { expect, userEvent, waitFor, within } from '@storybook/test';
 import MkAd from './MkAd.vue';
 import type { StoryObj } from '@storybook/vue3';
@@ -75,7 +75,6 @@ const common = {
 			place: '',
 			imageUrl: '',
 			dayOfWeek: 7,
-			isSensitive: false,
 		},
 	},
 	parameters: {

packages/frontend/src/components/global/MkSuspense.vue

@@ -1,3 +1,4 @@
+@ -1,70 +0,0 @@
 <!--
 SPDX-FileCopyrightText: syuilo and misskey-project
 SPDX-License-Identifier: AGPL-3.0-only

packages/frontend/src/components/global/MkTime.vue

@@ -14,10 +14,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import isChromatic from 'chromatic/isChromatic';
-import { computed } from 'vue';
+import { onMounted, onUnmounted, ref, computed } from 'vue';
 import { i18n } from '@/i18n.js';
 import { dateTimeFormat } from '@@/js/intl-const.js';
-import { useLowresTime } from '@/composables/use-lowres-time.js';
 
 const props = withDefaults(defineProps<{
 	time: Date | string | number | null;
@@ -47,10 +46,8 @@ const _time = props.time == null ? NaN : getDateSafe(props.time).getTime();
 const invalid = Number.isNaN(_time);
 const absolute = !invalid ? dateTimeFormat.format(_time) : i18n.ts._ago.invalid;
 
-const actualNow = useLowresTime();
-const now = computed(() => (props.origin ? props.origin.getTime() : actualNow.value));
-
 // eslint-disable-next-line vue/no-setup-props-reactivity-loss
+const now = ref(props.origin?.getTime() ?? Date.now());
 const ago = computed(() => (now.value - _time) / 1000/*ms*/);
 
 const relative = computed<string>(() => {
@@ -75,6 +72,29 @@ const relative = computed<string>(() => {
 		i18n.tsx._timeIn.seconds({ n: (~~(-ago.value % 60)).toString() })
 	);
 });
+
+let tickId: number;
+let currentInterval: number;
+
+function tick() {
+	now.value = Date.now();
+	const nextInterval = ago.value < 60 ? 10000 : ago.value < 3600 ? 60000 : 180000;
+
+	if (currentInterval !== nextInterval) {
+		if (tickId) window.clearInterval(tickId);
+		currentInterval = nextInterval;
+		tickId = window.setInterval(tick, nextInterval);
+	}
+}
+
+if (!invalid && props.origin === null && (props.mode === 'relative' || props.mode === 'detail')) {
+	onMounted(() => {
+		tick();
+	});
+	onUnmounted(() => {
+		if (tickId) window.clearInterval(tickId);
+	});
+}
 </script>
 
 <style lang="scss" module>

packages/frontend/src/components/global/PageWithHeader.vue

@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkPageHeader v-else v-model:tab="tab" v-bind="pageHeaderProps"/>
 		</template>
 		<div :class="$style.body">
-			<MkSwiper v-if="prefer.s.enableHorizontalSwipe && swipable && (props.tabs?.length ?? 1) > 1" v-model:tab="tab" :class="$style.swiper" :tabs="props.tabs ?? []">
+			<MkSwiper v-if="prefer.s.enableHorizontalSwipe && swipable && (props.tabs?.length ?? 1) > 1" v-model:tab="tab" :class="$style.swiper" :tabs="props.tabs">
 				<slot></slot>
 			</MkSwiper>
 			<slot v-else></slot>
@@ -45,7 +45,7 @@ const props = withDefaults(defineProps<PageHeaderProps & {
 });
 
 const pageHeaderProps = computed(() => {
-	const { reversed, tab, ...rest } = props;
+	const { reversed, ...rest } = props;
 	return rest;
 });
 
@@ -75,6 +75,10 @@ defineExpose({
 </script>
 
 <style lang="scss" module>
+.root {
+
+}
+
 .body, .swiper {
 	min-height: calc(100cqh - (var(--MI-stickyTop, 0px) + var(--MI-stickyBottom, 0px)));
 }

packages/frontend/src/components/global/RouterView.vue

@@ -65,12 +65,5 @@ router.useListener('change', ({ resolved }) => {
 .root {
 	height: 100%;
 	background-color: var(--MI_THEME-bg);
-
-	/**
-	 * FIXME: Safari 26 で contain: layout を指定するとバグるので、hotfixとして _pageContainer の content: strict を上書き
-	 * https://github.com/misskey-dev/misskey/issues/16204#issuecomment-3265404776
-	 * https://bugs.webkit.org/show_bug.cgi?id=297186
-	 */
-	contain: size style paint !important;
 }
 </style>

packages/frontend/src/composables/use-lowres-time.ts

@@ -1,34 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { ref, readonly, computed } from 'vue';
-
-const time = ref(Date.now());
-
-export const TIME_UPDATE_INTERVAL = 10000; // 10秒
-
-/**
- * 精度が求められないが定期的に更新しないといけない時計で使用（10秒に一度更新）。
- * tickを各コンポーネントで行うのではなく、ここで一括して行うことでパフォーマンスを改善する。
- *
- * ※ マウント前の時刻を返す可能性があるため、通常は`useLowresTime`を使用する
-*/
-export const lowresTime = readonly(time);
-
-/**
- * 精度が求められないが定期的に更新しないといけない時計で使用（10秒に一度更新）。
- * tickを各コンポーネントで行うのではなく、ここで一括して行うことでパフォーマンスを改善する。
- *
- * 必ず現在時刻以降を返すことを保証するコンポーサブル
- */
-export function useLowresTime() {
-	// lowresTime自体はマウント前の時刻を返す可能性があるため、必ず現在時刻以降を返すことを保証する
-	const now = Date.now();
-	return computed(() => Math.max(time.value, now));
-}
-
-window.setInterval(() => {
-	time.value = Date.now();
-}, TIME_UPDATE_INTERVAL);

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/events.ts

@@ -24,7 +24,7 @@ export const globalEvents = new EventEmitter<Events>();
 
 export function useGlobalEvent<T extends keyof Events>(
 	event: T,
-	callback: EventEmitter.EventListener<Events, T>,
+	callback: Events[T],
 ): void {
 	globalEvents.on(event, callback);
 	onBeforeUnmount(() => {

packages/frontend/src/lib/pizzax.ts

@@ -94,7 +94,7 @@ export class Pizzax<T extends StateDef> {
 
 	private mergeState<X>(value: X, def: X): X {
 		if (this.isPureObject(value) && this.isPureObject(def)) {
-			const merged = deepMerge<Record<PropertyKey, unknown>>(value, def);
+			const merged = deepMerge(value, def);
 
 			if (_DEV_) console.log('Merging state. Incoming: ', value, ' Default: ', def, ' Result: ', merged);
 

packages/frontend/src/navbar.ts

@@ -111,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';
@@ -36,9 +35,9 @@ import { focusParent } from '@/utility/focus.js';
 export const openingWindowsCount = ref(0);
 
 export type ApiWithDialogCustomErrors = Record<string, { title?: string; text: string; }>;
-export const apiWithDialog = (<E extends keyof Misskey.Endpoints>(
+export const apiWithDialog = (<E extends keyof Misskey.Endpoints, P extends Misskey.Endpoints[E]['req'] = Misskey.Endpoints[E]['req']>(
 	endpoint: E,
-	data: Misskey.Endpoints[E]['req'],
+	data: P,
 	token?: string | null | undefined,
 	customErrors?: ApiWithDialogCustomErrors,
 ) => {
@@ -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.emojis.vue

@@ -11,6 +11,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkInput v-model="q" class="" :placeholder="i18n.ts.search" autocapitalize="off">
 			<template #prefix><i class="ti ti-search"></i></template>
 		</MkInput>
+
+		<!-- たくさんあると邪魔
+		<div class="tags">
+			<span class="tag _button" v-for="tag in customEmojiTags" :class="{ active: selectedTags.has(tag) }" @click="toggleTag(tag)">{{ tag }}</span>
+		</div>
+		-->
 	</div>
 
 	<MkFoldableSection v-if="searchEmojis">
@@ -36,33 +42,51 @@ import XEmoji from './emojis.emoji.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
-import { customEmojis, customEmojiCategories } from '@/custom-emojis.js';
+import { customEmojis, customEmojiCategories, getCustomEmojiTags } from '@/custom-emojis.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/i.js';
 
+const customEmojiTags = getCustomEmojiTags();
 const q = ref('');
 const searchEmojis = ref<Misskey.entities.EmojiSimple[] | null>(null);
+const selectedTags = ref(new Set());
 
 function search() {
-	if (q.value === '' || q.value == null) {
+	if ((q.value === '' || q.value == null) && selectedTags.value.size === 0) {
 		searchEmojis.value = null;
 		return;
 	}
 
-	const queryarry = q.value.match(/\:([a-z0-9_]*)\:/g);
+	if (selectedTags.value.size === 0) {
+		const queryarry = q.value.match(/\:([a-z0-9_]*)\:/g);
 
-	if (queryarry) {
-		searchEmojis.value = customEmojis.value.filter(emoji =>
-			queryarry.includes(`:${emoji.name}:`),
-		);
+		if (queryarry) {
+			searchEmojis.value = customEmojis.value.filter(emoji =>
+				queryarry.includes(`:${emoji.name}:`),
+			);
+		} else {
+			searchEmojis.value = customEmojis.value.filter(emoji => emoji.name.includes(q.value) || emoji.aliases.includes(q.value));
+		}
 	} else {
-		searchEmojis.value = customEmojis.value.filter(emoji => emoji.name.includes(q.value) || emoji.aliases.includes(q.value));
+		searchEmojis.value = customEmojis.value.filter(emoji => (emoji.name.includes(q.value) || emoji.aliases.includes(q.value)) && [...selectedTags.value].every(t => emoji.aliases.includes(t)));
+	}
+}
+
+function toggleTag(tag) {
+	if (selectedTags.value.has(tag)) {
+		selectedTags.value.delete(tag);
+	} else {
+		selectedTags.value.add(tag);
 	}
 }
 
 watch(q, () => {
 	search();
 });
+
+watch(selectedTags, () => {
+	search();
+}, { deep: true });
 </script>
 
 <style lang="scss" module>

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',
+				}] as const"
+			>
 				<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,12 +229,10 @@ 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';
 import { Paginator } from '@/utility/paginator.js';
-import type { ChartSrc } from '@/components/MkChart.vue';
 
 const $i = ensureSignin();
 
@@ -245,15 +246,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('per-user-notes');
 const user = ref(result.user);
 const info = ref(result.info);
 const ips = ref(result.ips);
@@ -270,16 +263,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 +427,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;
+	if (canceled) 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[]>([]);
@@ -307,8 +303,8 @@ async function onFileSelectClicked() {
 	const driveFiles = await chooseFileFromPcAndUpload({
 		multiple: true,
 		folderId: selectedFolderId.value,
-		// // 拡張子は消す
-		// nameConverter: (file) => file.name.replace(/\.[a-zA-Z0-9]+$/, ''),
+		// 拡張子は消す
+		nameConverter: (file) => file.name.replace(/\.[a-zA-Z0-9]+$/, ''),
 	});
 
 	gridItems.value.push(...driveFiles.map(fromDriveFile));

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

@@ -26,10 +26,10 @@ const chartEl = useTemplateRef('chartEl');
 
 const { handler: externalTooltipHandler } = useChartTooltip();
 
-let chartInstance: Chart | null = null;
+let chartInstance: Chart;
 
 function setData(values) {
-	if (chartInstance == null || chartInstance.data.labels == null) return;
+	if (chartInstance == null) return;
 	for (const value of values) {
 		chartInstance.data.labels.push('');
 		chartInstance.data.datasets[0].data.push(value);
@@ -42,7 +42,7 @@ function setData(values) {
 }
 
 function pushData(value) {
-	if (chartInstance == null || chartInstance.data.labels == null) return;
+	if (chartInstance == null) return;
 	chartInstance.data.labels.push('');
 	chartInstance.data.datasets[0].data.push(value);
 	if (chartInstance.data.datasets[0].data.length > 200) {
@@ -69,8 +69,6 @@ const color =
 onMounted(() => {
 	const vLineColor = store.s.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
 
-	if (chartEl.value == null) return;
-
 	chartInstance = new Chart(chartEl.value, {
 		type: 'line',
 		data: {

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/job-queue.vue

@@ -210,7 +210,6 @@ async function fetchCurrentQueue() {
 }
 
 async function fetchJobs() {
-	if (tab.value === '-') return;
 	jobsFetching.value = true;
 	const state = jobState.value;
 	jobs.value = await misskeyApi('admin/queue/jobs', {
@@ -308,7 +307,6 @@ async function removeJobs() {
 }
 
 async function refreshJob(jobId: string) {
-	if (tab.value === '-') return;
 	const newJob = await misskeyApi('admin/queue/show-job', { queue: tab.value, jobId });
 	const index = jobs.value.findIndex((job) => job.id === jobId);
 	if (index !== -1) {

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.active-users.vue

@@ -26,7 +26,7 @@ initChart();
 
 const chartEl = useTemplateRef('chartEl');
 const now = new Date();
-let chartInstance: Chart | null = null;
+let chartInstance: Chart = null;
 const chartLimit = 7;
 const fetching = ref(true);
 

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

@@ -23,9 +23,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div class="item _panel sub">
 				<div class="icon"><i class="ti ti-world-download"></i></div>
 				<div class="body">
-					<div v-if="federationSubActive != null" class="value">
+					<div class="value">
 						{{ number(federationSubActive) }}
-						<MkNumberDiff v-if="federationSubActiveDiff != null" v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationSubActiveDiff"></MkNumberDiff>
+						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationSubActiveDiff"></MkNumberDiff>
 					</div>
 					<div class="label">Sub</div>
 				</div>
@@ -33,9 +33,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div class="item _panel pub">
 				<div class="icon"><i class="ti ti-world-upload"></i></div>
 				<div class="body">
-					<div v-if="federationPubActive != null" class="value">
+					<div class="value">
 						{{ number(federationPubActive) }}
-						<MkNumberDiff v-if="federationPubActiveDiff != null" v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationPubActiveDiff"></MkNumberDiff>
+						<MkNumberDiff v-tooltip="i18n.ts.dayOverDayChanges" class="diff" :value="federationPubActiveDiff"></MkNumberDiff>
 					</div>
 					<div class="label">Pub</div>
 				</div>

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

@@ -5,30 +5,23 @@ 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';
 
-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('active-users');
 </script>
 
 <style lang="scss" module>

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

@@ -32,17 +32,15 @@ const { handler: externalTooltipHandler } = useChartTooltip({
 	position: 'middle',
 });
 
-let chartInstance: Chart | null = null;
+let chartInstance: Chart;
 
 onMounted(() => {
-	if (chartEl.value == null) return;
-
 	chartInstance = new Chart(chartEl.value, {
 		type: 'doughnut',
 		data: {
 			labels: props.data.map(x => x.name),
 			datasets: [{
-				backgroundColor: props.data.map(x => x.color ?? '#000'),
+				backgroundColor: props.data.map(x => x.color),
 				borderColor: getComputedStyle(window.document.documentElement).getPropertyValue('--MI_THEME-panel'),
 				borderWidth: 2,
 				hoverOffset: 0,
@@ -59,10 +57,9 @@ onMounted(() => {
 				},
 			},
 			onClick: (ev) => {
-				if (ev.native == null) return;
-				const hit = chartInstance!.getElementsAtEventForMode(ev.native, 'nearest', { intersect: true }, false)[0];
-				if (hit && props.data[hit.index].onClick != null) {
-					props.data[hit.index].onClick!();
+				const hit = chartInstance.getElementsAtEventForMode(ev, 'nearest', { intersect: true }, false)[0];
+				if (hit && props.data[hit.index].onClick) {
+					props.data[hit.index].onClick();
 				}
 			},
 			plugins: {

packages/frontend/src/pages/admin/overview.queue.chart.vue

@@ -26,10 +26,10 @@ const chartEl = useTemplateRef('chartEl');
 
 const { handler: externalTooltipHandler } = useChartTooltip();
 
-let chartInstance: Chart | null = null;
+let chartInstance: Chart;
 
-function setData(values: number[]) {
-	if (chartInstance == null || chartInstance.data.labels == null) return;
+function setData(values) {
+	if (chartInstance == null) return;
 	for (const value of values) {
 		chartInstance.data.labels.push('');
 		chartInstance.data.datasets[0].data.push(value);
@@ -41,8 +41,8 @@ function setData(values: number[]) {
 	chartInstance.update();
 }
 
-function pushData(value: number) {
-	if (chartInstance == null || chartInstance.data.labels == null) return;
+function pushData(value) {
+	if (chartInstance == null) return;
 	chartInstance.data.labels.push('');
 	chartInstance.data.datasets[0].data.push(value);
 	if (chartInstance.data.datasets[0].data.length > 100) {
@@ -67,8 +67,6 @@ const color =
 	'?' as never;
 
 onMounted(() => {
-	if (chartEl.value == null) return;
-
 	const vLineColor = store.s.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
 
 	chartInstance = new Chart(chartEl.value, {

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

@@ -38,7 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { markRaw, onMounted, onUnmounted, ref, useTemplateRef } from 'vue';
 import * as Misskey from 'misskey-js';
 import XChart from './overview.queue.chart.vue';
-import type { ApQueueDomain } from '@/pages/admin/federation-job-queue.vue';
+import type { ApQueueDomain } from '@/pages/admin/queue.vue';
 import number from '@/filters/number.js';
 import { useStream } from '@/stream.js';
 import { genId } from '@/utility/id.js';
@@ -64,10 +64,10 @@ function onStats(stats: Misskey.entities.QueueStats) {
 	delayed.value = stats[props.domain].delayed;
 	waiting.value = stats[props.domain].waiting;
 
-	chartProcess.value?.pushData(stats[props.domain].activeSincePrevTick);
-	chartActive.value?.pushData(stats[props.domain].active);
-	chartDelayed.value?.pushData(stats[props.domain].delayed);
-	chartWaiting.value?.pushData(stats[props.domain].waiting);
+	chartProcess.value.pushData(stats[props.domain].activeSincePrevTick);
+	chartActive.value.pushData(stats[props.domain].active);
+	chartDelayed.value.pushData(stats[props.domain].delayed);
+	chartWaiting.value.pushData(stats[props.domain].waiting);
 }
 
 function onStatsLog(statsLog: Misskey.entities.QueueStatsLog) {
@@ -83,10 +83,10 @@ function onStatsLog(statsLog: Misskey.entities.QueueStatsLog) {
 		dataWaiting.push(stats[props.domain].waiting);
 	}
 
-	chartProcess.value?.setData(dataProcess);
-	chartActive.value?.setData(dataActive);
-	chartDelayed.value?.setData(dataDelayed);
-	chartWaiting.value?.setData(dataWaiting);
+	chartProcess.value.setData(dataProcess);
+	chartActive.value.setData(dataActive);
+	chartDelayed.value.setData(dataDelayed);
+	chartWaiting.value.setData(dataWaiting);
 }
 
 onMounted(() => {