README.md aktualisiert

.gitea/workflows/registry.yml

@@ -0,0 +1,51 @@
+name: release-tag
+on:
+  push:
+    branches:
+      - 'main'
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_ORG: sendnrw
+      DOCKER_LATEST: latest
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+        with: # replace it with your local IP
+          config-inline: |
+            [registry."git.send.nrw"] 
+              http = true
+              insecure = true            
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: git.send.nrw # replace it with your local IP
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64                       
+          push: true
+          tags: | # replace it with your local IP and tags
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}

CHANGELOG.md

@@ -1,11 +1,7 @@
 ## 2025.3.2
 
 ### General
-- Feat: チャットがリニューアルして復活しました
-  - 既存のDM機能よりも便利で効率的になっています
-  - チャットを受け付ける相手を制限できます
-	- チャット機能を開放するかどうかをロールで制御できます
-- Enhance: セキュリティを強化するため、ジョブキューのダッシュボード(bull-board)統合が削除されました。
+- セキュリティを強化するため、ジョブキューのダッシュボード(bull-board)統合が削除されました。
   - Misskeyネイティブでダッシュボードを実装予定です
 
 ### Client
@@ -41,7 +37,6 @@
 - Fix: テーマ切り替え時に一部の色が変わらない問題を修正
 
 ### Server
-- Enhance 全体的なパフォーマンス向上
 - Fix: プロフィール追加情報で無効なURLに入力された場合に照会エラーを出るのを修正
 - Fix: ActivityPubリクエストURLチェック実装は仕様に従っていないのを修正
 - Fix: 連合無しモードでも外部から照会可能だった問題を修正

locales/index.d.ts

@@ -1174,6 +1174,10 @@ export interface Locale extends ILocale {
      * 保存しました
      */
     "saved": string;
+    /**
+     * チャット
+     */
+    "messaging": string;
     /**
      * アップロード
      */
@@ -1223,9 +1227,9 @@ export interface Locale extends ILocale {
      */
     "noMoreHistory": string;
     /**
-     * チャットを始める
+     * チャットを開始
      */
-    "startChat": string;
+    "startMessaging": string;
     /**
      * {n}人が読みました
      */
@@ -1978,6 +1982,14 @@ export interface Locale extends ILocale {
      * クリップボードのテキストが長いです。テキストファイルとして添付しますか？
      */
     "attachAsFileQuestion": string;
+    /**
+     * まだチャットはありません
+     */
+    "noMessagesYet": string;
+    /**
+     * 新しいメッセージがあります
+     */
+    "newMessageExists": string;
     /**
      * メッセージに添付できるファイルはひとつです
      */
@@ -5346,143 +5358,6 @@ export interface Locale extends ILocale {
      * 情報
      */
     "information": string;
-    /**
-     * チャット
-     */
-    "chat": string;
-    "_chat": {
-        /**
-         * まだメッセージはありません
-         */
-        "noMessagesYet": string;
-        /**
-         * 新しいメッセージ
-         */
-        "newMessage": string;
-        /**
-         * 個人チャット
-         */
-        "individualChat": string;
-        /**
-         * 特定ユーザーとの一対一のチャットができます。
-         */
-        "individualChat_description": string;
-        /**
-         * ルームチャット
-         */
-        "roomChat": string;
-        /**
-         * 複数人でのチャットができます。
-         * また、個人チャットを許可していないユーザーとでも、相手が受け入れればチャットができます。
-         */
-        "roomChat_description": string;
-        /**
-         * ルームを作成
-         */
-        "createRoom": string;
-        /**
-         * ユーザーを招待してチャットを始めましょう
-         */
-        "inviteUserToChat": string;
-        /**
-         * 作成したルーム
-         */
-        "yourRooms": string;
-        /**
-         * 参加中のルーム
-         */
-        "joiningRooms": string;
-        /**
-         * 招待
-         */
-        "invitations": string;
-        /**
-         * 招待はありません
-         */
-        "noInvitations": string;
-        /**
-         * 履歴
-         */
-        "history": string;
-        /**
-         * 履歴はありません
-         */
-        "noHistory": string;
-        /**
-         * ルームはありません
-         */
-        "noRooms": string;
-        /**
-         * ユーザーを招待
-         */
-        "inviteUser": string;
-        /**
-         * 参加
-         */
-        "join": string;
-        /**
-         * 無視
-         */
-        "ignore": string;
-        /**
-         * このユーザーとのチャットを開始できません
-         */
-        "cannotChatWithTheUser": string;
-        /**
-         * チャットが使えない状態になっているか、相手がチャットを開放していません。
-         */
-        "cannotChatWithTheUser_description": string;
-        /**
-         * チャットする
-         */
-        "chatWithThisUser": string;
-        /**
-         * このユーザーはフォロワーからのみチャットを受け付けています。
-         */
-        "thisUserAllowsChatOnlyFromFollowers": string;
-        /**
-         * このユーザーはフォローしているユーザーからのみチャットを受け付けています。
-         */
-        "thisUserAllowsChatOnlyFromFollowing": string;
-        /**
-         * このユーザーは相互フォローのユーザーからのみチャットを受け付けています。
-         */
-        "thisUserAllowsChatOnlyFromMutualFollowing": string;
-        /**
-         * このユーザーは誰からもチャットを受け付けていません。
-         */
-        "thisUserNotAllowedChatAnyone": string;
-        /**
-         * チャットを許可する相手
-         */
-        "chatAllowedUsers": string;
-        /**
-         * 自分からチャットメッセージを送った相手とはこの設定に関わらずチャットが可能です。
-         */
-        "chatAllowedUsers_note": string;
-        "_chatAllowedUsers": {
-            /**
-             * 誰でも
-             */
-            "everyone": string;
-            /**
-             * 自分のフォロワーのみ
-             */
-            "followers": string;
-            /**
-             * 自分がフォローしているユーザーのみ
-             */
-            "following": string;
-            /**
-             * 相互フォローのユーザーのみ
-             */
-            "mutual": string;
-            /**
-             * 誰も許可しない
-             */
-            "none": string;
-        };
-    };
     "_emojiPalette": {
         /**
          * パレット
@@ -7410,10 +7285,6 @@ export interface Locale extends ILocale {
              * リストのインポートを許可
              */
             "canImportUserLists": string;
-            /**
-             * チャットを許可
-             */
-            "canChat": string;
         };
         "_condition": {
             /**
@@ -8855,14 +8726,6 @@ export interface Locale extends ILocale {
          * 違反を報告する
          */
         "write:report-abuse": string;
-        /**
-         * チャットを操作する
-         */
-        "write:chat": string;
-        /**
-         * チャットを閲覧する
-         */
-        "read:chat": string;
     };
     "_auth": {
         /**

locales/ja-JP.yml

@@ -289,6 +289,7 @@ deleteAreYouSure: "「{x}」を削除しますか？"
 resetAreYouSure: "リセットしますか？"
 areYouSure: "よろしいですか？"
 saved: "保存しました"
+messaging: "チャット"
 upload: "アップロード"
 keepOriginalUploading: "オリジナル画像を保持"
 keepOriginalUploadingDescription: "画像をアップロードする時にオリジナル版を保持します。オフにするとアップロード時にブラウザでWeb公開用画像を生成します。"
@@ -301,7 +302,7 @@ uploadFromUrlMayTakeTime: "アップロードが完了するまで時間がか
 explore: "みつける"
 messageRead: "既読"
 noMoreHistory: "これより過去の履歴はありません"
-startChat: "チャットを始める"
+startMessaging: "チャットを開始"
 nUsersRead: "{n}人が読みました"
 agreeTo: "{0}に同意"
 agree: "同意する"
@@ -490,6 +491,8 @@ noteOf: "{user}のノート"
 quoteAttached: "引用付き"
 quoteQuestion: "引用として添付しますか？"
 attachAsFileQuestion: "クリップボードのテキストが長いです。テキストファイルとして添付しますか？"
+noMessagesYet: "まだチャットはありません"
+newMessageExists: "新しいメッセージがあります"
 onlyOneFileCanBeAttached: "メッセージに添付できるファイルはひとつです"
 signinRequired: "続行する前に、登録またはログインが必要です"
 signinOrContinueOnRemote: "続行するには、お使いのサーバーに移動するか、このサーバーに登録・ログインする必要があります"
@@ -1332,42 +1335,6 @@ emojiPalette: "絵文字パレット"
 postForm: "投稿フォーム"
 textCount: "文字数"
 information: "情報"
-chat: "チャット"
-
-_chat:
-  noMessagesYet: "まだメッセージはありません"
-  newMessage: "新しいメッセージ"
-  individualChat: "個人チャット"
-  individualChat_description: "特定ユーザーとの一対一のチャットができます。"
-  roomChat: "ルームチャット"
-  roomChat_description: "複数人でのチャットができます。\nまた、個人チャットを許可していないユーザーとでも、相手が受け入れればチャットができます。"
-  createRoom: "ルームを作成"
-  inviteUserToChat: "ユーザーを招待してチャットを始めましょう"
-  yourRooms: "作成したルーム"
-  joiningRooms: "参加中のルーム"
-  invitations: "招待"
-  noInvitations: "招待はありません"
-  history: "履歴"
-  noHistory: "履歴はありません"
-  noRooms: "ルームはありません"
-  inviteUser: "ユーザーを招待"
-  join: "参加"
-  ignore: "無視"
-  cannotChatWithTheUser: "このユーザーとのチャットを開始できません"
-  cannotChatWithTheUser_description: "チャットが使えない状態になっているか、相手がチャットを開放していません。"
-  chatWithThisUser: "チャットする"
-  thisUserAllowsChatOnlyFromFollowers: "このユーザーはフォロワーからのみチャットを受け付けています。"
-  thisUserAllowsChatOnlyFromFollowing: "このユーザーはフォローしているユーザーからのみチャットを受け付けています。"
-  thisUserAllowsChatOnlyFromMutualFollowing: "このユーザーは相互フォローのユーザーからのみチャットを受け付けています。"
-  thisUserNotAllowedChatAnyone: "このユーザーは誰からもチャットを受け付けていません。"
-  chatAllowedUsers: "チャットを許可する相手"
-  chatAllowedUsers_note: "自分からチャットメッセージを送った相手とはこの設定に関わらずチャットが可能です。"
-  _chatAllowedUsers:
-    everyone: "誰でも"
-    followers: "自分のフォロワーのみ"
-    following: "自分がフォローしているユーザーのみ"
-    mutual: "相互フォローのユーザーのみ"
-    none: "誰も許可しない"
 
 _emojiPalette:
   palettes: "パレット"
@@ -1919,7 +1886,6 @@ _role:
     canImportFollowing: "フォローのインポートを許可"
     canImportMuting: "ミュートのインポートを許可"
     canImportUserLists: "リストのインポートを許可"
-    canChat: "チャットを許可"
   _condition:
     roleAssignedTo: "マニュアルロールにアサイン済み"
     isLocal: "ローカルユーザー"
@@ -2325,8 +2291,6 @@ _permissions:
   "read:clip-favorite": "クリップのいいねを見る"
   "read:federation": "連合に関する情報を取得する"
   "write:report-abuse": "違反を報告する"
-  "write:chat": "チャットを操作する"
-  "read:chat": "チャットを閲覧する"
 
 _auth:
   shareAccessTitle: "アプリへのアクセス許可"

packages/backend/migration/1742203321812-chat.js

@@ -1,46 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class Chat1742203321812 {
-    name = 'Chat1742203321812'
-
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "chat_room" ("id" character varying(32) NOT NULL, "name" character varying(256) NOT NULL, "ownerId" character varying(32) NOT NULL, CONSTRAINT "PK_8aa3a52cf74c96469f0ef9fbe3e" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_f0d8ad64243fa2ca2800da0dfd" ON "chat_room" ("ownerId") `);
-        await queryRunner.query(`CREATE TABLE "chat_message" ("id" character varying(32) NOT NULL, "fromUserId" character varying(32) NOT NULL, "toUserId" character varying(32), "toRoomId" character varying(32), "text" character varying(4096), "uri" character varying(512), "reads" character varying(32) array NOT NULL DEFAULT '{}', "fileId" character varying(32), "reactions" character varying(1024) array NOT NULL DEFAULT '{}', CONSTRAINT "PK_3cc0d85193aade457d3077dd06b" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_79a26e7a4d9afa5e4fc05f134e" ON "chat_message" ("fromUserId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_25e097b51d7622c249452c6f75" ON "chat_message" ("toUserId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f006b8a76efd1abf9f221c175c" ON "chat_message" ("toRoomId") `);
-        await queryRunner.query(`CREATE TABLE "chat_room_membership" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "roomId" character varying(32) NOT NULL, CONSTRAINT "PK_2bd59c741e571b283c048beb69a" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_d99c5279460fb77ef58c596ce5" ON "chat_room_membership" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c25143ebab714e930aeca1c0e8" ON "chat_room_membership" ("roomId") `);
-        await queryRunner.query(`ALTER TABLE "chat_room" ADD CONSTRAINT "FK_f0d8ad64243fa2ca2800da0dfd6" FOREIGN KEY ("ownerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_message" ADD CONSTRAINT "FK_79a26e7a4d9afa5e4fc05f134ed" FOREIGN KEY ("fromUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_message" ADD CONSTRAINT "FK_25e097b51d7622c249452c6f757" FOREIGN KEY ("toUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_message" ADD CONSTRAINT "FK_f006b8a76efd1abf9f221c175ce" FOREIGN KEY ("toRoomId") REFERENCES "chat_room"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_message" ADD CONSTRAINT "FK_fd0f9a4879430239715ad4f8e2a" FOREIGN KEY ("fileId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_room_membership" ADD CONSTRAINT "FK_d99c5279460fb77ef58c596ce51" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_room_membership" ADD CONSTRAINT "FK_c25143ebab714e930aeca1c0e8d" FOREIGN KEY ("roomId") REFERENCES "chat_room"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "chat_room_membership" DROP CONSTRAINT "FK_c25143ebab714e930aeca1c0e8d"`);
-        await queryRunner.query(`ALTER TABLE "chat_room_membership" DROP CONSTRAINT "FK_d99c5279460fb77ef58c596ce51"`);
-        await queryRunner.query(`ALTER TABLE "chat_message" DROP CONSTRAINT "FK_fd0f9a4879430239715ad4f8e2a"`);
-        await queryRunner.query(`ALTER TABLE "chat_message" DROP CONSTRAINT "FK_f006b8a76efd1abf9f221c175ce"`);
-        await queryRunner.query(`ALTER TABLE "chat_message" DROP CONSTRAINT "FK_25e097b51d7622c249452c6f757"`);
-        await queryRunner.query(`ALTER TABLE "chat_message" DROP CONSTRAINT "FK_79a26e7a4d9afa5e4fc05f134ed"`);
-        await queryRunner.query(`ALTER TABLE "chat_room" DROP CONSTRAINT "FK_f0d8ad64243fa2ca2800da0dfd6"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_c25143ebab714e930aeca1c0e8"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d99c5279460fb77ef58c596ce5"`);
-        await queryRunner.query(`DROP TABLE "chat_room_membership"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_f006b8a76efd1abf9f221c175c"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_25e097b51d7622c249452c6f75"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_79a26e7a4d9afa5e4fc05f134e"`);
-        await queryRunner.query(`DROP TABLE "chat_message"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_f0d8ad64243fa2ca2800da0dfd"`);
-        await queryRunner.query(`DROP TABLE "chat_room"`);
-    }
-}

packages/backend/migration/1742608337548-chat-2.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class Chat21742608337548 {
-    name = 'Chat21742608337548'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "chatScope" character varying(128) NOT NULL DEFAULT 'mutual'`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_185b6b5afa707b5d36d1ce3144" ON "chat_room_membership" ("userId", "roomId") `);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_185b6b5afa707b5d36d1ce3144"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "chatScope"`);
-    }
-}

packages/backend/migration/1742617546147-chat-3.js

@@ -1,26 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class Chat31742617546147 {
-    name = 'Chat31742617546147'
-
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "chat_approval" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "otherId" character varying(32) NOT NULL, CONSTRAINT "PK_fbbb95d60acf5c85388345b5f5d" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_530257863e1381a7f2f1d3282f" ON "chat_approval" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b1d46037f23d170da5c05fdf75" ON "chat_approval" ("otherId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_12c4768a2f706fc267f2078903" ON "chat_approval" ("userId", "otherId") `);
-        await queryRunner.query(`ALTER TABLE "chat_approval" ADD CONSTRAINT "FK_530257863e1381a7f2f1d3282fe" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_approval" ADD CONSTRAINT "FK_b1d46037f23d170da5c05fdf755" FOREIGN KEY ("otherId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "chat_approval" DROP CONSTRAINT "FK_b1d46037f23d170da5c05fdf755"`);
-        await queryRunner.query(`ALTER TABLE "chat_approval" DROP CONSTRAINT "FK_530257863e1381a7f2f1d3282fe"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_12c4768a2f706fc267f2078903"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_b1d46037f23d170da5c05fdf75"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_530257863e1381a7f2f1d3282f"`);
-        await queryRunner.query(`DROP TABLE "chat_approval"`);
-    }
-}

packages/backend/migration/1742707840715-chat-4.js

@@ -1,26 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class Chat41742707840715 {
-    name = 'Chat41742707840715'
-
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "chat_room_invitation" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "roomId" character varying(32) NOT NULL, CONSTRAINT "PK_9d489521a312dd28225672de2dc" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_8552bb38e7ed038c5bdd398a38" ON "chat_room_invitation" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_5f265075b215fc390a57523b12" ON "chat_room_invitation" ("roomId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_044f2a7962b8ee5bbfaa02e8a3" ON "chat_room_invitation" ("userId", "roomId") `);
-        await queryRunner.query(`ALTER TABLE "chat_room_invitation" ADD CONSTRAINT "FK_8552bb38e7ed038c5bdd398a384" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "chat_room_invitation" ADD CONSTRAINT "FK_5f265075b215fc390a57523b12a" FOREIGN KEY ("roomId") REFERENCES "chat_room"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "chat_room_invitation" DROP CONSTRAINT "FK_5f265075b215fc390a57523b12a"`);
-        await queryRunner.query(`ALTER TABLE "chat_room_invitation" DROP CONSTRAINT "FK_8552bb38e7ed038c5bdd398a384"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_044f2a7962b8ee5bbfaa02e8a3"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_5f265075b215fc390a57523b12"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_8552bb38e7ed038c5bdd398a38"`);
-        await queryRunner.query(`DROP TABLE "chat_room_invitation"`);
-    }
-}

packages/backend/migration/1742721896936-chat-5.js

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

packages/backend/src/core/ChatService.ts

@@ -1,602 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import * as Redis from 'ioredis';
-import { Brackets } from 'typeorm';
-import { DI } from '@/di-symbols.js';
-import type { Config } from '@/config.js';
-import { QueueService } from '@/core/QueueService.js';
-import { IdService } from '@/core/IdService.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
-import { PushNotificationService } from '@/core/PushNotificationService.js';
-import { bindThis } from '@/decorators.js';
-import type { ChatApprovalsRepository, ChatMessagesRepository, ChatRoomInvitationsRepository, ChatRoomMembershipsRepository, ChatRoomsRepository, MiChatMessage, MiChatRoom, MiChatRoomMembership, MiDriveFile, MiUser, MutingsRepository, UsersRepository } from '@/models/_.js';
-import { UserBlockingService } from '@/core/UserBlockingService.js';
-import { QueryService } from '@/core/QueryService.js';
-import { RoleService } from '@/core/RoleService.js';
-import { UserFollowingService } from '@/core/UserFollowingService.js';
-import { MiChatRoomInvitation } from '@/models/ChatRoomInvitation.js';
-import { Packed } from '@/misc/json-schema.js';
-
-const MAX_ROOM_MEMBERS = 30;
-
-@Injectable()
-export class ChatService {
-	constructor(
-		@Inject(DI.config)
-		private config: Config,
-
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
-		@Inject(DI.usersRepository)
-		private usersRepository: UsersRepository,
-
-		@Inject(DI.chatMessagesRepository)
-		private chatMessagesRepository: ChatMessagesRepository,
-
-		@Inject(DI.chatApprovalsRepository)
-		private chatApprovalsRepository: ChatApprovalsRepository,
-
-		@Inject(DI.chatRoomsRepository)
-		private chatRoomsRepository: ChatRoomsRepository,
-
-		@Inject(DI.chatRoomInvitationsRepository)
-		private chatRoomInvitationsRepository: ChatRoomInvitationsRepository,
-
-		@Inject(DI.chatRoomMembershipsRepository)
-		private chatRoomMembershipsRepository: ChatRoomMembershipsRepository,
-
-		@Inject(DI.mutingsRepository)
-		private mutingsRepository: MutingsRepository,
-
-		private userEntityService: UserEntityService,
-		private chatEntityService: ChatEntityService,
-		private idService: IdService,
-		private globalEventService: GlobalEventService,
-		private apRendererService: ApRendererService,
-		private queueService: QueueService,
-		private pushNotificationService: PushNotificationService,
-		private userBlockingService: UserBlockingService,
-		private queryService: QueryService,
-		private roleService: RoleService,
-		private userFollowingService: UserFollowingService,
-	) {
-	}
-
-	@bindThis
-	public async createMessageToUser(fromUser: { id: MiUser['id']; host: MiUser['host']; }, toUser: MiUser, params: {
-		text?: string | null;
-		file?: MiDriveFile | null;
-		uri?: string | null;
-	}): Promise<Packed<'ChatMessageLite'>> {
-		if (fromUser.id === toUser.id) {
-			throw new Error('yourself');
-		}
-
-		const approvals = await this.chatApprovalsRepository.createQueryBuilder('approval')
-			.where(new Brackets(qb => { // 自分が相手を許可しているか
-				qb.where('approval.userId = :fromUserId', { fromUserId: fromUser.id })
-					.andWhere('approval.otherId = :toUserId', { toUserId: toUser.id });
-			}))
-			.orWhere(new Brackets(qb => { // 相手が自分を許可しているか
-				qb.where('approval.userId = :toUserId', { toUserId: toUser.id })
-					.andWhere('approval.otherId = :fromUserId', { fromUserId: fromUser.id });
-			}))
-			.take(2)
-			.getMany();
-
-		const otherApprovedMe = approvals.some(approval => approval.userId === toUser.id);
-		const iApprovedOther = approvals.some(approval => approval.userId === fromUser.id);
-
-		if (!otherApprovedMe) {
-			if (toUser.chatScope === 'none') {
-				throw new Error('recipient is cannot chat (none)');
-			} else if (toUser.chatScope === 'followers') {
-				const isFollower = await this.userFollowingService.isFollowing(fromUser.id, toUser.id);
-				if (!isFollower) {
-					throw new Error('recipient is cannot chat (followers)');
-				}
-			} else if (toUser.chatScope === 'following') {
-				const isFollowing = await this.userFollowingService.isFollowing(toUser.id, fromUser.id);
-				if (!isFollowing) {
-					throw new Error('recipient is cannot chat (following)');
-				}
-			} else if (toUser.chatScope === 'mutual') {
-				const isMutual = await this.userFollowingService.isMutual(fromUser.id, toUser.id);
-				if (!isMutual) {
-					throw new Error('recipient is cannot chat (mutual)');
-				}
-			}
-		}
-
-		if (!(await this.roleService.getUserPolicies(toUser.id)).canChat) {
-			throw new Error('recipient is cannot chat (policy)');
-		}
-
-		const blocked = await this.userBlockingService.checkBlocked(toUser.id, fromUser.id);
-		if (blocked) {
-			throw new Error('blocked');
-		}
-
-		const message = {
-			id: this.idService.gen(),
-			fromUserId: fromUser.id,
-			toUserId: toUser.id,
-			text: params.text ? params.text.trim() : null,
-			fileId: params.file ? params.file.id : null,
-			reads: [],
-			uri: params.uri ?? null,
-		} satisfies Partial<MiChatMessage>;
-
-		const inserted = await this.chatMessagesRepository.insertOne(message);
-
-		// 相手を許可しておく
-		if (!iApprovedOther) {
-			this.chatApprovalsRepository.insertOne({
-				id: this.idService.gen(),
-				userId: fromUser.id,
-				otherId: toUser.id,
-			});
-		}
-
-		const packedMessage = await this.chatEntityService.packMessageLite(inserted);
-
-		if (this.userEntityService.isLocalUser(toUser)) {
-			const redisPipeline = this.redisClient.pipeline();
-			redisPipeline.set(`newUserChatMessageExists:${toUser.id}:${fromUser.id}`, message.id);
-			redisPipeline.sadd(`newChatMessagesExists:${toUser.id}`, `user:${fromUser.id}`);
-			redisPipeline.exec();
-		}
-
-		if (this.userEntityService.isLocalUser(fromUser)) {
-			// 自分のストリーム
-			this.globalEventService.publishChatUserStream(fromUser.id, toUser.id, 'message', packedMessage);
-		}
-
-		if (this.userEntityService.isLocalUser(toUser)) {
-			// 相手のストリーム
-			this.globalEventService.publishChatUserStream(toUser.id, fromUser.id, 'message', packedMessage);
-		}
-
-		// 3秒経っても既読にならなかったらイベント発行
-		if (this.userEntityService.isLocalUser(toUser)) {
-			setTimeout(async () => {
-				const marker = await this.redisClient.get(`newUserChatMessageExists:${toUser.id}:${fromUser.id}`);
-
-				if (marker == null) return; // 既読
-
-				const packedMessageForTo = await this.chatEntityService.packMessageDetailed(inserted, toUser);
-				this.globalEventService.publishMainStream(toUser.id, 'newChatMessage', packedMessageForTo);
-				this.pushNotificationService.pushNotification(toUser.id, 'newChatMessage', packedMessageForTo);
-			}, 3000);
-		}
-
-		return packedMessage;
-	}
-
-	@bindThis
-	public async createMessageToRoom(fromUser: { id: MiUser['id']; host: MiUser['host']; }, toRoom: MiChatRoom, params: {
-		text?: string | null;
-		file?: MiDriveFile | null;
-		uri?: string | null;
-	}): Promise<Packed<'ChatMessageLite'>> {
-		const memberships = await this.chatRoomMembershipsRepository.findBy({ roomId: toRoom.id });
-
-		if (toRoom.ownerId !== fromUser.id && !memberships.some(member => member.userId === fromUser.id)) {
-			throw new Error('you are not a member of the room');
-		}
-
-		const message = {
-			id: this.idService.gen(),
-			fromUserId: fromUser.id,
-			toRoomId: toRoom.id,
-			text: params.text ? params.text.trim() : null,
-			fileId: params.file ? params.file.id : null,
-			reads: [],
-			uri: params.uri ?? null,
-		} satisfies Partial<MiChatMessage>;
-
-		const inserted = await this.chatMessagesRepository.insertOne(message);
-
-		const packedMessage = await this.chatEntityService.packMessageLiteForRoom(inserted);
-
-		this.globalEventService.publishChatRoomStream(toRoom.id, 'message', packedMessage);
-
-		const redisPipeline = this.redisClient.pipeline();
-		for (const membership of memberships) {
-			redisPipeline.set(`newRoomChatMessageExists:${membership.userId}:${toRoom.id}`, message.id);
-			redisPipeline.sadd(`newChatMessagesExists:${membership.userId}`, `room:${toRoom.id}`);
-		}
-		redisPipeline.exec();
-
-		// 3秒経っても既読にならなかったらイベント発行
-		setTimeout(async () => {
-			const redisPipeline = this.redisClient.pipeline();
-			for (const membership of memberships) {
-				redisPipeline.get(`newRoomChatMessageExists:${membership.userId}:${toRoom.id}`);
-			}
-			const markers = await redisPipeline.exec();
-
-			if (markers.every(marker => marker[1] == null)) return;
-
-			const packedMessageForTo = await this.chatEntityService.packMessageDetailed(inserted);
-
-			for (let i = 0; i < memberships.length; i++) {
-				const marker = markers[i][1];
-				if (marker == null) continue;
-
-				this.globalEventService.publishMainStream(memberships[i].userId, 'newChatMessage', packedMessageForTo);
-				this.pushNotificationService.pushNotification(memberships[i].userId, 'newChatMessage', packedMessageForTo);
-			}
-		}, 3000);
-
-		return packedMessage;
-	}
-
-	@bindThis
-	public async readUserChatMessage(
-		readerId: MiUser['id'],
-		senderId: MiUser['id'],
-	): Promise<void> {
-		const redisPipeline = this.redisClient.pipeline();
-		redisPipeline.del(`newUserChatMessageExists:${readerId}:${senderId}`);
-		redisPipeline.srem(`newChatMessagesExists:${readerId}`, `user:${senderId}`);
-		await redisPipeline.exec();
-	}
-
-	@bindThis
-	public async readRoomChatMessage(
-		readerId: MiUser['id'],
-		roomId: MiChatRoom['id'],
-	): Promise<void> {
-		const redisPipeline = this.redisClient.pipeline();
-		redisPipeline.del(`newRoomChatMessageExists:${readerId}:${roomId}`);
-		redisPipeline.srem(`newChatMessagesExists:${readerId}`, `room:${roomId}`);
-		await redisPipeline.exec();
-	}
-
-	@bindThis
-	public findMessageById(messageId: MiChatMessage['id']) {
-		return this.chatMessagesRepository.findOneBy({ id: messageId });
-	}
-
-	@bindThis
-	public findMyMessageById(userId: MiUser['id'], messageId: MiChatMessage['id']) {
-		return this.chatMessagesRepository.findOneBy({ id: messageId, fromUserId: userId });
-	}
-
-	@bindThis
-	public async deleteMessage(message: MiChatMessage) {
-		await this.chatMessagesRepository.delete(message.id);
-
-		if (message.toUserId) {
-			const [fromUser, toUser] = await Promise.all([
-				this.usersRepository.findOneByOrFail({ id: message.fromUserId }),
-				this.usersRepository.findOneByOrFail({ id: message.toUserId }),
-			]);
-
-			if (this.userEntityService.isLocalUser(fromUser)) this.globalEventService.publishChatUserStream(message.fromUserId, message.toUserId, 'deleted', message.id);
-			if (this.userEntityService.isLocalUser(toUser)) this.globalEventService.publishChatUserStream(message.toUserId, message.fromUserId, 'deleted', message.id);
-
-			if (this.userEntityService.isLocalUser(fromUser) && this.userEntityService.isRemoteUser(toUser)) {
-				//const activity = this.apRendererService.addContext(this.apRendererService.renderDelete(this.apRendererService.renderTombstone(`${this.config.url}/notes/${message.id}`), fromUser));
-				//this.queueService.deliver(fromUser, activity, toUser.inbox);
-			}
-		} else if (message.toRoomId) {
-			this.globalEventService.publishChatRoomStream(message.toRoomId, 'deleted', message.id);
-		}
-	}
-
-	@bindThis
-	public async userTimeline(meId: MiUser['id'], otherId: MiUser['id'], limit: number, sinceId?: MiChatMessage['id'] | null, untilId?: MiChatMessage['id'] | null) {
-		const query = this.queryService.makePaginationQuery(this.chatMessagesRepository.createQueryBuilder('message'), sinceId, untilId)
-			.andWhere(new Brackets(qb => {
-				qb
-					.where(new Brackets(qb => {
-						qb
-							.where('message.fromUserId = :meId')
-							.andWhere('message.toUserId = :otherId');
-					}))
-					.orWhere(new Brackets(qb => {
-						qb
-							.where('message.fromUserId = :otherId')
-							.andWhere('message.toUserId = :meId');
-					}));
-			}))
-			.setParameter('meId', meId)
-			.setParameter('otherId', otherId);
-
-		const messages = await query.take(limit).getMany();
-
-		return messages;
-	}
-
-	@bindThis
-	public async roomTimeline(roomId: MiChatRoom['id'], limit: number, sinceId?: MiChatMessage['id'] | null, untilId?: MiChatMessage['id'] | null) {
-		const query = this.queryService.makePaginationQuery(this.chatMessagesRepository.createQueryBuilder('message'), sinceId, untilId)
-			.where('message.toRoomId = :roomId', { roomId });
-
-		const messages = await query.take(limit).getMany();
-
-		return messages;
-	}
-
-	@bindThis
-	public async userHistory(meId: MiUser['id'], limit: number): Promise<MiChatMessage[]> {
-		const history: MiChatMessage[] = [];
-
-		const mutingQuery = this.mutingsRepository.createQueryBuilder('muting')
-			.select('muting.muteeId')
-			.where('muting.muterId = :muterId', { muterId: meId });
-
-		for (let i = 0; i < limit; i++) {
-			const found = history.map(m => (m.fromUserId === meId) ? m.toUserId! : m.fromUserId!);
-
-			const query = this.chatMessagesRepository.createQueryBuilder('message')
-				.orderBy('message.id', 'DESC')
-				.where(new Brackets(qb => {
-					qb
-						.where('message.fromUserId = :meId', { meId: meId })
-						.orWhere('message.toUserId = :meId', { meId: meId });
-				}))
-				.andWhere('message.toRoomId IS NULL')
-				.andWhere(`message.fromUserId NOT IN (${ mutingQuery.getQuery() })`)
-				.andWhere(`message.toUserId NOT IN (${ mutingQuery.getQuery() })`);
-
-			if (found.length > 0) {
-				query.andWhere('message.fromUserId NOT IN (:...found)', { found: found });
-				query.andWhere('message.toUserId NOT IN (:...found)', { found: found });
-			}
-
-			query.setParameters(mutingQuery.getParameters());
-
-			const message = await query.getOne();
-
-			if (message) {
-				history.push(message);
-			} else {
-				break;
-			}
-		}
-
-		return history;
-	}
-
-	@bindThis
-	public async roomHistory(meId: MiUser['id'], limit: number): Promise<MiChatMessage[]> {
-		// TODO: 一回のクエリにまとめられるかも
-		const [memberRoomIds, ownedRoomIds] = await Promise.all([
-			this.chatRoomMembershipsRepository.findBy({
-				userId: meId,
-			}).then(xs => xs.map(x => x.roomId)),
-			this.chatRoomsRepository.findBy({
-				ownerId: meId,
-			}).then(xs => xs.map(x => x.id)),
-		]);
-
-		const roomIds = memberRoomIds.concat(ownedRoomIds);
-
-		if (memberRoomIds.length === 0 && ownedRoomIds.length === 0) {
-			return [];
-		}
-
-		const history: MiChatMessage[] = [];
-
-		for (let i = 0; i < limit; i++) {
-			const found = history.map(m => m.toRoomId!);
-
-			const query = this.chatMessagesRepository.createQueryBuilder('message')
-				.orderBy('message.id', 'DESC')
-				.where('message.toRoomId IN (:...roomIds)', { roomIds });
-
-			if (found.length > 0) {
-				query.andWhere('message.toRoomId NOT IN (:...found)', { found: found });
-			}
-
-			const message = await query.getOne();
-
-			if (message) {
-				history.push(message);
-			} else {
-				break;
-			}
-		}
-
-		return history;
-	}
-
-	@bindThis
-	public async getUserReadStateMap(userId: MiUser['id'], otherIds: MiUser['id'][]) {
-		const readStateMap: Record<MiUser['id'], boolean> = {};
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		for (const otherId of otherIds) {
-			redisPipeline.get(`newUserChatMessageExists:${userId}:${otherId}`);
-		}
-
-		const markers = await redisPipeline.exec();
-
-		for (let i = 0; i < otherIds.length; i++) {
-			const marker = markers[i][1];
-			readStateMap[otherIds[i]] = marker == null;
-		}
-
-		return readStateMap;
-	}
-
-	@bindThis
-	public async getRoomReadStateMap(userId: MiUser['id'], roomIds: MiChatRoom['id'][]) {
-		const readStateMap: Record<MiChatRoom['id'], boolean> = {};
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		for (const roomId of roomIds) {
-			redisPipeline.get(`newRoomChatMessageExists:${userId}:${roomId}`);
-		}
-
-		const markers = await redisPipeline.exec();
-
-		for (let i = 0; i < roomIds.length; i++) {
-			const marker = markers[i][1];
-			readStateMap[roomIds[i]] = marker == null;
-		}
-
-		return readStateMap;
-	}
-
-	@bindThis
-	public async hasUnreadMessages(userId: MiUser['id']) {
-		const card = await this.redisClient.scard(`newChatMessagesExists:${userId}`);
-		return card > 0;
-	}
-
-	@bindThis
-	public async createRoom(owner: MiUser, name: string) {
-		const room = {
-			id: this.idService.gen(),
-			name: name,
-			ownerId: owner.id,
-		} satisfies Partial<MiChatRoom>;
-
-		const created = await this.chatRoomsRepository.insertOne(room);
-
-		return created;
-	}
-
-	@bindThis
-	public async deleteRoom(room: MiChatRoom) {
-		await this.chatRoomsRepository.delete(room.id);
-	}
-
-	@bindThis
-	public async findMyRoomById(ownerId: MiUser['id'], roomId: MiChatRoom['id']) {
-		return this.chatRoomsRepository.findOneBy({ id: roomId, ownerId: ownerId });
-	}
-
-	@bindThis
-	public async findRoomById(roomId: MiChatRoom['id']) {
-		return this.chatRoomsRepository.findOneBy({ id: roomId });
-	}
-
-	@bindThis
-	public async isRoomMember(roomId: MiChatRoom['id'], userId: MiUser['id']) {
-		const membership = await this.chatRoomMembershipsRepository.findOneBy({ roomId, userId });
-		return membership != null;
-	}
-
-	@bindThis
-	public async createRoomInvitation(inviterId: MiUser['id'], roomId: MiChatRoom['id'], inviteeId: MiUser['id']) {
-		if (inviterId === inviteeId) {
-			throw new Error('yourself');
-		}
-
-		const room = await this.chatRoomsRepository.findOneByOrFail({ id: roomId, ownerId: inviterId });
-
-		const existingInvitation = await this.chatRoomInvitationsRepository.findOneBy({ roomId, userId: inviteeId });
-		if (existingInvitation) {
-			throw new Error('already invited');
-		}
-
-		const membershipsCount = await this.chatRoomMembershipsRepository.countBy({ roomId });
-		if (membershipsCount >= MAX_ROOM_MEMBERS) {
-			throw new Error('room is full');
-		}
-
-		// TODO: cehck block
-
-		const invitation = {
-			id: this.idService.gen(),
-			roomId: room.id,
-			userId: inviteeId,
-		} satisfies Partial<MiChatRoomInvitation>;
-
-		const created = await this.chatRoomInvitationsRepository.insertOne(invitation);
-
-		return created;
-	}
-
-	@bindThis
-	public async getOwnedRoomsWithPagination(ownerId: MiUser['id'], limit: number, sinceId?: MiChatRoom['id'] | null, untilId?: MiChatRoom['id'] | null) {
-		const query = this.queryService.makePaginationQuery(this.chatRoomsRepository.createQueryBuilder('room'), sinceId, untilId)
-			.where('room.ownerId = :ownerId', { ownerId });
-
-		const rooms = await query.take(limit).getMany();
-
-		return rooms;
-	}
-
-	@bindThis
-	public async getReceivedRoomInvitationsWithPagination(userId: MiUser['id'], limit: number, sinceId?: MiChatRoomInvitation['id'] | null, untilId?: MiChatRoomInvitation['id'] | null) {
-		const query = this.queryService.makePaginationQuery(this.chatRoomInvitationsRepository.createQueryBuilder('invitation'), sinceId, untilId)
-			.where('invitation.userId = :userId', { userId })
-			.andWhere('invitation.ignored = FALSE');
-
-		const invitations = await query.take(limit).getMany();
-
-		return invitations;
-	}
-
-	@bindThis
-	public async joinToRoom(userId: MiUser['id'], roomId: MiChatRoom['id']) {
-		const invitation = await this.chatRoomInvitationsRepository.findOneByOrFail({ roomId, userId });
-
-		const membershipsCount = await this.chatRoomMembershipsRepository.countBy({ roomId });
-		if (membershipsCount >= MAX_ROOM_MEMBERS) {
-			throw new Error('room is full');
-		}
-
-		const membership = {
-			id: this.idService.gen(),
-			roomId: roomId,
-			userId: userId,
-		} satisfies Partial<MiChatRoomMembership>;
-
-		// TODO: transaction
-		await this.chatRoomMembershipsRepository.insertOne(membership);
-		await this.chatRoomInvitationsRepository.delete(invitation.id);
-	}
-
-	@bindThis
-	public async ignoreRoomInvitation(userId: MiUser['id'], roomId: MiChatRoom['id']) {
-		const invitation = await this.chatRoomInvitationsRepository.findOneByOrFail({ roomId, userId });
-		await this.chatRoomInvitationsRepository.update(invitation.id, { ignored: true });
-	}
-
-	@bindThis
-	public async leaveRoom(userId: MiUser['id'], roomId: MiChatRoom['id']) {
-		const membership = await this.chatRoomMembershipsRepository.findOneByOrFail({ roomId, userId });
-		await this.chatRoomMembershipsRepository.delete(membership.id);
-	}
-
-	@bindThis
-	public async updateRoom(room: MiChatRoom, params: {
-		name?: string;
-	}): Promise<MiChatRoom> {
-		return this.chatRoomsRepository.createQueryBuilder().update()
-			.set(params)
-			.where('id = :id', { id: room.id })
-			.returning('*')
-			.execute()
-			.then((response) => {
-				return response.raw[0];
-			});
-	}
-
-	@bindThis
-	public async getRoomMembershipsWithPagination(roomId: MiChatRoom['id'], limit: number, sinceId?: MiChatRoomMembership['id'] | null, untilId?: MiChatRoomMembership['id'] | null) {
-		const query = this.queryService.makePaginationQuery(this.chatRoomMembershipsRepository.createQueryBuilder('membership'), sinceId, untilId)
-			.where('membership.roomId = :roomId', { roomId });
-
-		const memberships = await query.take(limit).getMany();
-
-		return memberships;
-	}
-}

packages/backend/src/core/CoreModule.ts

@@ -44,6 +44,7 @@ import { ModerationLogService } from './ModerationLogService.js';
 import { NoteCreateService } from './NoteCreateService.js';
 import { NoteDeleteService } from './NoteDeleteService.js';
 import { NotePiningService } from './NotePiningService.js';
+import { NoteReadService } from './NoteReadService.js';
 import { NotificationService } from './NotificationService.js';
 import { PollService } from './PollService.js';
 import { PushNotificationService } from './PushNotificationService.js';
@@ -74,7 +75,6 @@ import { ClipService } from './ClipService.js';
 import { FeaturedService } from './FeaturedService.js';
 import { FanoutTimelineService } from './FanoutTimelineService.js';
 import { ChannelFollowingService } from './ChannelFollowingService.js';
-import { ChatService } from './ChatService.js';
 import { RegistryApiService } from './RegistryApiService.js';
 import { ReversiService } from './ReversiService.js';
 
@@ -100,7 +100,6 @@ import { AppEntityService } from './entities/AppEntityService.js';
 import { AuthSessionEntityService } from './entities/AuthSessionEntityService.js';
 import { BlockingEntityService } from './entities/BlockingEntityService.js';
 import { ChannelEntityService } from './entities/ChannelEntityService.js';
-import { ChatEntityService } from './entities/ChatEntityService.js';
 import { ClipEntityService } from './entities/ClipEntityService.js';
 import { DriveFileEntityService } from './entities/DriveFileEntityService.js';
 import { DriveFolderEntityService } from './entities/DriveFolderEntityService.js';
@@ -185,6 +184,7 @@ const $ModerationLogService: Provider = { provide: 'ModerationLogService', useEx
 const $NoteCreateService: Provider = { provide: 'NoteCreateService', useExisting: NoteCreateService };
 const $NoteDeleteService: Provider = { provide: 'NoteDeleteService', useExisting: NoteDeleteService };
 const $NotePiningService: Provider = { provide: 'NotePiningService', useExisting: NotePiningService };
+const $NoteReadService: Provider = { provide: 'NoteReadService', useExisting: NoteReadService };
 const $NotificationService: Provider = { provide: 'NotificationService', useExisting: NotificationService };
 const $PollService: Provider = { provide: 'PollService', useExisting: PollService };
 const $SystemAccountService: Provider = { provide: 'SystemAccountService', useExisting: SystemAccountService };
@@ -221,7 +221,6 @@ const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: Fe
 const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', useExisting: FanoutTimelineService };
 const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
 const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
-const $ChatService: Provider = { provide: 'ChatService', useExisting: ChatService };
 const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
 const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
 
@@ -248,7 +247,6 @@ const $AppEntityService: Provider = { provide: 'AppEntityService', useExisting:
 const $AuthSessionEntityService: Provider = { provide: 'AuthSessionEntityService', useExisting: AuthSessionEntityService };
 const $BlockingEntityService: Provider = { provide: 'BlockingEntityService', useExisting: BlockingEntityService };
 const $ChannelEntityService: Provider = { provide: 'ChannelEntityService', useExisting: ChannelEntityService };
-const $ChatEntityService: Provider = { provide: 'ChatEntityService', useExisting: ChatEntityService };
 const $ClipEntityService: Provider = { provide: 'ClipEntityService', useExisting: ClipEntityService };
 const $DriveFileEntityService: Provider = { provide: 'DriveFileEntityService', useExisting: DriveFileEntityService };
 const $DriveFolderEntityService: Provider = { provide: 'DriveFolderEntityService', useExisting: DriveFolderEntityService };
@@ -335,6 +333,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		NoteCreateService,
 		NoteDeleteService,
 		NotePiningService,
+		NoteReadService,
 		NotificationService,
 		PollService,
 		SystemAccountService,
@@ -371,7 +370,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FanoutTimelineService,
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
-		ChatService,
 		RegistryApiService,
 		ReversiService,
 
@@ -398,7 +396,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AuthSessionEntityService,
 		BlockingEntityService,
 		ChannelEntityService,
-		ChatEntityService,
 		ClipEntityService,
 		DriveFileEntityService,
 		DriveFolderEntityService,
@@ -481,6 +478,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$NoteCreateService,
 		$NoteDeleteService,
 		$NotePiningService,
+		$NoteReadService,
 		$NotificationService,
 		$PollService,
 		$SystemAccountService,
@@ -517,7 +515,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FanoutTimelineService,
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
-		$ChatService,
 		$RegistryApiService,
 		$ReversiService,
 
@@ -544,7 +541,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AuthSessionEntityService,
 		$BlockingEntityService,
 		$ChannelEntityService,
-		$ChatEntityService,
 		$ClipEntityService,
 		$DriveFileEntityService,
 		$DriveFolderEntityService,
@@ -628,6 +624,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		NoteCreateService,
 		NoteDeleteService,
 		NotePiningService,
+		NoteReadService,
 		NotificationService,
 		PollService,
 		SystemAccountService,
@@ -664,7 +661,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FanoutTimelineService,
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
-		ChatService,
 		RegistryApiService,
 		ReversiService,
 
@@ -690,7 +686,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AuthSessionEntityService,
 		BlockingEntityService,
 		ChannelEntityService,
-		ChatEntityService,
 		ClipEntityService,
 		DriveFileEntityService,
 		DriveFolderEntityService,
@@ -773,6 +768,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$NoteCreateService,
 		$NoteDeleteService,
 		$NotePiningService,
+		$NoteReadService,
 		$NotificationService,
 		$PollService,
 		$SystemAccountService,
@@ -808,7 +804,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FanoutTimelineService,
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
-		$ChatService,
 		$RegistryApiService,
 		$ReversiService,
 
@@ -834,7 +829,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AuthSessionEntityService,
 		$BlockingEntityService,
 		$ChannelEntityService,
-		$ChatEntityService,
 		$ClipEntityService,
 		$DriveFileEntityService,
 		$DriveFolderEntityService,

packages/backend/src/core/GlobalEventService.ts

@@ -20,7 +20,7 @@ import type { MiPage } from '@/models/Page.js';
 import type { MiWebhook } from '@/models/Webhook.js';
 import type { MiSystemWebhook } from '@/models/SystemWebhook.js';
 import type { MiMeta } from '@/models/Meta.js';
-import { MiAvatarDecoration, MiChatRoom, MiReversiGame, MiRole, MiRoleAssignment } from '@/models/_.js';
+import { MiAvatarDecoration, MiReversiGame, MiRole, MiRoleAssignment } from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
@@ -72,8 +72,12 @@ export interface MainEventTypes {
 	readAllNotifications: undefined;
 	notificationFlushed: undefined;
 	unreadNotification: Packed<'Notification'>;
+	unreadMention: MiNote['id'];
+	readAllUnreadMentions: undefined;
+	unreadSpecifiedNote: MiNote['id'];
+	readAllUnreadSpecifiedNotes: undefined;
+	readAllAntennas: undefined;
 	unreadAntenna: MiAntenna;
-	newChatMessage: Packed<'ChatMessage'>;
 	readAllAnnouncements: undefined;
 	myTokenRegenerated: undefined;
 	signin: {
@@ -159,11 +163,6 @@ export interface AdminEventTypes {
 	};
 }
 
-export interface ChatEventTypes {
-	message: Packed<'ChatMessage'>;
-	deleted: Packed<'ChatMessage'>['id'];
-}
-
 export interface ReversiEventTypes {
 	matched: {
 		game: Packed<'ReversiGameDetailed'>;
@@ -203,7 +202,7 @@ export interface ReversiGameEventTypes {
 type Events<T extends object> = { [K in keyof T]: { type: K; body: T[K]; } };
 type EventUnionFromDictionary<
 	T extends object,
-	U = Events<T>,
+	U = Events<T>
 > = U[keyof U];
 
 type SerializedAll<T> = {
@@ -296,14 +295,6 @@ export type GlobalEvents = {
 		name: 'notesStream';
 		payload: Serialized<Packed<'Note'>>;
 	};
-	chat: {
-		name: `chatUserStream:${MiUser['id']}-${MiUser['id']}`;
-		payload: EventTypesToEventPayload<ChatEventTypes>;
-	};
-	chatRoom: {
-		name: `chatRoomStream:${MiChatRoom['id']}`;
-		payload: EventTypesToEventPayload<ChatEventTypes>;
-	};
 	reversi: {
 		name: `reversiStream:${MiUser['id']}`;
 		payload: EventTypesToEventPayload<ReversiEventTypes>;
@@ -402,16 +393,6 @@ export class GlobalEventService {
 		this.publish(`adminStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
-	@bindThis
-	public publishChatUserStream<K extends keyof ChatEventTypes>(fromUserId: MiUser['id'], toUserId: MiUser['id'], type: K, value?: ChatEventTypes[K]): void {
-		this.publish(`chatUserStream:${fromUserId}-${toUserId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	@bindThis
-	public publishChatRoomStream<K extends keyof ChatEventTypes>(toRoomId: MiChatRoom['id'], type: K, value?: ChatEventTypes[K]): void {
-		this.publish(`chatRoomStream:${toRoomId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
 	@bindThis
 	public publishReversiStream<K extends keyof ReversiEventTypes>(userId: MiUser['id'], type: K, value?: ReversiEventTypes[K]): void {
 		this.publish(`reversiStream:${userId}`, type, typeof value === 'undefined' ? null : value);

packages/backend/src/core/NoteCreateService.ts

@@ -42,6 +42,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
 import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
 import { bindThis } from '@/decorators.js';
 import { DB_MAX_NOTE_TEXT_LENGTH } from '@/const.js';
@@ -198,6 +199,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private globalEventService: GlobalEventService,
 		private queueService: QueueService,
 		private fanoutTimelineService: FanoutTimelineService,
+		private noteReadService: NoteReadService,
 		private notificationService: NotificationService,
 		private relayService: RelayService,
 		private federatedInstanceService: FederatedInstanceService,
@@ -580,6 +582,31 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (!silent) {
 			if (this.userEntityService.isLocalUser(user)) this.activeUsersChart.write(user);
 
+			// 未読通知を作成
+			if (data.visibility === 'specified') {
+				if (data.visibleUsers == null) throw new Error('invalid param');
+
+				for (const u of data.visibleUsers) {
+					// ローカルユーザーのみ
+					if (!this.userEntityService.isLocalUser(u)) continue;
+
+					this.noteReadService.insertNoteUnread(u.id, note, {
+						isSpecified: true,
+						isMentioned: false,
+					});
+				}
+			} else {
+				for (const u of mentionedUsers) {
+					// ローカルユーザーのみ
+					if (!this.userEntityService.isLocalUser(u)) continue;
+
+					this.noteReadService.insertNoteUnread(u.id, note, {
+						isSpecified: false,
+						isMentioned: true,
+					});
+				}
+			}
+
 			// Pack the note
 			const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true, withReactionAndUserPairCache: true });
 

packages/backend/src/core/NoteReadService.ts

@@ -0,0 +1,143 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { setTimeout } from 'node:timers/promises';
+import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
+import { In } from 'typeorm';
+import { DI } from '@/di-symbols.js';
+import type { MiUser } from '@/models/User.js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { MiNote } from '@/models/Note.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import type { NoteUnreadsRepository, MutingsRepository, NoteThreadMutingsRepository } from '@/models/_.js';
+import { bindThis } from '@/decorators.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
+
+@Injectable()
+export class NoteReadService implements OnApplicationShutdown {
+	#shutdownController = new AbortController();
+
+	constructor(
+		@Inject(DI.noteUnreadsRepository)
+		private noteUnreadsRepository: NoteUnreadsRepository,
+
+		@Inject(DI.mutingsRepository)
+		private mutingsRepository: MutingsRepository,
+
+		@Inject(DI.noteThreadMutingsRepository)
+		private noteThreadMutingsRepository: NoteThreadMutingsRepository,
+
+		private idService: IdService,
+		private globalEventService: GlobalEventService,
+	) {
+	}
+
+	@bindThis
+	public async insertNoteUnread(userId: MiUser['id'], note: MiNote, params: {
+		// NOTE: isSpecifiedがtrueならisMentionedは必ずfalse
+		isSpecified: boolean;
+		isMentioned: boolean;
+	}): Promise<void> {
+		//#region ミュートしているなら無視
+		const mute = await this.mutingsRepository.findBy({
+			muterId: userId,
+		});
+		if (mute.map(m => m.muteeId).includes(note.userId)) return;
+		//#endregion
+
+		// スレッドミュート
+		const isThreadMuted = await this.noteThreadMutingsRepository.exists({
+			where: {
+				userId: userId,
+				threadId: note.threadId ?? note.id,
+			},
+		});
+		if (isThreadMuted) return;
+
+		const unread = {
+			id: this.idService.gen(),
+			noteId: note.id,
+			userId: userId,
+			isSpecified: params.isSpecified,
+			isMentioned: params.isMentioned,
+			noteUserId: note.userId,
+		};
+
+		await this.noteUnreadsRepository.insert(unread);
+
+		// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
+		setTimeout(2000, 'unread note', { signal: this.#shutdownController.signal }).then(async () => {
+			const exist = await this.noteUnreadsRepository.exists({ where: { id: unread.id } });
+
+			if (!exist) return;
+
+			if (params.isMentioned) {
+				this.globalEventService.publishMainStream(userId, 'unreadMention', note.id);
+			}
+			if (params.isSpecified) {
+				this.globalEventService.publishMainStream(userId, 'unreadSpecifiedNote', note.id);
+			}
+		}, () => { /* aborted, ignore it */ });
+	}
+
+	@bindThis
+	public async read(
+		userId: MiUser['id'],
+		notes: (MiNote | Packed<'Note'>)[],
+	): Promise<void> {
+		if (notes.length === 0) return;
+
+		const noteIds = new Set<MiNote['id']>();
+
+		for (const note of notes) {
+			if (note.mentions && note.mentions.includes(userId)) {
+				noteIds.add(note.id);
+			} else if (note.visibleUserIds && note.visibleUserIds.includes(userId)) {
+				noteIds.add(note.id);
+			}
+		}
+
+		if (noteIds.size === 0) return;
+
+		// Remove the record
+		await this.noteUnreadsRepository.delete({
+			userId: userId,
+			noteId: In(Array.from(noteIds)),
+		});
+
+		// TODO: ↓まとめてクエリしたい
+
+		trackPromise(this.noteUnreadsRepository.countBy({
+			userId: userId,
+			isMentioned: true,
+		}).then(mentionsCount => {
+			if (mentionsCount === 0) {
+				// 全て既読になったイベントを発行
+				this.globalEventService.publishMainStream(userId, 'readAllUnreadMentions');
+			}
+		}));
+
+		trackPromise(this.noteUnreadsRepository.countBy({
+			userId: userId,
+			isSpecified: true,
+		}).then(specifiedCount => {
+			if (specifiedCount === 0) {
+				// 全て既読になったイベントを発行
+				this.globalEventService.publishMainStream(userId, 'readAllUnreadSpecifiedNotes');
+			}
+		}));
+	}
+
+	@bindThis
+	public dispose(): void {
+		this.#shutdownController.abort();
+	}
+
+	@bindThis
+	public onApplicationShutdown(signal?: string | undefined): void {
+		this.dispose();
+	}
+}

packages/backend/src/core/RoleService.ts

@@ -63,7 +63,6 @@ export type RolePolicies = {
 	canImportFollowing: boolean;
 	canImportMuting: boolean;
 	canImportUserLists: boolean;
-	canChat: boolean;
 };
 
 export const DEFAULT_POLICIES: RolePolicies = {
@@ -98,7 +97,6 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	canImportFollowing: true,
 	canImportMuting: true,
 	canImportUserLists: true,
-	canChat: true,
 };
 
 @Injectable()
@@ -402,7 +400,6 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			canImportFollowing: calc('canImportFollowing', vs => vs.some(v => v === true)),
 			canImportMuting: calc('canImportMuting', vs => vs.some(v => v === true)),
 			canImportUserLists: calc('canImportUserLists', vs => vs.some(v => v === true)),
-			canChat: calc('canChat', vs => vs.some(v => v === true)),
 		};
 	}
 

packages/backend/src/core/UserFollowingService.ts

@@ -5,7 +5,7 @@
 
 import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
-import { Brackets, IsNull } from 'typeorm';
+import { IsNull } from 'typeorm';
 import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
@@ -736,30 +736,4 @@ export class UserFollowingService implements OnModuleInit {
 			.where('following.followerId = :followerId', { followerId: userId })
 			.getMany();
 	}
-
-	@bindThis
-	public isFollowing(followerId: MiUser['id'], followeeId: MiUser['id']) {
-		return this.followingsRepository.exists({
-			where: {
-				followerId,
-				followeeId,
-			},
-		});
-	}
-
-	@bindThis
-	public async isMutual(aUserId: MiUser['id'], bUserId: MiUser['id']) {
-		const count = await this.followingsRepository.createQueryBuilder('following')
-			.where(new Brackets(qb => {
-				qb.where('following.followerId = :aUserId', { aUserId })
-					.andWhere('following.followeeId = :bUserId', { bUserId });
-			}))
-			.orWhere(new Brackets(qb => {
-				qb.where('following.followerId = :bUserId', { bUserId })
-					.andWhere('following.followeeId = :aUserId', { aUserId });
-			}))
-			.getCount();
-
-		return count === 2;
-	}
 }

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

@@ -1,282 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DI } from '@/di-symbols.js';
-import type { MiUser, ChatMessagesRepository, MiChatMessage, ChatRoomsRepository, MiChatRoom, MiChatRoomInvitation, ChatRoomInvitationsRepository, MiChatRoomMembership, ChatRoomMembershipsRepository } from '@/models/_.js';
-import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from '@/misc/json-schema.js';
-import type { } from '@/models/Blocking.js';
-import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
-import { UserEntityService } from './UserEntityService.js';
-import { DriveFileEntityService } from './DriveFileEntityService.js';
-
-@Injectable()
-export class ChatEntityService {
-	constructor(
-		@Inject(DI.chatMessagesRepository)
-		private chatMessagesRepository: ChatMessagesRepository,
-
-		@Inject(DI.chatRoomsRepository)
-		private chatRoomsRepository: ChatRoomsRepository,
-
-		@Inject(DI.chatRoomInvitationsRepository)
-		private chatRoomInvitationsRepository: ChatRoomInvitationsRepository,
-
-		@Inject(DI.chatRoomMembershipsRepository)
-		private chatRoomMembershipsRepository: ChatRoomMembershipsRepository,
-
-		private userEntityService: UserEntityService,
-		private driveFileEntityService: DriveFileEntityService,
-		private idService: IdService,
-	) {
-	}
-
-	@bindThis
-	public async packMessageDetailed(
-		src: MiChatMessage['id'] | MiChatMessage,
-		me?: { id: MiUser['id'] },
-		options?: {
-			_hint_?: {
-				packedFiles: Map<MiChatMessage['fileId'], Packed<'DriveFile'> | null>;
-				packedUsers: Map<MiChatMessage['id'], Packed<'UserLite'>>;
-				packedRooms: Map<MiChatMessage['toRoomId'], Packed<'ChatRoom'> | null>;
-			};
-		},
-	): Promise<Packed<'ChatMessage'>> {
-		const packedUsers = options?._hint_?.packedUsers;
-		const packedFiles = options?._hint_?.packedFiles;
-		const packedRooms = options?._hint_?.packedRooms;
-
-		const message = typeof src === 'object' ? src : await this.chatMessagesRepository.findOneByOrFail({ id: src });
-
-		return {
-			id: message.id,
-			createdAt: this.idService.parse(message.id).date.toISOString(),
-			text: message.text,
-			fromUserId: message.fromUserId,
-			fromUser: packedUsers?.get(message.fromUserId) ?? await this.userEntityService.pack(message.fromUser ?? message.fromUserId, me),
-			toUserId: message.toUserId,
-			toUser: message.toUserId ? (packedUsers?.get(message.toUserId) ?? await this.userEntityService.pack(message.toUser ?? message.toUserId, me)) : undefined,
-			toRoomId: message.toRoomId,
-			toRoom: message.toRoomId ? (packedRooms?.get(message.toRoomId) ?? await this.packRoom(message.toRoom ?? message.toRoomId, me)) : undefined,
-			fileId: message.fileId,
-			file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null,
-		};
-	}
-
-	@bindThis
-	public async packMessagesDetailed(
-		messages: MiChatMessage[],
-		me: { id: MiUser['id'] },
-	) {
-		if (messages.length === 0) return [];
-
-		const excludeMe = (x: MiUser | string) => {
-			if (typeof x === 'string') {
-				return x !== me.id;
-			} else {
-				return x.id !== me.id;
-			}
-		};
-
-		const users = [
-			...messages.map((m) => m.fromUser ?? m.fromUserId).filter(excludeMe),
-			...messages.map((m) => m.toUser ?? m.toUserId).filter(x => x != null).filter(excludeMe),
-		];
-
-		const [packedUsers, packedFiles] = await Promise.all([
-			this.userEntityService.packMany(users, me)
-				.then(users => new Map(users.map(u => [u.id, u]))),
-			this.driveFileEntityService.packMany(messages.map(m => m.file).filter(x => x != null)),
-		]);
-
-		return Promise.all(messages.map(message => this.packMessageDetailed(message, me, { _hint_: { packedUsers, packedFiles } })));
-	}
-
-	@bindThis
-	public async packMessageLite(
-		src: MiChatMessage['id'] | MiChatMessage,
-		options?: {
-			_hint_?: {
-				packedFiles: Map<MiChatMessage['fileId'], Packed<'DriveFile'> | null>;
-			};
-		},
-	): Promise<Packed<'ChatMessageLite'>> {
-		const packedFiles = options?._hint_?.packedFiles;
-
-		const message = typeof src === 'object' ? src : await this.chatMessagesRepository.findOneByOrFail({ id: src });
-
-		return {
-			id: message.id,
-			createdAt: this.idService.parse(message.id).date.toISOString(),
-			text: message.text,
-			fromUserId: message.fromUserId,
-			toUserId: message.toUserId,
-			fileId: message.fileId,
-			file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null,
-		};
-	}
-
-	@bindThis
-	public async packMessagesLite(
-		messages: MiChatMessage[],
-	) {
-		if (messages.length === 0) return [];
-
-		const [packedFiles] = await Promise.all([
-			this.driveFileEntityService.packMany(messages.map(m => m.file).filter(x => x != null)),
-		]);
-
-		return Promise.all(messages.map(message => this.packMessageLite(message, { _hint_: { packedFiles } })));
-	}
-
-	@bindThis
-	public async packMessageLiteForRoom(
-		src: MiChatMessage['id'] | MiChatMessage,
-		options?: {
-			_hint_?: {
-				packedFiles: Map<MiChatMessage['fileId'], Packed<'DriveFile'> | null>;
-				packedUsers: Map<MiChatMessage['id'], Packed<'UserLite'>>;
-			};
-		},
-	): Promise<Packed<'ChatMessageLite'>> {
-		const packedFiles = options?._hint_?.packedFiles;
-		const packedUsers = options?._hint_?.packedUsers;
-
-		const message = typeof src === 'object' ? src : await this.chatMessagesRepository.findOneByOrFail({ id: src });
-
-		return {
-			id: message.id,
-			createdAt: this.idService.parse(message.id).date.toISOString(),
-			text: message.text,
-			fromUserId: message.fromUserId,
-			fromUser: packedUsers?.get(message.fromUserId) ?? await this.userEntityService.pack(message.fromUser ?? message.fromUserId),
-			toRoomId: message.toRoomId,
-			fileId: message.fileId,
-			file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null,
-		};
-	}
-
-	@bindThis
-	public async packMessagesLiteForRoom(
-		messages: MiChatMessage[],
-	) {
-		if (messages.length === 0) return [];
-
-		const [packedUsers, packedFiles] = await Promise.all([
-			this.userEntityService.packMany(messages.map(x => x.fromUser ?? x.fromUserId))
-				.then(users => new Map(users.map(u => [u.id, u]))),
-			this.driveFileEntityService.packMany(messages.map(m => m.file).filter(x => x != null)),
-		]);
-
-		return Promise.all(messages.map(message => this.packMessageLiteForRoom(message, { _hint_: { packedFiles, packedUsers } })));
-	}
-
-	@bindThis
-	public async packRoom(
-		src: MiChatRoom['id'] | MiChatRoom,
-		me?: { id: MiUser['id'] },
-		options?: {
-			_hint_?: {
-				packedOwners: Map<MiChatRoom['id'], Packed<'UserLite'>>;
-			};
-		},
-	): Promise<Packed<'ChatRoom'>> {
-		const room = typeof src === 'object' ? src : await this.chatRoomsRepository.findOneByOrFail({ id: src });
-
-		return {
-			id: room.id,
-			createdAt: this.idService.parse(room.id).date.toISOString(),
-			name: room.name,
-			ownerId: room.ownerId,
-			owner: options?._hint_?.packedOwners.get(room.ownerId) ?? await this.userEntityService.pack(room.owner ?? room.ownerId, me),
-		};
-	}
-
-	@bindThis
-	public async packRooms(
-		rooms: MiChatRoom[],
-		me: { id: MiUser['id'] },
-	) {
-		if (rooms.length === 0) return [];
-
-		const owners = rooms.map(x => x.owner ?? x.ownerId);
-
-		const packedOwners = await this.userEntityService.packMany(owners, me)
-			.then(users => new Map(users.map(u => [u.id, u])));
-
-		return Promise.all(rooms.map(room => this.packRoom(room, me, { _hint_: { packedOwners } })));
-	}
-
-	@bindThis
-	public async packRoomInvitation(
-		src: MiChatRoomInvitation['id'] | MiChatRoomInvitation,
-		me: { id: MiUser['id'] },
-		options?: {
-			_hint_?: {
-				packedRooms: Map<MiChatRoomInvitation['roomId'], Packed<'ChatRoom'>>;
-				packedUsers: Map<MiChatRoomInvitation['id'], Packed<'UserLite'>>;
-			};
-		},
-	): Promise<Packed<'ChatRoomInvitation'>> {
-		const invitation = typeof src === 'object' ? src : await this.chatRoomInvitationsRepository.findOneByOrFail({ id: src });
-
-		return {
-			id: invitation.id,
-			createdAt: this.idService.parse(invitation.id).date.toISOString(),
-			roomId: invitation.roomId,
-			room: options?._hint_?.packedRooms.get(invitation.roomId) ?? await this.packRoom(invitation.room ?? invitation.roomId, me),
-			userId: invitation.userId,
-			user: options?._hint_?.packedUsers.get(invitation.userId) ?? await this.userEntityService.pack(invitation.user ?? invitation.userId, me),
-		};
-	}
-
-	@bindThis
-	public async packRoomInvitations(
-		invitations: MiChatRoomInvitation[],
-		me: { id: MiUser['id'] },
-	) {
-		if (invitations.length === 0) return [];
-
-		return Promise.all(invitations.map(invitation => this.packRoomInvitation(invitation, me)));
-	}
-
-	@bindThis
-	public async packRoomMembership(
-		src: MiChatRoomMembership['id'] | MiChatRoomMembership,
-		me: { id: MiUser['id'] },
-		options?: {
-			_hint_?: {
-				packedUsers: Map<MiChatRoomMembership['id'], Packed<'UserLite'>>;
-			};
-		},
-	): Promise<Packed<'ChatRoomMembership'>> {
-		const membership = typeof src === 'object' ? src : await this.chatRoomMembershipsRepository.findOneByOrFail({ id: src });
-
-		return {
-			id: membership.id,
-			createdAt: this.idService.parse(membership.id).date.toISOString(),
-			userId: membership.userId,
-			user: options?._hint_?.packedUsers.get(membership.userId) ?? await this.userEntityService.pack(membership.user ?? membership.userId, me),
-		};
-	}
-
-	@bindThis
-	public async packRoomMemberships(
-		memberships: MiChatRoomMembership[],
-		me: { id: MiUser['id'] },
-	) {
-		if (memberships.length === 0) return [];
-
-		const users = memberships.map(x => x.user ?? x.userId);
-
-		const packedUsers = await this.userEntityService.packMany(users, me)
-			.then(users => new Map(users.map(u => [u.id, u])));
-
-		return Promise.all(memberships.map(membership => this.packRoomMembership(membership, me, { _hint_: { packedUsers } })));
-	}
-}

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

@@ -32,6 +32,7 @@ import type {
 	MiUserNotePining,
 	MiUserProfile,
 	MutingsRepository,
+	NoteUnreadsRepository,
 	RenoteMutingsRepository,
 	UserMemoRepository,
 	UserNotePiningsRepository,
@@ -47,9 +48,9 @@ import { IdService } from '@/core/IdService.js';
 import type { AnnouncementService } from '@/core/AnnouncementService.js';
 import type { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
-import { ChatService } from '@/core/ChatService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { NoteEntityService } from './NoteEntityService.js';
+import type { DriveFileEntityService } from './DriveFileEntityService.js';
 import type { PageEntityService } from './PageEntityService.js';
 
 const Ajv = _Ajv.default;
@@ -93,7 +94,6 @@ export class UserEntityService implements OnModuleInit {
 	private federatedInstanceService: FederatedInstanceService;
 	private idService: IdService;
 	private avatarDecorationService: AvatarDecorationService;
-	private chatService: ChatService;
 
 	constructor(
 		private moduleRef: ModuleRef,
@@ -128,6 +128,9 @@ export class UserEntityService implements OnModuleInit {
 		@Inject(DI.renoteMutingsRepository)
 		private renoteMutingsRepository: RenoteMutingsRepository,
 
+		@Inject(DI.noteUnreadsRepository)
+		private noteUnreadsRepository: NoteUnreadsRepository,
+
 		@Inject(DI.userNotePiningsRepository)
 		private userNotePiningsRepository: UserNotePiningsRepository,
 
@@ -149,7 +152,6 @@ export class UserEntityService implements OnModuleInit {
 		this.federatedInstanceService = this.moduleRef.get('FederatedInstanceService');
 		this.idService = this.moduleRef.get('IdService');
 		this.avatarDecorationService = this.moduleRef.get('AvatarDecorationService');
-		this.chatService = this.moduleRef.get('ChatService');
 	}
 
 	//#region Validators
@@ -556,7 +558,6 @@ export class UserEntityService implements OnModuleInit {
 				publicReactions: this.isLocalUser(user) ? profile!.publicReactions : false, // https://github.com/misskey-dev/misskey/issues/12964
 				followersVisibility: profile!.followersVisibility,
 				followingVisibility: profile!.followingVisibility,
-				chatScope: user.chatScope,
 				roles: this.roleService.getUserRoles(user.id).then(roles => roles.filter(role => role.isPublic).sort((a, b) => b.displayOrder - a.displayOrder).map(role => ({
 					id: role.id,
 					name: role.name,
@@ -597,9 +598,14 @@ export class UserEntityService implements OnModuleInit {
 				isDeleted: user.isDeleted,
 				twoFactorBackupCodesStock: profile?.twoFactorBackupSecret?.length === 5 ? 'full' : (profile?.twoFactorBackupSecret?.length ?? 0) > 0 ? 'partial' : 'none',
 				hideOnlineStatus: user.hideOnlineStatus,
-				hasUnreadSpecifiedNotes: false, // 後方互換性のため
-				hasUnreadMentions: false, // 後方互換性のため
-				hasUnreadChatMessages: this.chatService.hasUnreadMessages(user.id),
+				hasUnreadSpecifiedNotes: this.noteUnreadsRepository.count({
+					where: { userId: user.id, isSpecified: true },
+					take: 1,
+				}).then(count => count > 0),
+				hasUnreadMentions: this.noteUnreadsRepository.count({
+					where: { userId: user.id, isMentioned: true },
+					take: 1,
+				}).then(count => count > 0),
 				hasUnreadAnnouncement: unreadAnnouncements!.length > 0,
 				unreadAnnouncements,
 				hasUnreadAntenna: this.getHasUnreadAntenna(user.id),

packages/backend/src/di-symbols.ts

@@ -24,6 +24,7 @@ export const DI = {
 	noteFavoritesRepository: Symbol('noteFavoritesRepository'),
 	noteThreadMutingsRepository: Symbol('noteThreadMutingsRepository'),
 	noteReactionsRepository: Symbol('noteReactionsRepository'),
+	noteUnreadsRepository: Symbol('noteUnreadsRepository'),
 	pollsRepository: Symbol('pollsRepository'),
 	pollVotesRepository: Symbol('pollVotesRepository'),
 	userProfilesRepository: Symbol('userProfilesRepository'),
@@ -82,11 +83,6 @@ export const DI = {
 	flashsRepository: Symbol('flashsRepository'),
 	flashLikesRepository: Symbol('flashLikesRepository'),
 	userMemosRepository: Symbol('userMemosRepository'),
-	chatMessagesRepository: Symbol('chatMessagesRepository'),
-	chatApprovalsRepository: Symbol('chatApprovalsRepository'),
-	chatRoomsRepository: Symbol('chatRoomsRepository'),
-	chatRoomMembershipsRepository: Symbol('chatRoomMembershipsRepository'),
-	chatRoomInvitationsRepository: Symbol('chatRoomInvitationsRepository'),
 	bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'),
 	reversiGamesRepository: Symbol('reversiGamesRepository'),
 	//#endregion

packages/backend/src/misc/json-schema.ts

@@ -63,10 +63,6 @@ import {
 } from '@/models/json-schema/meta.js';
 import { packedSystemWebhookSchema } from '@/models/json-schema/system-webhook.js';
 import { packedAbuseReportNotificationRecipientSchema } from '@/models/json-schema/abuse-report-notification-recipient.js';
-import { packedChatMessageSchema, packedChatMessageLiteSchema } from '@/models/json-schema/chat-message.js';
-import { packedChatRoomSchema } from '@/models/json-schema/chat-room.js';
-import { packedChatRoomInvitationSchema } from '@/models/json-schema/chat-room-invitation.js';
-import { packedChatRoomMembershipSchema } from '@/models/json-schema/chat-room-membership.js';
 
 export const refs = {
 	UserLite: packedUserLiteSchema,
@@ -124,11 +120,6 @@ export const refs = {
 	MetaDetailed: packedMetaDetailedSchema,
 	SystemWebhook: packedSystemWebhookSchema,
 	AbuseReportNotificationRecipient: packedAbuseReportNotificationRecipientSchema,
-	ChatMessage: packedChatMessageSchema,
-	ChatMessageLite: packedChatMessageLiteSchema,
-	ChatRoom: packedChatRoomSchema,
-	ChatRoomInvitation: packedChatRoomInvitationSchema,
-	ChatRoomMembership: packedChatRoomMembershipSchema,
 };
 
 export type Packed<x extends keyof typeof refs> = SchemaType<typeof refs[x]>;
@@ -180,11 +171,11 @@ export interface Schema extends OfSchema {
 
 type RequiredPropertyNames<s extends Obj> = {
 	[K in keyof s]:
-	// K is not optional
-	s[K]['optional'] extends false ? K :
-	// K has default value
-	s[K]['default'] extends null | string | number | boolean | Record<string, unknown> ? K :
-	never
+		// K is not optional
+		s[K]['optional'] extends false ? K :
+		// K has default value
+		s[K]['default'] extends null | string | number | boolean | Record<string, unknown> ? K :
+		never
 }[keyof s];
 
 export type Obj = Record<string, Schema>;
@@ -223,18 +214,18 @@ type ObjectSchemaTypeDef<p extends Schema> =
 		p['anyOf'] extends ReadonlyArray<Schema> ? p['anyOf'][number]['required'] extends ReadonlyArray<keyof p['properties']> ?
 			UnionObjType<p['properties'], NonNullable<p['anyOf'][number]['required']>> & ObjType<p['properties'], NonNullable<p['required']>>
 			: never
-		: ObjType<p['properties'], NonNullable<p['required']>>
-		:
-		p['anyOf'] extends ReadonlyArray<Schema> ? never : // see CONTRIBUTING.md
-		p['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
-		p['additionalProperties'] extends true ? Record<string, any> :
-		p['additionalProperties'] extends Schema ?
-			p['additionalProperties'] extends infer AdditionalProperties ?
-				AdditionalProperties extends Schema ?
-					Record<string, SchemaType<AdditionalProperties>> :
-					never :
+			: ObjType<p['properties'], NonNullable<p['required']>>
+	:
+	p['anyOf'] extends ReadonlyArray<Schema> ? never : // see CONTRIBUTING.md
+	p['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
+	p['additionalProperties'] extends true ? Record<string, any> :
+	p['additionalProperties'] extends Schema ?
+		p['additionalProperties'] extends infer AdditionalProperties ?
+			AdditionalProperties extends Schema ?
+				Record<string, SchemaType<AdditionalProperties>> :
 				never :
-			any;
+			never :
+	any;
 
 type ObjectSchemaType<p extends Schema> = NullOrUndefined<p, ObjectSchemaTypeDef<p>>;
 
@@ -244,30 +235,30 @@ export type SchemaTypeDef<p extends Schema> =
 	p['type'] extends 'number' ? number :
 	p['type'] extends 'string' ? (
 		p['enum'] extends readonly (string | null)[] ?
-			p['enum'][number] :
-			p['format'] extends 'date-time' ? string : // Dateにする？？
-			string
+		p['enum'][number] :
+		p['format'] extends 'date-time' ? string : // Dateにする？？
+		string
 	) :
-		p['type'] extends 'boolean' ? boolean :
-		p['type'] extends 'object' ? ObjectSchemaTypeDef<p> :
-		p['type'] extends 'array' ? (
-			p['items'] extends OfSchema ? (
-				p['items']['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<NonNullable<p['items']['anyOf']>>[] :
-				p['items']['oneOf'] extends ReadonlyArray<Schema> ? ArrayUnion<UnionSchemaType<NonNullable<p['items']['oneOf']>>> :
-				p['items']['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<NonNullable<p['items']['allOf']>>>[] :
-				never
-			) :
-				p['prefixItems'] extends ReadonlyArray<Schema> ? (
-					p['items'] extends NonNullable<Schema> ? [...ArrayToTuple<p['prefixItems']>, ...SchemaType<p['items']>[]] :
-					p['items'] extends false ? ArrayToTuple<p['prefixItems']> :
-					p['unevaluatedItems'] extends false ? ArrayToTuple<p['prefixItems']> :
-					[...ArrayToTuple<p['prefixItems']>, ...unknown[]]
-				) :
-					p['items'] extends NonNullable<Schema> ? SchemaType<p['items']>[] :
-					any[]
+	p['type'] extends 'boolean' ? boolean :
+	p['type'] extends 'object' ? ObjectSchemaTypeDef<p> :
+	p['type'] extends 'array' ? (
+		p['items'] extends OfSchema ? (
+			p['items']['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<NonNullable<p['items']['anyOf']>>[] :
+			p['items']['oneOf'] extends ReadonlyArray<Schema> ? ArrayUnion<UnionSchemaType<NonNullable<p['items']['oneOf']>>> :
+			p['items']['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<NonNullable<p['items']['allOf']>>>[] :
+			never
 		) :
-			p['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['anyOf']> & PartialIntersection<UnionSchemaType<p['anyOf']>> :
-			p['oneOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['oneOf']> :
-			any;
+		p['prefixItems'] extends ReadonlyArray<Schema> ? (
+			p['items'] extends NonNullable<Schema> ? [...ArrayToTuple<p['prefixItems']>, ...SchemaType<p['items']>[]] :
+			p['items'] extends false ? ArrayToTuple<p['prefixItems']> :
+			p['unevaluatedItems'] extends false ? ArrayToTuple<p['prefixItems']> :
+			[...ArrayToTuple<p['prefixItems']>, ...unknown[]]
+		) :
+		p['items'] extends NonNullable<Schema> ? SchemaType<p['items']>[] :
+		any[]
+	) :
+	p['anyOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['anyOf']> & PartialIntersection<UnionSchemaType<p['anyOf']>> :
+	p['oneOf'] extends ReadonlyArray<Schema> ? UnionSchemaType<p['oneOf']> :
+	any;
 
 export type SchemaType<p extends Schema> = NullOrUndefined<p, SchemaTypeDef<p>>;

packages/backend/src/models/ChatApproval.ts

@@ -1,39 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { id } from './util/id.js';
-import { MiUser } from './User.js';
-
-@Entity('chat_approval')
-@Index(['userId', 'otherId'], { unique: true })
-export class MiChatApproval {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public userId: MiUser['id'];
-
-	@ManyToOne(type => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public user: MiUser | null;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public otherId: MiUser['id'];
-
-	@ManyToOne(type => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public other: MiUser | null;
-}

packages/backend/src/models/ChatMessage.ts

@@ -1,85 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { id } from './util/id.js';
-import { MiUser } from './User.js';
-import { MiDriveFile } from './DriveFile.js';
-import { MiChatRoom } from './ChatRoom.js';
-
-@Entity('chat_message')
-export class MiChatMessage {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public fromUserId: MiUser['id'];
-
-	@ManyToOne(type => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public fromUser: MiUser | null;
-
-	@Index()
-	@Column({
-		...id(), nullable: true,
-	})
-	public toUserId: MiUser['id'] | null;
-
-	@ManyToOne(type => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public toUser: MiUser | null;
-
-	@Index()
-	@Column({
-		...id(), nullable: true,
-	})
-	public toRoomId: MiChatRoom['id'] | null;
-
-	@ManyToOne(type => MiChatRoom, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public toRoom: MiChatRoom | null;
-
-	@Column('varchar', {
-		length: 4096, nullable: true,
-	})
-	public text: string | null;
-
-	@Column('varchar', {
-		length: 512, nullable: true,
-	})
-	public uri: string | null;
-
-	@Column({
-		...id(),
-		array: true, default: '{}',
-	})
-	public reads: MiUser['id'][];
-
-	@Column({
-		...id(),
-		nullable: true,
-	})
-	public fileId: MiDriveFile['id'] | null;
-
-	@ManyToOne(type => MiDriveFile, {
-		onDelete: 'SET NULL',
-	})
-	@JoinColumn()
-	public file: MiDriveFile | null;
-
-	@Column('varchar', {
-		length: 1024, array: true, default: '{}',
-	})
-	public reactions: string[];
-}

packages/backend/src/models/ChatRoom.ts

@@ -1,31 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { id } from './util/id.js';
-import { MiUser } from './User.js';
-
-@Entity('chat_room')
-export class MiChatRoom {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Column('varchar', {
-		length: 256,
-	})
-	public name: string;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public ownerId: MiUser['id'];
-
-	@ManyToOne(type => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public owner: MiUser | null;
-}

packages/backend/src/models/ChatRoomInvitation.ts

@@ -1,45 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { id } from './util/id.js';
-import { MiUser } from './User.js';
-import { MiChatRoom } from './ChatRoom.js';
-
-@Entity('chat_room_invitation')
-@Index(['userId', 'roomId'], { unique: true })
-export class MiChatRoomInvitation {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public userId: MiUser['id'];
-
-	@ManyToOne(type => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public user: MiUser | null;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public roomId: MiChatRoom['id'];
-
-	@ManyToOne(type => MiChatRoom, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public room: MiChatRoom | null;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public ignored: boolean;
-}

packages/backend/src/models/ChatRoomMembership.ts

@@ -1,40 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { id } from './util/id.js';
-import { MiUser } from './User.js';
-import { MiChatRoom } from './ChatRoom.js';
-
-@Entity('chat_room_membership')
-@Index(['userId', 'roomId'], { unique: true })
-export class MiChatRoomMembership {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public userId: MiUser['id'];
-
-	@ManyToOne(type => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public user: MiUser | null;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public roomId: MiChatRoom['id'];
-
-	@ManyToOne(type => MiChatRoom, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public room: MiChatRoom | null;
-}

packages/backend/src/models/NoteUnread.ts

@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from './util/id.js';
+import { MiUser } from './User.js';
+import { MiNote } from './Note.js';
+import type { MiChannel } from './Channel.js';
+
+@Entity('note_unread')
+@Index(['userId', 'noteId'], { unique: true })
+export class MiNoteUnread {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column(id())
+	public userId: MiUser['id'];
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user: MiUser | null;
+
+	@Index()
+	@Column(id())
+	public noteId: MiNote['id'];
+
+	@ManyToOne(type => MiNote, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public note: MiNote | null;
+
+	/**
+	 * メンションか否か
+	 */
+	@Index()
+	@Column('boolean')
+	public isMentioned: boolean;
+
+	/**
+	 * ダイレクト投稿か否か
+	 */
+	@Index()
+	@Column('boolean')
+	public isSpecified: boolean;
+
+	//#region Denormalized fields
+	@Index()
+	@Column({
+		...id(),
+		comment: '[Denormalized]',
+	})
+	public noteUserId: MiUser['id'];
+
+	@Index()
+	@Column({
+		...id(),
+		nullable: true,
+		comment: '[Denormalized]',
+	})
+	public noteChannelId: MiChannel['id'] | null;
+	//#endregion
+}

packages/backend/src/models/RepositoryModule.ts

@@ -42,6 +42,7 @@ import {
 	MiNoteFavorite,
 	MiNoteReaction,
 	MiNoteThreadMuting,
+	MiNoteUnread,
 	MiPage,
 	MiPageLike,
 	MiPasswordResetRequest,
@@ -77,11 +78,6 @@ import {
 	MiUserPublickey,
 	MiUserSecurityKey,
 	MiWebhook,
-	MiChatMessage,
-	MiChatRoom,
-	MiChatRoomMembership,
-	MiChatRoomInvitation,
-	MiChatApproval,
 } from './_.js';
 import type { Provider } from '@nestjs/common';
 import type { DataSource } from 'typeorm';
@@ -140,6 +136,12 @@ const $noteReactionsRepository: Provider = {
 	inject: [DI.db],
 };
 
+const $noteUnreadsRepository: Provider = {
+	provide: DI.noteUnreadsRepository,
+	useFactory: (db: DataSource) => db.getRepository(MiNoteUnread).extend(miRepository as MiRepository<MiNoteUnread>),
+	inject: [DI.db],
+};
+
 const $pollsRepository: Provider = {
 	provide: DI.pollsRepository,
 	useFactory: (db: DataSource) => db.getRepository(MiPoll).extend(miRepository as MiRepository<MiPoll>),
@@ -286,7 +288,7 @@ const $swSubscriptionsRepository: Provider = {
 
 const $systemAccountsRepository: Provider = {
 	provide: DI.systemAccountsRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiSystemAccount).extend(miRepository as MiRepository<MiSystemAccount>),
+	useFactory: (db: DataSource) => db.getRepository(MiSystemAccount),
 	inject: [DI.db],
 };
 
@@ -304,7 +306,7 @@ const $abuseUserReportsRepository: Provider = {
 
 const $abuseReportNotificationRecipientRepository: Provider = {
 	provide: DI.abuseReportNotificationRecipientRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiAbuseReportNotificationRecipient).extend(miRepository as MiRepository<MiAbuseReportNotificationRecipient>),
+	useFactory: (db: DataSource) => db.getRepository(MiAbuseReportNotificationRecipient),
 	inject: [DI.db],
 };
 
@@ -436,7 +438,7 @@ const $webhooksRepository: Provider = {
 
 const $systemWebhooksRepository: Provider = {
 	provide: DI.systemWebhooksRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiSystemWebhook).extend(miRepository as MiRepository<MiSystemWebhook>),
+	useFactory: (db: DataSource) => db.getRepository(MiSystemWebhook),
 	inject: [DI.db],
 };
 
@@ -488,36 +490,6 @@ const $userMemosRepository: Provider = {
 	inject: [DI.db],
 };
 
-const $chatMessagesRepository: Provider = {
-	provide: DI.chatMessagesRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiChatMessage).extend(miRepository as MiRepository<MiChatMessage>),
-	inject: [DI.db],
-};
-
-const $chatRoomsRepository: Provider = {
-	provide: DI.chatRoomsRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiChatRoom).extend(miRepository as MiRepository<MiChatRoom>),
-	inject: [DI.db],
-};
-
-const $chatRoomMembershipsRepository: Provider = {
-	provide: DI.chatRoomMembershipsRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiChatRoomMembership).extend(miRepository as MiRepository<MiChatRoomMembership>),
-	inject: [DI.db],
-};
-
-const $chatRoomInvitationsRepository: Provider = {
-	provide: DI.chatRoomInvitationsRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiChatRoomInvitation).extend(miRepository as MiRepository<MiChatRoomInvitation>),
-	inject: [DI.db],
-};
-
-const $chatApprovalsRepository: Provider = {
-	provide: DI.chatApprovalsRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiChatApproval).extend(miRepository as MiRepository<MiChatApproval>),
-	inject: [DI.db],
-};
-
 const $bubbleGameRecordsRepository: Provider = {
 	provide: DI.bubbleGameRecordsRepository,
 	useFactory: (db: DataSource) => db.getRepository(MiBubbleGameRecord).extend(miRepository as MiRepository<MiBubbleGameRecord>),
@@ -542,6 +514,7 @@ const $reversiGamesRepository: Provider = {
 		$noteFavoritesRepository,
 		$noteThreadMutingsRepository,
 		$noteReactionsRepository,
+		$noteUnreadsRepository,
 		$pollsRepository,
 		$pollVotesRepository,
 		$userProfilesRepository,
@@ -600,11 +573,6 @@ const $reversiGamesRepository: Provider = {
 		$flashsRepository,
 		$flashLikesRepository,
 		$userMemosRepository,
-		$chatMessagesRepository,
-		$chatRoomsRepository,
-		$chatRoomMembershipsRepository,
-		$chatRoomInvitationsRepository,
-		$chatApprovalsRepository,
 		$bubbleGameRecordsRepository,
 		$reversiGamesRepository,
 	],
@@ -618,6 +586,7 @@ const $reversiGamesRepository: Provider = {
 		$noteFavoritesRepository,
 		$noteThreadMutingsRepository,
 		$noteReactionsRepository,
+		$noteUnreadsRepository,
 		$pollsRepository,
 		$pollVotesRepository,
 		$userProfilesRepository,
@@ -676,11 +645,6 @@ const $reversiGamesRepository: Provider = {
 		$flashsRepository,
 		$flashLikesRepository,
 		$userMemosRepository,
-		$chatMessagesRepository,
-		$chatRoomsRepository,
-		$chatRoomMembershipsRepository,
-		$chatRoomInvitationsRepository,
-		$chatApprovalsRepository,
 		$bubbleGameRecordsRepository,
 		$reversiGamesRepository,
 	],

packages/backend/src/models/User.ts

@@ -225,17 +225,6 @@ export class MiUser {
 	})
 	public emojis: string[];
 
-	// チャットを許可する相手
-	// everyone: 誰からでも
-	// followers: フォロワーのみ
-	// following: フォローしているユーザーのみ
-	// mutual: 相互フォローのみ
-	// none: 誰からも受け付けない
-	@Column('varchar', {
-		length: 128, default: 'mutual',
-	})
-	public chatScope: 'everyone' | 'followers' | 'following' | 'mutual' | 'none';
-
 	@Index()
 	@Column('varchar', {
 		length: 128, nullable: true,

packages/backend/src/models/_.ts

@@ -3,10 +3,13 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { FindOneOptions, InsertQueryBuilder, ObjectLiteral, Repository, SelectQueryBuilder } from 'typeorm';
+import { FindOneOptions, InsertQueryBuilder, ObjectLiteral, Repository, SelectQueryBuilder, TypeORMError } from 'typeorm';
+import { DriverUtils } from 'typeorm/driver/DriverUtils.js';
 import { RelationCountLoader } from 'typeorm/query-builder/relation-count/RelationCountLoader.js';
 import { RelationIdLoader } from 'typeorm/query-builder/relation-id/RelationIdLoader.js';
 import { RawSqlResultsToEntityTransformer } from 'typeorm/query-builder/transformer/RawSqlResultsToEntityTransformer.js';
+import { ObjectUtils } from 'typeorm/util/ObjectUtils.js';
+import { OrmUtils } from 'typeorm/util/OrmUtils.js';
 import { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
 import { MiAbuseReportNotificationRecipient } from '@/models/AbuseReportNotificationRecipient.js';
 import { MiAccessToken } from '@/models/AccessToken.js';
@@ -40,6 +43,7 @@ import { MiNote } from '@/models/Note.js';
 import { MiNoteFavorite } from '@/models/NoteFavorite.js';
 import { MiNoteReaction } from '@/models/NoteReaction.js';
 import { MiNoteThreadMuting } from '@/models/NoteThreadMuting.js';
+import { MiNoteUnread } from '@/models/NoteUnread.js';
 import { MiPage } from '@/models/Page.js';
 import { MiPageLike } from '@/models/PageLike.js';
 import { MiPasswordResetRequest } from '@/models/PasswordResetRequest.js';
@@ -74,11 +78,6 @@ import { MiRoleAssignment } from '@/models/RoleAssignment.js';
 import { MiFlash } from '@/models/Flash.js';
 import { MiFlashLike } from '@/models/FlashLike.js';
 import { MiUserListFavorite } from '@/models/UserListFavorite.js';
-import { MiChatMessage } from '@/models/ChatMessage.js';
-import { MiChatRoom } from '@/models/ChatRoom.js';
-import { MiChatRoomMembership } from '@/models/ChatRoomMembership.js';
-import { MiChatRoomInvitation } from '@/models/ChatRoomInvitation.js';
-import { MiChatApproval } from '@/models/ChatApproval.js';
 import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
 import { MiReversiGame } from '@/models/ReversiGame.js';
 import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js';
@@ -160,6 +159,7 @@ export {
 	MiNoteFavorite,
 	MiNoteReaction,
 	MiNoteThreadMuting,
+	MiNoteUnread,
 	MiPage,
 	MiPageLike,
 	MiPasswordResetRequest,
@@ -194,11 +194,6 @@ export {
 	MiFlash,
 	MiFlashLike,
 	MiUserMemo,
-	MiChatMessage,
-	MiChatRoom,
-	MiChatRoomMembership,
-	MiChatRoomInvitation,
-	MiChatApproval,
 	MiBubbleGameRecord,
 	MiReversiGame,
 };
@@ -236,6 +231,7 @@ export type NotesRepository = Repository<MiNote> & MiRepository<MiNote>;
 export type NoteFavoritesRepository = Repository<MiNoteFavorite> & MiRepository<MiNoteFavorite>;
 export type NoteReactionsRepository = Repository<MiNoteReaction> & MiRepository<MiNoteReaction>;
 export type NoteThreadMutingsRepository = Repository<MiNoteThreadMuting> & MiRepository<MiNoteThreadMuting>;
+export type NoteUnreadsRepository = Repository<MiNoteUnread> & MiRepository<MiNoteUnread>;
 export type PagesRepository = Repository<MiPage> & MiRepository<MiPage>;
 export type PageLikesRepository = Repository<MiPageLike> & MiRepository<MiPageLike>;
 export type PasswordResetRequestsRepository = Repository<MiPasswordResetRequest> & MiRepository<MiPasswordResetRequest>;
@@ -270,10 +266,5 @@ export type RoleAssignmentsRepository = Repository<MiRoleAssignment> & MiReposit
 export type FlashsRepository = Repository<MiFlash> & MiRepository<MiFlash>;
 export type FlashLikesRepository = Repository<MiFlashLike> & MiRepository<MiFlashLike>;
 export type UserMemoRepository = Repository<MiUserMemo> & MiRepository<MiUserMemo>;
-export type ChatMessagesRepository = Repository<MiChatMessage> & MiRepository<MiChatMessage>;
-export type ChatRoomsRepository = Repository<MiChatRoom> & MiRepository<MiChatRoom>;
-export type ChatRoomMembershipsRepository = Repository<MiChatRoomMembership> & MiRepository<MiChatRoomMembership>;
-export type ChatRoomInvitationsRepository = Repository<MiChatRoomInvitation> & MiRepository<MiChatRoomInvitation>;
-export type ChatApprovalsRepository = Repository<MiChatApproval> & MiRepository<MiChatApproval>;
 export type BubbleGameRecordsRepository = Repository<MiBubbleGameRecord> & MiRepository<MiBubbleGameRecord>;
 export type ReversiGamesRepository = Repository<MiReversiGame> & MiRepository<MiReversiGame>;

packages/backend/src/models/json-schema/chat-message.ts

@@ -1,103 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export const packedChatMessageSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		createdAt: {
-			type: 'string',
-			format: 'date-time',
-			optional: false, nullable: false,
-		},
-		fromUserId: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		fromUser: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'UserLite',
-		},
-		toUserId: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		toUser: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'UserLite',
-		},
-		toRoomId: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		toRoom: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'ChatRoom',
-		},
-		text: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		fileId: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		file: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'DriveFile',
-		},
-		isRead: {
-			type: 'boolean',
-			optional: true, nullable: false,
-		},
-	},
-} as const;
-
-export const packedChatMessageLiteSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		createdAt: {
-			type: 'string',
-			format: 'date-time',
-			optional: false, nullable: false,
-		},
-		fromUserId: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		toUserId: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		toRoomId: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		text: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		fileId: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
-		file: {
-			type: 'object',
-			optional: true, nullable: true,
-			ref: 'DriveFile',
-		},
-	},
-} as const;

packages/backend/src/models/json-schema/chat-room-invitation.ts

@@ -1,37 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export const packedChatRoomInvitationSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		createdAt: {
-			type: 'string',
-			format: 'date-time',
-			optional: false, nullable: false,
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		user: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'UserLite',
-		},
-		roomId: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		room: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'ChatRoom',
-		},
-	},
-} as const;

packages/backend/src/models/json-schema/chat-room-membership.ts

@@ -1,28 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export const packedChatRoomMembershipSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		createdAt: {
-			type: 'string',
-			format: 'date-time',
-			optional: false, nullable: false,
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		user: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'UserLite',
-		},
-	},
-} as const;

packages/backend/src/models/json-schema/chat-room.ts

@@ -1,32 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export const packedChatRoomSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		createdAt: {
-			type: 'string',
-			format: 'date-time',
-			optional: false, nullable: false,
-		},
-		ownerId: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		owner: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'UserLite',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

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

@@ -292,10 +292,6 @@ export const packedRolePoliciesSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
-		canChat: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
 	},
 } as const;
 

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

@@ -358,11 +358,6 @@ export const packedUserDetailedNotMeOnlySchema = {
 			nullable: false, optional: false,
 			enum: ['public', 'followers', 'private'],
 		},
-		chatScope: {
-			type: 'string',
-			nullable: false, optional: false,
-			enum: ['everyone', 'following', 'followers', 'mutual', 'none'],
-		},
 		roles: {
 			type: 'array',
 			nullable: false, optional: false,
@@ -545,10 +540,6 @@ export const packedMeDetailedOnlySchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
-		hasUnreadChatMessages: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
 		hasUnreadNotification: {
 			type: 'boolean',
 			nullable: false, optional: false,

packages/backend/src/postgres.ts

@@ -8,9 +8,6 @@ import pg from 'pg';
 import { DataSource, Logger } from 'typeorm';
 import * as highlight from 'cli-highlight';
 import { entities as charts } from '@/core/chart/entities.js';
-import { Config } from '@/config.js';
-import MisskeyLogger from '@/logger.js';
-import { bindThis } from '@/decorators.js';
 
 import { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
 import { MiAbuseReportNotificationRecipient } from '@/models/AbuseReportNotificationRecipient.js';
@@ -45,6 +42,7 @@ import { MiNote } from '@/models/Note.js';
 import { MiNoteFavorite } from '@/models/NoteFavorite.js';
 import { MiNoteReaction } from '@/models/NoteReaction.js';
 import { MiNoteThreadMuting } from '@/models/NoteThreadMuting.js';
+import { MiNoteUnread } from '@/models/NoteUnread.js';
 import { MiPage } from '@/models/Page.js';
 import { MiPageLike } from '@/models/PageLike.js';
 import { MiPasswordResetRequest } from '@/models/PasswordResetRequest.js';
@@ -78,14 +76,13 @@ import { MiRoleAssignment } from '@/models/RoleAssignment.js';
 import { MiFlash } from '@/models/Flash.js';
 import { MiFlashLike } from '@/models/FlashLike.js';
 import { MiUserMemo } from '@/models/UserMemo.js';
-import { MiChatMessage } from '@/models/ChatMessage.js';
-import { MiChatRoom } from '@/models/ChatRoom.js';
-import { MiChatRoomMembership } from '@/models/ChatRoomMembership.js';
-import { MiChatRoomInvitation } from '@/models/ChatRoomInvitation.js';
 import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
 import { MiReversiGame } from '@/models/ReversiGame.js';
-import { MiChatApproval } from '@/models/ChatApproval.js';
-import { MiSystemAccount } from '@/models/SystemAccount.js';
+
+import { Config } from '@/config.js';
+import MisskeyLogger from '@/logger.js';
+import { bindThis } from '@/decorators.js';
+import { MiSystemAccount } from './models/SystemAccount.js';
 
 pg.types.setTypeParser(20, Number);
 
@@ -198,6 +195,7 @@ export const entities = [
 	MiNoteFavorite,
 	MiNoteReaction,
 	MiNoteThreadMuting,
+	MiNoteUnread,
 	MiPage,
 	MiPageLike,
 	MiGalleryPost,
@@ -238,11 +236,6 @@ export const entities = [
 	MiFlash,
 	MiFlashLike,
 	MiUserMemo,
-	MiChatMessage,
-	MiChatRoom,
-	MiChatRoomMembership,
-	MiChatRoomInvitation,
-	MiChatApproval,
 	MiBubbleGameRecord,
 	MiReversiGame,
 	...charts,

packages/backend/src/server/ServerModule.ts

@@ -44,8 +44,6 @@ import { QueueStatsChannelService } from './api/stream/channels/queue-stats.js';
 import { ServerStatsChannelService } from './api/stream/channels/server-stats.js';
 import { UserListChannelService } from './api/stream/channels/user-list.js';
 import { RoleTimelineChannelService } from './api/stream/channels/role-timeline.js';
-import { ChatUserChannelService } from './api/stream/channels/chat-user.js';
-import { ChatRoomChannelService } from './api/stream/channels/chat-room.js';
 import { ReversiChannelService } from './api/stream/channels/reversi.js';
 import { ReversiGameChannelService } from './api/stream/channels/reversi-game.js';
 import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.js';
@@ -86,8 +84,6 @@ import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.j
 		GlobalTimelineChannelService,
 		HashtagChannelService,
 		RoleTimelineChannelService,
-		ChatUserChannelService,
-		ChatRoomChannelService,
 		ReversiChannelService,
 		ReversiGameChannelService,
 		HomeTimelineChannelService,

packages/backend/src/server/api/StreamingApiServerService.ts

@@ -9,6 +9,7 @@ import * as Redis from 'ioredis';
 import * as WebSocket from 'ws';
 import { DI } from '@/di-symbols.js';
 import type { UsersRepository, MiAccessToken } from '@/models/_.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
 import { NotificationService } from '@/core/NotificationService.js';
 import { bindThis } from '@/decorators.js';
 import { CacheService } from '@/core/CacheService.js';
@@ -34,6 +35,7 @@ export class StreamingApiServerService {
 		private usersRepository: UsersRepository,
 
 		private cacheService: CacheService,
+		private noteReadService: NoteReadService,
 		private authenticateService: AuthenticateService,
 		private channelsService: ChannelsService,
 		private notificationService: NotificationService,
@@ -94,6 +96,7 @@ export class StreamingApiServerService {
 
 			const stream = new MainStreamConnection(
 				this.channelsService,
+				this.noteReadService,
 				this.notificationService,
 				this.cacheService,
 				this.channelFollowingService,

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

@@ -263,6 +263,7 @@ export * as 'i/notifications-grouped' from './endpoints/i/notifications-grouped.
 export * as 'i/page-likes' from './endpoints/i/page-likes.js';
 export * as 'i/pages' from './endpoints/i/pages.js';
 export * as 'i/pin' from './endpoints/i/pin.js';
+export * as 'i/read-all-unread-notes' from './endpoints/i/read-all-unread-notes.js';
 export * as 'i/read-announcement' from './endpoints/i/read-announcement.js';
 export * as 'i/regenerate-token' from './endpoints/i/regenerate-token.js';
 export * as 'i/registry/get' from './endpoints/i/registry/get.js';
@@ -396,22 +397,4 @@ export * as 'users/search' from './endpoints/users/search.js';
 export * as 'users/search-by-username-and-host' from './endpoints/users/search-by-username-and-host.js';
 export * as 'users/show' from './endpoints/users/show.js';
 export * as 'users/update-memo' from './endpoints/users/update-memo.js';
-export * as 'chat/messages/create-to-user' from './endpoints/chat/messages/create-to-user.js';
-export * as 'chat/messages/create-to-room' from './endpoints/chat/messages/create-to-room.js';
-export * as 'chat/messages/delete' from './endpoints/chat/messages/delete.js';
-export * as 'chat/messages/show' from './endpoints/chat/messages/show.js';
-export * as 'chat/messages/user-timeline' from './endpoints/chat/messages/user-timeline.js';
-export * as 'chat/messages/room-timeline' from './endpoints/chat/messages/room-timeline.js';
-export * as 'chat/rooms/create' from './endpoints/chat/rooms/create.js';
-export * as 'chat/rooms/delete' from './endpoints/chat/rooms/delete.js';
-export * as 'chat/rooms/join' from './endpoints/chat/rooms/join.js';
-export * as 'chat/rooms/leave' from './endpoints/chat/rooms/leave.js';
-export * as 'chat/rooms/show' from './endpoints/chat/rooms/show.js';
-export * as 'chat/rooms/owned' from './endpoints/chat/rooms/owned.js';
-export * as 'chat/rooms/update' from './endpoints/chat/rooms/update.js';
-export * as 'chat/rooms/members' from './endpoints/chat/rooms/members.js';
-export * as 'chat/rooms/invitations/create' from './endpoints/chat/rooms/invitations/create.js';
-export * as 'chat/rooms/invitations/ignore' from './endpoints/chat/rooms/invitations/ignore.js';
-export * as 'chat/rooms/invitations/inbox' from './endpoints/chat/rooms/invitations/inbox.js';
-export * as 'chat/history' from './endpoints/chat/history.js';
 export * as 'v2/admin/emoji/list' from './endpoints/v2/admin/emoji/list.js';

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

@@ -8,6 +8,7 @@ import * as Redis from 'ioredis';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { NotesRepository, AntennasRepository } from '@/models/_.js';
 import { QueryService } from '@/core/QueryService.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
 import { DI } from '@/di-symbols.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { IdService } from '@/core/IdService.js';
@@ -58,6 +59,9 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
@@ -67,6 +71,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private idService: IdService,
 		private noteEntityService: NoteEntityService,
 		private queryService: QueryService,
+		private noteReadService: NoteReadService,
 		private fanoutTimelineService: FanoutTimelineService,
 		private globalEventService: GlobalEventService,
 	) {
@@ -119,6 +124,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				notes.sort((a, b) => a.id > b.id ? -1 : 1);
 			}
 
+			this.noteReadService.read(me.id, notes);
+
 			return await this.noteEntityService.packMany(notes, me);
 		});
 	}

packages/backend/src/server/api/endpoints/chat/history.ts

@@ -1,73 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'read:chat',
-
-	res: {
-		type: 'array',
-		optional: false, nullable: false,
-		items: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'ChatMessage',
-		},
-	},
-
-	errors: {
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
-		room: { type: 'boolean', default: false },
-	},
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatEntityService: ChatEntityService,
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const history = ps.room ? await this.chatService.roomHistory(me.id, ps.limit) : await this.chatService.userHistory(me.id, ps.limit);
-
-			const packedMessages = await this.chatEntityService.packMessagesDetailed(history, me);
-
-			if (ps.room) {
-				const roomIds = history.map(m => m.toRoomId!);
-				const readStateMap = await this.chatService.getRoomReadStateMap(me.id, roomIds);
-
-				for (const message of packedMessages) {
-					message.isRead = readStateMap[message.toRoomId!] ?? false;
-				}
-			} else {
-				const otherIds = history.map(m => m.fromUserId === me.id ? m.toUserId! : m.fromUserId!);
-				const readStateMap = await this.chatService.getUserReadStateMap(me.id, otherIds);
-
-				for (const message of packedMessages) {
-					const otherId = message.fromUserId === me.id ? message.toUserId! : message.fromUserId!;
-					message.isRead = readStateMap[otherId] ?? false;
-				}
-			}
-
-			return packedMessages;
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/messages/create-to-room.ts

@@ -1,105 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import ms from 'ms';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { GetterService } from '@/server/api/GetterService.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '@/server/api/error.js';
-import { ChatService } from '@/core/ChatService.js';
-import type { DriveFilesRepository, MiUser } from '@/models/_.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-	requiredRolePolicy: 'canChat',
-
-	prohibitMoved: true,
-
-	kind: 'write:chat',
-
-	limit: {
-		duration: ms('1hour'),
-		max: 500,
-	},
-
-	res: {
-		type: 'object',
-		optional: false, nullable: false,
-		ref: 'ChatMessageLite',
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: '8098520d-2da5-4e8f-8ee1-df78b55a4ec6',
-		},
-
-		noSuchFile: {
-			message: 'No such file.',
-			code: 'NO_SUCH_FILE',
-			id: 'b6accbd3-1d7b-4d9f-bdb7-eb185bac06db',
-		},
-
-		contentRequired: {
-			message: 'Content required. You need to set text or fileId.',
-			code: 'CONTENT_REQUIRED',
-			id: '340517b7-6d04-42c0-bac1-37ee804e3594',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		text: { type: 'string', nullable: true, maxLength: 2000 },
-		fileId: { type: 'string', format: 'misskey:id' },
-		toRoomId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['toRoomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		@Inject(DI.driveFilesRepository)
-		private driveFilesRepository: DriveFilesRepository,
-
-		private getterService: GetterService,
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.findRoomById(ps.toRoomId);
-			if (room == null) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-
-			let file = null;
-			if (ps.fileId != null) {
-				file = await this.driveFilesRepository.findOneBy({
-					id: ps.fileId,
-					userId: me.id,
-				});
-
-				if (file == null) {
-					throw new ApiError(meta.errors.noSuchFile);
-				}
-			}
-
-			// テキストが無いかつ添付ファイルも無かったらエラー
-			if (ps.text == null && file == null) {
-				throw new ApiError(meta.errors.contentRequired);
-			}
-
-			return await this.chatService.createMessageToRoom(me, room, {
-				text: ps.text,
-				file: file,
-			});
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/messages/create-to-user.ts

@@ -1,122 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import ms from 'ms';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { GetterService } from '@/server/api/GetterService.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '@/server/api/error.js';
-import { ChatService } from '@/core/ChatService.js';
-import type { DriveFilesRepository, MiUser } from '@/models/_.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-	requiredRolePolicy: 'canChat',
-
-	prohibitMoved: true,
-
-	kind: 'write:chat',
-
-	limit: {
-		duration: ms('1hour'),
-		max: 500,
-	},
-
-	res: {
-		type: 'object',
-		optional: false, nullable: false,
-		ref: 'ChatMessageLite',
-	},
-
-	errors: {
-		recipientIsYourself: {
-			message: 'You can not send a message to yourself.',
-			code: 'RECIPIENT_IS_YOURSELF',
-			id: '17e2ba79-e22a-4cbc-bf91-d327643f4a7e',
-		},
-
-		noSuchUser: {
-			message: 'No such user.',
-			code: 'NO_SUCH_USER',
-			id: '11795c64-40ea-4198-b06e-3c873ed9039d',
-		},
-
-		noSuchFile: {
-			message: 'No such file.',
-			code: 'NO_SUCH_FILE',
-			id: '4372b8e2-185d-4146-8749-2f68864a3e5f',
-		},
-
-		contentRequired: {
-			message: 'Content required. You need to set text or fileId.',
-			code: 'CONTENT_REQUIRED',
-			id: '25587321-b0e6-449c-9239-f8925092942c',
-		},
-
-		youHaveBeenBlocked: {
-			message: 'You cannot send a message because you have been blocked by this user.',
-			code: 'YOU_HAVE_BEEN_BLOCKED',
-			id: 'c15a5199-7422-4968-941a-2a462c478f7d',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		text: { type: 'string', nullable: true, maxLength: 2000 },
-		fileId: { type: 'string', format: 'misskey:id' },
-		toUserId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['toUserId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		@Inject(DI.driveFilesRepository)
-		private driveFilesRepository: DriveFilesRepository,
-
-		private getterService: GetterService,
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			let file = null;
-			if (ps.fileId != null) {
-				file = await this.driveFilesRepository.findOneBy({
-					id: ps.fileId,
-					userId: me.id,
-				});
-
-				if (file == null) {
-					throw new ApiError(meta.errors.noSuchFile);
-				}
-			}
-
-			// テキストが無いかつ添付ファイルも無かったらエラー
-			if (ps.text == null && file == null) {
-				throw new ApiError(meta.errors.contentRequired);
-			}
-
-			// Myself
-			if (ps.toUserId === me.id) {
-				throw new ApiError(meta.errors.recipientIsYourself);
-			}
-
-			const toUser = await this.getterService.getUser(ps.toUserId).catch(err => {
-				if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
-				throw err;
-			});
-
-			return await this.chatService.createMessageToUser(me, toUser, {
-				text: ps.text,
-				file: file,
-			});
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/messages/delete.ts

@@ -1,52 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'write:chat',
-
-	res: {
-	},
-
-	errors: {
-		noSuchMessage: {
-			message: 'No such message.',
-			code: 'NO_SUCH_MESSAGE',
-			id: '36b67f0e-66a6-414b-83df-992a55294f17',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		messageId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['messageId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const message = await this.chatService.findMyMessageById(me.id, ps.messageId);
-			if (message == null) {
-				throw new ApiError(meta.errors.noSuchMessage);
-			}
-			await this.chatService.deleteMessage(message);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts

@@ -1,73 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'read:chat',
-
-	res: {
-		type: 'array',
-		optional: false, nullable: false,
-		items: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'ChatMessageLite',
-		},
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: 'c4d9f88c-9270-4632-b032-6ed8cee36f7f',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
-		sinceId: { type: 'string', format: 'misskey:id' },
-		untilId: { type: 'string', format: 'misskey:id' },
-		roomId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatEntityService: ChatEntityService,
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.findRoomById(ps.roomId);
-			if (room == null) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-
-			if (!(await this.chatService.isRoomMember(room.id, me.id)) && room.ownerId !== me.id) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-
-			const messages = await this.chatService.roomTimeline(room.id, ps.limit, ps.sinceId, ps.untilId);
-
-			this.chatService.readRoomChatMessage(me.id, room.id);
-
-			return await this.chatEntityService.packMessagesLiteForRoom(messages);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/messages/show.ts

@@ -1,63 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { GetterService } from '@/server/api/GetterService.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-import { ApiError } from '@/server/api/error.js';
-import { RoleService } from '@/core/RoleService.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'read:chat',
-
-	res: {
-		type: 'object',
-		optional: false, nullable: false,
-		ref: 'ChatMessage',
-	},
-
-	errors: {
-		noSuchMessage: {
-			message: 'No such message.',
-			code: 'NO_SUCH_MESSAGE',
-			id: '3710865b-1848-4da9-8d61-cfed15510b93',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		messageId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['messageId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-		private roleService: RoleService,
-		private chatEntityService: ChatEntityService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const message = await this.chatService.findMessageById(ps.messageId);
-			if (message == null) {
-				throw new ApiError(meta.errors.noSuchMessage);
-			}
-			if (message.fromUserId !== me.id && message.toUserId !== me.id && !(await this.roleService.isModerator(me))) {
-				throw new ApiError(meta.errors.noSuchMessage);
-			}
-			return this.chatEntityService.packMessageDetailed(message, me);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/messages/user-timeline.ts

@@ -1,71 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { GetterService } from '@/server/api/GetterService.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'read:chat',
-
-	res: {
-		type: 'array',
-		optional: false, nullable: false,
-		items: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'ChatMessageLite',
-		},
-	},
-
-	errors: {
-		noSuchUser: {
-			message: 'No such user.',
-			code: 'NO_SUCH_USER',
-			id: '11795c64-40ea-4198-b06e-3c873ed9039d',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
-		sinceId: { type: 'string', format: 'misskey:id' },
-		untilId: { type: 'string', format: 'misskey:id' },
-		userId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['userId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatEntityService: ChatEntityService,
-		private chatService: ChatService,
-		private getterService: GetterService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const other = await this.getterService.getUser(ps.userId).catch(err => {
-				if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
-				throw err;
-			});
-
-			const messages = await this.chatService.userTimeline(me.id, other.id, ps.limit, ps.sinceId, ps.untilId);
-
-			this.chatService.readUserChatMessage(me.id, other.id);
-
-			return await this.chatEntityService.packMessagesLite(messages);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/create.ts

@@ -1,58 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import ms from 'ms';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '@/server/api/error.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-	requiredRolePolicy: 'canChat',
-
-	prohibitMoved: true,
-
-	kind: 'write:chat',
-
-	limit: {
-		duration: ms('1day'),
-		max: 10,
-	},
-
-	res: {
-		type: 'object',
-		optional: false, nullable: false,
-		ref: 'ChatRoom',
-	},
-
-	errors: {
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		name: { type: 'string', maxLength: 256 },
-	},
-	required: ['name'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-		private chatEntityService: ChatEntityService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.createRoom(me, ps.name);
-			return await this.chatEntityService.packRoom(room);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/delete.ts

@@ -1,52 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'write:chat',
-
-	res: {
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: 'd4e3753d-97bf-4a19-ab8e-21080fbc0f4b',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.findMyRoomById(me.id, ps.roomId);
-			if (room == null) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-			await this.chatService.deleteRoom(room);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/invitations/create.ts

@@ -1,68 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import ms from 'ms';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '@/server/api/error.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-	requiredRolePolicy: 'canChat',
-
-	prohibitMoved: true,
-
-	kind: 'write:chat',
-
-	limit: {
-		duration: ms('1day'),
-		max: 50,
-	},
-
-	res: {
-		type: 'object',
-		optional: false, nullable: false,
-		ref: 'ChatRoomInvitation',
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: '916f9507-49ba-4e90-b57f-1fd4deaa47a5',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-		userId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId', 'userId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-		private chatEntityService: ChatEntityService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.findMyRoomById(me.id, ps.roomId);
-			if (room == null) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-			const invitation = await this.chatService.createRoomInvitation(me.id, room.id, ps.userId);
-			return await this.chatEntityService.packRoomInvitation(invitation, me);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/invitations/ignore.ts

@@ -1,48 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'write:chat',
-
-	res: {
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: '5130557e-5a11-4cfb-9cc5-fe60cda5de0d',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			await this.chatService.ignoreRoomInvitation(me.id, ps.roomId);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/invitations/inbox.ts

@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'read:chat',
-
-	res: {
-		type: 'array',
-		optional: false, nullable: false,
-		items: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'ChatRoomInvitation',
-		},
-	},
-
-	errors: {
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
-		sinceId: { type: 'string', format: 'misskey:id' },
-		untilId: { type: 'string', format: 'misskey:id' },
-	},
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatEntityService: ChatEntityService,
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const invitations = await this.chatService.getReceivedRoomInvitationsWithPagination(me.id, ps.limit, ps.sinceId, ps.untilId);
-			return this.chatEntityService.packRoomInvitations(invitations, me);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/join.ts

@@ -1,48 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'write:chat',
-
-	res: {
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: '84416476-5ce8-4a2c-b568-9569f1b10733',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			await this.chatService.joinToRoom(me.id, ps.roomId);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/leave.ts

@@ -1,48 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'write:chat',
-
-	res: {
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: 'cb7f3179-50e8-4389-8c30-dbe2650a67c9',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			await this.chatService.leaveRoom(me.id, ps.roomId);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/members.ts

@@ -1,71 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'write:chat',
-
-	res: {
-		type: 'array',
-		optional: false, nullable: false,
-		items: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'ChatRoomMembership',
-		},
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: '7b9fe84c-eafc-4d21-bf89-485458ed2c18',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-		limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
-		sinceId: { type: 'string', format: 'misskey:id' },
-		untilId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-		private chatEntityService: ChatEntityService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.findRoomById(ps.roomId);
-			if (room == null) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-
-			if (!(await this.chatService.isRoomMember(room.id, me.id)) && room.ownerId !== me.id) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-
-			const memberships = await this.chatService.getRoomMembershipsWithPagination(room.id, ps.limit, ps.sinceId, ps.untilId);
-
-			return this.chatEntityService.packRoomMemberships(memberships, me);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/owned.ts

@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-import { ApiError } from '@/server/api/error.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'read:chat',
-
-	res: {
-		type: 'array',
-		optional: false, nullable: false,
-		items: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'ChatRoom',
-		},
-	},
-
-	errors: {
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
-		sinceId: { type: 'string', format: 'misskey:id' },
-		untilId: { type: 'string', format: 'misskey:id' },
-	},
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatEntityService: ChatEntityService,
-		private chatService: ChatService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const rooms = await this.chatService.getOwnedRoomsWithPagination(me.id, ps.limit, ps.sinceId, ps.untilId);
-			return this.chatEntityService.packRooms(rooms, me);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/show.ts

@@ -1,58 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'read:chat',
-
-	res: {
-		type: 'object',
-		optional: false, nullable: false,
-		ref: 'ChatRoom',
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: '857ae02f-8759-4d20-9adb-6e95fffe4fd7',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-		private chatEntityService: ChatEntityService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.findRoomById(ps.roomId);
-			if (room == null) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-
-			return this.chatEntityService.packRoom(room, me);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/chat/rooms/update.ts

@@ -1,63 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { DI } from '@/di-symbols.js';
-import { ChatService } from '@/core/ChatService.js';
-import { ApiError } from '@/server/api/error.js';
-import { ChatEntityService } from '@/core/entities/ChatEntityService.js';
-
-export const meta = {
-	tags: ['chat'],
-
-	requireCredential: true,
-
-	kind: 'write:chat',
-
-	res: {
-		type: 'object',
-		optional: false, nullable: false,
-		ref: 'ChatRoom',
-	},
-
-	errors: {
-		noSuchRoom: {
-			message: 'No such room.',
-			code: 'NO_SUCH_ROOM',
-			id: 'fcdb0f92-bda6-47f9-bd05-343e0e020932',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', format: 'misskey:id' },
-		name: { type: 'string', maxLength: 256 },
-	},
-	required: ['roomId'],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private chatService: ChatService,
-		private chatEntityService: ChatEntityService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const room = await this.chatService.findMyRoomById(me.id, ps.roomId);
-			if (room == null) {
-				throw new ApiError(meta.errors.noSuchRoom);
-			}
-
-			const updated = await this.chatService.updateRoom(room, {
-				name: ps.name,
-			});
-
-			return this.chatEntityService.packRoom(updated, me);
-		});
-	}
-}

packages/backend/src/server/api/endpoints/i/notifications-grouped.ts

@@ -9,6 +9,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import type { NotesRepository } from '@/models/_.js';
 import { obsoleteNotificationTypes, groupedNotificationTypes, FilterUnionByProperty } from '@/types.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
 import { NotificationEntityService } from '@/core/entities/NotificationEntityService.js';
 import { NotificationService } from '@/core/NotificationService.js';
 import { DI } from '@/di-symbols.js';
@@ -62,9 +63,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.redis)
 		private redisClient: Redis.Redis,
 
+		@Inject(DI.notesRepository)
+		private notesRepository: NotesRepository,
+
 		private idService: IdService,
 		private notificationEntityService: NotificationEntityService,
 		private notificationService: NotificationService,
+		private noteReadService: NoteReadService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const EXTRA_LIMIT = 100;
@@ -157,6 +162,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			groupedNotifications = groupedNotifications.slice(0, ps.limit);
+			const noteIds = groupedNotifications
+				.filter((notification): notification is FilterUnionByProperty<MiNotification, 'type', 'mention' | 'reply' | 'quote'> => ['mention', 'reply', 'quote'].includes(notification.type))
+				.map(notification => notification.noteId!);
+
+			if (noteIds.length > 0) {
+				const notes = await this.notesRepository.findBy({ id: In(noteIds) });
+				this.noteReadService.read(me.id, notes);
+			}
 
 			return await this.notificationEntityService.packGroupedMany(groupedNotifications, me.id);
 		});

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

@@ -9,6 +9,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import type { NotesRepository } from '@/models/_.js';
 import { FilterUnionByProperty, notificationTypes, obsoleteNotificationTypes } from '@/types.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
 import { NotificationEntityService } from '@/core/entities/NotificationEntityService.js';
 import { NotificationService } from '@/core/NotificationService.js';
 import { DI } from '@/di-symbols.js';
@@ -68,6 +69,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private idService: IdService,
 		private notificationEntityService: NotificationEntityService,
 		private notificationService: NotificationService,
+		private noteReadService: NoteReadService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			// includeTypes が空の場合はクエリしない
@@ -134,6 +136,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				this.notificationService.readAllNotification(me.id);
 			}
 
+			const noteIds = notifications
+				.filter((notification): notification is FilterUnionByProperty<MiNotification, 'type', 'mention' | 'reply' | 'quote'> => ['mention', 'reply', 'quote'].includes(notification.type))
+				.map(notification => notification.noteId);
+
+			if (noteIds.length > 0) {
+				const notes = await this.notesRepository.findBy({ id: In(noteIds) });
+				this.noteReadService.read(me.id, notes);
+			}
+
 			return await this.notificationEntityService.packMany(notifications, me.id);
 		});
 	}

packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts

@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { NoteUnreadsRepository } from '@/models/_.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { DI } from '@/di-symbols.js';
+
+export const meta = {
+	tags: ['account'],
+
+	requireCredential: true,
+
+	kind: 'write:account',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		@Inject(DI.noteUnreadsRepository)
+		private noteUnreadsRepository: NoteUnreadsRepository,
+
+		private globalEventService: GlobalEventService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			// Remove documents
+			await this.noteUnreadsRepository.delete({
+				userId: me.id,
+			});
+
+			// 全て既読になったイベントを発行
+			this.globalEventService.publishMainStream(me.id, 'readAllUnreadMentions');
+			this.globalEventService.publishMainStream(me.id, 'readAllUnreadSpecifiedNotes');
+		});
+	}
+}

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

@@ -190,7 +190,6 @@ export const paramDef = {
 		autoSensitive: { type: 'boolean' },
 		followingVisibility: { type: 'string', enum: ['public', 'followers', 'private'] },
 		followersVisibility: { type: 'string', enum: ['public', 'followers', 'private'] },
-		chatScope: { type: 'string', enum: ['everyone', 'followers', 'following', 'mutual', 'none'] },
 		pinnedPageId: { type: 'string', format: 'misskey:id', nullable: true },
 		mutedWords: muteWords,
 		hardMutedWords: muteWords,
@@ -289,7 +288,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			if (ps.birthday !== undefined) profileUpdates.birthday = ps.birthday;
 			if (ps.followingVisibility !== undefined) profileUpdates.followingVisibility = ps.followingVisibility;
 			if (ps.followersVisibility !== undefined) profileUpdates.followersVisibility = ps.followersVisibility;
-			if (ps.chatScope !== undefined) updates.chatScope = ps.chatScope;
 
 			function checkMuteWordCount(mutedWords: (string[] | string)[], limit: number) {
 				// TODO: ちゃんと数える

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

@@ -9,6 +9,7 @@ import type { NotesRepository, FollowingsRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { QueryService } from '@/core/QueryService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
 import { DI } from '@/di-symbols.js';
 
 export const meta = {
@@ -51,6 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		private noteEntityService: NoteEntityService,
 		private queryService: QueryService,
+		private noteReadService: NoteReadService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const followingQuery = this.followingsRepository.createQueryBuilder('following')
@@ -87,6 +89,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const mentions = await query.limit(ps.limit).getMany();
 
+			this.noteReadService.read(me.id, mentions);
+
 			return await this.noteEntityService.packMany(mentions, me);
 		});
 	}

packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts

@@ -9,6 +9,7 @@ import type { NotesRepository, NoteThreadMutingsRepository } from '@/models/_.js
 import { IdService } from '@/core/IdService.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { GetterService } from '@/server/api/GetterService.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
 
@@ -51,6 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private noteThreadMutingsRepository: NoteThreadMutingsRepository,
 
 		private getterService: GetterService,
+		private noteReadService: NoteReadService,
 		private idService: IdService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -67,6 +69,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				}],
 			});
 
+			await this.noteReadService.read(me.id, mutedNotes);
+
 			await this.noteThreadMutingsRepository.insert({
 				id: this.idService.gen(),
 				threadId: note.threadId ?? note.id,

packages/backend/src/server/api/stream/ChannelsService.ts

@@ -19,8 +19,6 @@ import { AntennaChannelService } from './channels/antenna.js';
 import { DriveChannelService } from './channels/drive.js';
 import { HashtagChannelService } from './channels/hashtag.js';
 import { RoleTimelineChannelService } from './channels/role-timeline.js';
-import { ChatUserChannelService } from './channels/chat-user.js';
-import { ChatRoomChannelService } from './channels/chat-room.js';
 import { ReversiChannelService } from './channels/reversi.js';
 import { ReversiGameChannelService } from './channels/reversi-game.js';
 import { type MiChannelService } from './channel.js';
@@ -42,8 +40,6 @@ export class ChannelsService {
 		private serverStatsChannelService: ServerStatsChannelService,
 		private queueStatsChannelService: QueueStatsChannelService,
 		private adminChannelService: AdminChannelService,
-		private chatUserChannelService: ChatUserChannelService,
-		private chatRoomChannelService: ChatRoomChannelService,
 		private reversiChannelService: ReversiChannelService,
 		private reversiGameChannelService: ReversiGameChannelService,
 	) {
@@ -66,8 +62,6 @@ export class ChannelsService {
 			case 'serverStats': return this.serverStatsChannelService;
 			case 'queueStats': return this.queueStatsChannelService;
 			case 'admin': return this.adminChannelService;
-			case 'chatUser': return this.chatUserChannelService;
-			case 'chatRoom': return this.chatRoomChannelService;
 			case 'reversi': return this.reversiChannelService;
 			case 'reversiGame': return this.reversiGameChannelService;
 

packages/backend/src/server/api/stream/Connection.ts

@@ -7,6 +7,7 @@ import * as WebSocket from 'ws';
 import type { MiUser } from '@/models/User.js';
 import type { MiAccessToken } from '@/models/AccessToken.js';
 import type { Packed } from '@/misc/json-schema.js';
+import type { NoteReadService } from '@/core/NoteReadService.js';
 import type { NotificationService } from '@/core/NotificationService.js';
 import { bindThis } from '@/decorators.js';
 import { CacheService } from '@/core/CacheService.js';
@@ -44,6 +45,7 @@ export default class Connection {
 
 	constructor(
 		private channelsService: ChannelsService,
+		private noteReadService: NoteReadService,
 		private notificationService: NotificationService,
 		private cacheService: CacheService,
 		private channelFollowingService: ChannelFollowingService,
@@ -117,7 +119,7 @@ export default class Connection {
 			case 'readNotification': this.onReadNotification(body); break;
 			case 'subNote': this.onSubscribeNote(body); break;
 			case 's': this.onSubscribeNote(body); break; // alias
-			case 'sr': this.onSubscribeNote(body); break;
+			case 'sr': this.onSubscribeNote(body); this.readNote(body); break;
 			case 'unsubNote': this.onUnsubscribeNote(body); break;
 			case 'un': this.onUnsubscribeNote(body); break; // alias
 			case 'connect': this.onChannelConnectRequested(body); break;
@@ -152,6 +154,19 @@ export default class Connection {
 		if (note.renote) add(note.renote);
 	}
 
+	@bindThis
+	private readNote(body: JsonValue | undefined) {
+		if (!isJsonObject(body)) return;
+		const id = body.id;
+
+		const note = this.cachedNotes.find(n => n.id === id);
+		if (note == null) return;
+
+		if (this.user && (note.userId !== this.user.id)) {
+			this.noteReadService.read(this.user.id, [note]);
+		}
+	}
+
 	@bindThis
 	private onReadNotification(payload: JsonValue | undefined) {
 		this.notificationService.readAllNotification(this.user!.id);

packages/backend/src/server/api/stream/channels/chat-room.ts

@@ -1,78 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Injectable } from '@nestjs/common';
-import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import type { JsonObject } from '@/misc/json-value.js';
-import { ChatService } from '@/core/ChatService.js';
-import Channel, { type MiChannelService } from '../channel.js';
-
-class ChatRoomChannel extends Channel {
-	public readonly chName = 'chatRoom';
-	public static shouldShare = false;
-	public static requireCredential = true as const;
-	public static kind = 'read:chat';
-	private roomId: string;
-
-	constructor(
-		private chatService: ChatService,
-
-		id: string,
-		connection: Channel['connection'],
-	) {
-		super(id, connection);
-	}
-
-	@bindThis
-	public async init(params: JsonObject) {
-		if (typeof params.roomId !== 'string') return;
-		this.roomId = params.roomId;
-
-		this.subscriber.on(`chatRoomStream:${this.roomId}`, this.onEvent);
-	}
-
-	@bindThis
-	private async onEvent(data: GlobalEvents['chat']['payload']) {
-		this.send(data.type, data.body);
-	}
-
-	@bindThis
-	public onMessage(type: string, body: any) {
-		switch (type) {
-			case 'read':
-				if (this.roomId) {
-					this.chatService.readRoomChatMessage(this.user!.id, this.roomId);
-				}
-				break;
-		}
-	}
-
-	@bindThis
-	public dispose() {
-		this.subscriber.off(`chatRoomStream:${this.roomId}`, this.onEvent);
-	}
-}
-
-@Injectable()
-export class ChatRoomChannelService implements MiChannelService<true> {
-	public readonly shouldShare = ChatRoomChannel.shouldShare;
-	public readonly requireCredential = ChatRoomChannel.requireCredential;
-	public readonly kind = ChatRoomChannel.kind;
-
-	constructor(
-		private chatService: ChatService,
-	) {
-	}
-
-	@bindThis
-	public create(id: string, connection: Channel['connection']): ChatRoomChannel {
-		return new ChatRoomChannel(
-			this.chatService,
-			id,
-			connection,
-		);
-	}
-}

packages/backend/src/server/api/stream/channels/chat-user.ts

@@ -1,78 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Injectable } from '@nestjs/common';
-import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import type { JsonObject } from '@/misc/json-value.js';
-import { ChatService } from '@/core/ChatService.js';
-import Channel, { type MiChannelService } from '../channel.js';
-
-class ChatUserChannel extends Channel {
-	public readonly chName = 'chatUser';
-	public static shouldShare = false;
-	public static requireCredential = true as const;
-	public static kind = 'read:chat';
-	private otherId: string;
-
-	constructor(
-		private chatService: ChatService,
-
-		id: string,
-		connection: Channel['connection'],
-	) {
-		super(id, connection);
-	}
-
-	@bindThis
-	public async init(params: JsonObject) {
-		if (typeof params.otherId !== 'string') return;
-		this.otherId = params.otherId;
-
-		this.subscriber.on(`chatUserStream:${this.user!.id}-${this.otherId}`, this.onEvent);
-	}
-
-	@bindThis
-	private async onEvent(data: GlobalEvents['chat']['payload']) {
-		this.send(data.type, data.body);
-	}
-
-	@bindThis
-	public onMessage(type: string, body: any) {
-		switch (type) {
-			case 'read':
-				if (this.otherId) {
-					this.chatService.readUserChatMessage(this.user!.id, this.otherId);
-				}
-				break;
-		}
-	}
-
-	@bindThis
-	public dispose() {
-		this.subscriber.off(`chatUserStream:${this.user!.id}-${this.otherId}`, this.onEvent);
-	}
-}
-
-@Injectable()
-export class ChatUserChannelService implements MiChannelService<true> {
-	public readonly shouldShare = ChatUserChannel.shouldShare;
-	public readonly requireCredential = ChatUserChannel.requireCredential;
-	public readonly kind = ChatUserChannel.kind;
-
-	constructor(
-		private chatService: ChatService,
-	) {
-	}
-
-	@bindThis
-	public create(id: string, connection: Channel['connection']): ChatUserChannel {
-		return new ChatUserChannel(
-			this.chatService,
-			id,
-			connection,
-		);
-	}
-}

packages/backend/test/e2e/mute.ts

@@ -51,8 +51,30 @@ describe('Mute', () => {
 		assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 	});
 
+	test('ミュートしているユーザーからメンションされても、hasUnreadMentions が true にならない', async () => {
+		// 状態リセット
+		await api('i/read-all-unread-notes', {}, alice);
+
+		await post(carol, { text: '@alice hi' });
+
+		const res = await api('i', {}, alice);
+
+		assert.strictEqual(res.status, 200);
+		assert.strictEqual(res.body.hasUnreadMentions, false);
+	});
+
+	test('ミュートしているユーザーからメンションされても、ストリームに unreadMention イベントが流れてこない', async () => {
+		// 状態リセット
+		await api('i/read-all-unread-notes', {}, alice);
+
+		const fired = await waitFire(alice, 'main', () => post(carol, { text: '@alice hi' }), msg => msg.type === 'unreadMention');
+
+		assert.strictEqual(fired, false);
+	});
+
 	test('ミュートしているユーザーからメンションされても、ストリームに unreadNotification イベントが流れてこない', async () => {
 		// 状態リセット
+		await api('i/read-all-unread-notes', {}, alice);
 		await api('notifications/mark-all-as-read', {}, alice);
 
 		const fired = await waitFire(alice, 'main', () => post(carol, { text: '@alice hi' }), msg => msg.type === 'unreadNotification');

packages/backend/test/e2e/thread-mute.ts

@@ -38,6 +38,48 @@ describe('Note thread mute', () => {
 		assert.strictEqual(res.body.some(note => note.id === carolReplyWithoutMention.id), false);
 	});
 
+	test('ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない', async () => {
+		// 状態リセット
+		await api('i/read-all-unread-notes', {}, alice);
+
+		const bobNote = await post(bob, { text: '@alice @carol root note' });
+
+		await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
+
+		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
+
+		const res = await api('i', {}, alice);
+
+		assert.strictEqual(res.status, 200);
+		assert.strictEqual(res.body.hasUnreadMentions, false);
+	});
+
+	test('ミュートしているスレッドからメンションされても、ストリームに unreadMention イベントが流れてこない', () => new Promise<void>(async done => {
+		// 状態リセット
+		await api('i/read-all-unread-notes', {}, alice);
+
+		const bobNote = await post(bob, { text: '@alice @carol root note' });
+
+		await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
+
+		let fired = false;
+
+		const ws = await connectStream(alice, 'main', async ({ type, body }) => {
+			if (type === 'unreadMention') {
+				if (body === bobNote.id) return;
+				fired = true;
+			}
+		});
+
+		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
+
+		setTimeout(() => {
+			assert.strictEqual(fired, false);
+			ws.close();
+			done();
+		}, 5000);
+	}));
+
 	test('i/notifications にミュートしているスレッドの通知が含まれない', async () => {
 		const bobNote = await post(bob, { text: '@alice @carol root note' });
 		const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });

packages/backend/test/e2e/users.ts

@@ -15,7 +15,7 @@ describe('ユーザー', () => {
 	// エンティティとしてのユーザーを主眼においたテストを記述する
 	// (Userを返すエンドポイントとUserエンティティを書き換えるエンドポイントをテストする)
 
-	const stripUndefined = <T extends { [key: string]: any } >(orig: T): Partial<T> => {
+	const stripUndefined = <T extends { [key: string]: any }, >(orig: T): Partial<T> => {
 		return Object.entries({ ...orig })
 			.filter(([, value]) => value !== undefined)
 			.reduce((obj: Partial<T>, [key, value]) => {
@@ -83,7 +83,6 @@ describe('ユーザー', () => {
 			publicReactions: user.publicReactions,
 			followingVisibility: user.followingVisibility,
 			followersVisibility: user.followersVisibility,
-			chatScope: user.chatScope,
 			roles: user.roles,
 			memo: user.memo,
 		});
@@ -133,7 +132,6 @@ describe('ユーザー', () => {
 			hasUnreadAnnouncement: user.hasUnreadAnnouncement,
 			hasUnreadAntenna: user.hasUnreadAntenna,
 			hasUnreadChannel: user.hasUnreadChannel,
-			hasUnreadChatMessages: user.hasUnreadChatMessages,
 			hasUnreadNotification: user.hasUnreadNotification,
 			unreadNotificationsCount: user.unreadNotificationsCount,
 			hasPendingReceivedFollowRequest: user.hasPendingReceivedFollowRequest,
@@ -345,7 +343,6 @@ describe('ユーザー', () => {
 		assert.strictEqual(response.publicReactions, true);
 		assert.strictEqual(response.followingVisibility, 'public');
 		assert.strictEqual(response.followersVisibility, 'public');
-		assert.strictEqual(response.chatScope, 'mutual');
 		assert.deepStrictEqual(response.roles, []);
 		assert.strictEqual(response.memo, null);
 
@@ -372,7 +369,6 @@ describe('ユーザー', () => {
 		assert.strictEqual(response.hasUnreadAnnouncement, false);
 		assert.strictEqual(response.hasUnreadAntenna, false);
 		assert.strictEqual(response.hasUnreadChannel, false);
-		assert.strictEqual(response.hasUnreadChatMessages, false);
 		assert.strictEqual(response.hasUnreadNotification, false);
 		assert.strictEqual(response.unreadNotificationsCount, 0);
 		assert.strictEqual(response.hasPendingReceivedFollowRequest, false);

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

@@ -34,11 +34,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts">
-import { computed, isRef, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onDeactivated, ref, shallowRef, watch } from 'vue';
+import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onDeactivated, ref, shallowRef, watch } from 'vue';
 import * as Misskey from 'misskey-js';
 import { useDocumentVisibility } from '@@/js/use-document-visibility.js';
-import { onScrollTop, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll, isTailVisible, isHeadVisible } from '@@/js/scroll.js';
-import type { ComputedRef } from 'vue';
+import { onScrollTop, isTopVisible, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll, isBottomVisible } from '@@/js/scroll.js';
 import { misskeyApi } from '@/misskey-api.js';
 import { i18n } from '@/i18n.js';
 
@@ -63,6 +62,8 @@ export type Paging<E extends keyof Misskey.Endpoints = keyof Misskey.Endpoints>
 	reversed?: boolean;
 
 	offsetMode?: boolean;
+
+	pageEl?: HTMLElement;
 };
 
 type MisskeyEntity = {
@@ -134,7 +135,8 @@ const isBackTop = ref(false);
 const empty = computed(() => items.value.size === 0);
 const error = ref(false);
 
-const scrollableElement = computed(() => rootEl.value ? getScrollContainer(rootEl.value) : document.body);
+const contentEl = computed(() => props.pagination.pageEl ?? rootEl.value);
+const scrollableElement = computed(() => contentEl.value ? getScrollContainer(contentEl.value) : document.body);
 
 const visibility = useDocumentVisibility();
 
@@ -165,11 +167,11 @@ watch(rootEl, () => {
 	});
 });
 
-watch([backed, rootEl], () => {
+watch([backed, contentEl], () => {
 	if (!backed.value) {
-		if (!rootEl.value) return;
+		if (!contentEl.value) return;
 
-		scrollRemove.value = (props.pagination.reversed ? onScrollBottom : onScrollTop)(rootEl.value, executeQueue, TOLERANCE);
+		scrollRemove.value = (props.pagination.reversed ? onScrollBottom : onScrollTop)(contentEl.value, executeQueue, TOLERANCE);
 	} else {
 		if (scrollRemove.value) scrollRemove.value();
 		scrollRemove.value = null;
@@ -342,7 +344,7 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 	fetchMoreAppearTimeout();
 };
 
-const isTop = (): boolean => isBackTop.value || (props.pagination.reversed ? isTailVisible : isHeadVisible)(rootEl.value!, TOLERANCE);
+const isTop = (): boolean => isBackTop.value || (props.pagination.reversed ? isBottomVisible : isTopVisible)(contentEl.value!, TOLERANCE);
 
 watch(visibility, () => {
 	if (visibility.value === 'hidden') {
@@ -440,7 +442,7 @@ onDeactivated(() => {
 });
 
 function toBottom() {
-	scrollToBottom(rootEl.value!);
+	scrollToBottom(contentEl.value!);
 }
 
 onBeforeMount(() => {

packages/frontend-shared/js/const.ts

@@ -107,7 +107,6 @@ export const ROLE_POLICIES = [
 	'canImportFollowing',
 	'canImportMuting',
 	'canImportUserLists',
-	'canChat',
 ] as const;
 
 export const DEFAULT_SERVER_ERROR_IMAGE_URL = 'https://xn--931a.moe/assets/error.jpg';

packages/frontend-shared/js/scroll.ts

@@ -38,7 +38,7 @@ export function getScrollPosition(el: HTMLElement | null): number {
 
 export function onScrollTop(el: HTMLElement, cb: (topVisible: boolean) => unknown, tolerance = 1, once = false) {
 	// とりあえず評価してみる
-	const firstTopVisible = isHeadVisible(el);
+	const firstTopVisible = isTopVisible(el);
 	if (el.isConnected && firstTopVisible) {
 		cb(firstTopVisible);
 		if (once) return null;
@@ -53,7 +53,7 @@ export function onScrollTop(el: HTMLElement, cb: (topVisible: boolean) => unknow
 	const onScroll = () => {
 		if (!document.body.contains(el)) return;
 
-		const topVisible = isHeadVisible(el, tolerance);
+		const topVisible = isTopVisible(el, tolerance);
 		if (topVisible !== prevTopVisible) {
 			prevTopVisible = topVisible;
 			cb(topVisible);
@@ -71,7 +71,7 @@ export function onScrollBottom(el: HTMLElement, cb: () => unknown, tolerance = 1
 	const container = getScrollContainer(el);
 
 	// とりあえず評価してみる
-	if (el.isConnected && isTailVisible(el, tolerance, container)) {
+	if (el.isConnected && isBottomVisible(el, tolerance, container)) {
 		cb();
 		if (once) return null;
 	}
@@ -79,7 +79,7 @@ export function onScrollBottom(el: HTMLElement, cb: () => unknown, tolerance = 1
 	const containerOrWindow = container ?? window;
 	const onScroll = () => {
 		if (!document.body.contains(el)) return;
-		if (isTailVisible(el, 1, container)) {
+		if (isBottomVisible(el, 1, container)) {
 			cb();
 			if (once) removeListener();
 		}
@@ -132,12 +132,12 @@ export function scrollToBottom(
 	}
 }
 
-export function isHeadVisible(el: HTMLElement, tolerance = 1): boolean {
+export function isTopVisible(el: HTMLElement, tolerance = 1): boolean {
 	const scrollTop = getScrollPosition(el);
 	return scrollTop <= tolerance;
 }
 
-export function isTailVisible(el: HTMLElement, tolerance = 1, container = getScrollContainer(el)) {
+export function isBottomVisible(el: HTMLElement, tolerance = 1, container = getScrollContainer(el)) {
 	if (container) return el.scrollHeight <= container.clientHeight + Math.abs(container.scrollTop) + tolerance;
 	return el.scrollHeight <= window.innerHeight + window.scrollY + tolerance;
 }

packages/frontend/src/boot/main-boot.ts

@@ -502,16 +502,31 @@ export async function mainBoot() {
 			});
 		});
 
+		main.on('unreadMention', () => {
+			updateCurrentAccountPartial({ hasUnreadMentions: true });
+		});
+
+		main.on('readAllUnreadMentions', () => {
+			updateCurrentAccountPartial({ hasUnreadMentions: false });
+		});
+
+		main.on('unreadSpecifiedNote', () => {
+			updateCurrentAccountPartial({ hasUnreadSpecifiedNotes: true });
+		});
+
+		main.on('readAllUnreadSpecifiedNotes', () => {
+			updateCurrentAccountPartial({ hasUnreadSpecifiedNotes: false });
+		});
+
+		main.on('readAllAntennas', () => {
+			updateCurrentAccountPartial({ hasUnreadAntenna: false });
+		});
+
 		main.on('unreadAntenna', () => {
 			updateCurrentAccountPartial({ hasUnreadAntenna: true });
 			sound.playMisskeySfx('antenna');
 		});
 
-		main.on('newChatMessage', () => {
-			updateCurrentAccountPartial({ hasUnreadChatMessages: true });
-			sound.playMisskeySfx('chat');
-		});
-
 		main.on('readAllAnnouncements', () => {
 			updateCurrentAccountPartial({ hasUnreadAnnouncement: false });
 		});

packages/frontend/src/components/MkButton.vue

@@ -7,11 +7,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 <button
 	v-if="!link"
 	ref="el" class="_button"
-	:class="[$style.root, { [$style.inline]: inline, [$style.primary]: primary, [$style.gradate]: gradate, [$style.danger]: danger, [$style.rounded]: rounded, [$style.full]: full, [$style.small]: small, [$style.large]: large, [$style.transparent]: transparent, [$style.asLike]: asLike, [$style.iconOnly]: iconOnly, [$style.wait]: wait }]"
+	:class="[$style.root, { [$style.inline]: inline, [$style.primary]: primary, [$style.gradate]: gradate, [$style.danger]: danger, [$style.rounded]: rounded, [$style.full]: full, [$style.small]: small, [$style.large]: large, [$style.transparent]: transparent, [$style.asLike]: asLike, [$style.iconOnly]: iconOnly }]"
 	:type="type"
 	:name="name"
 	:value="value"
-	:disabled="disabled || wait"
+	:disabled="disabled"
 	@click="emit('click', $event)"
 	@mousedown="onMousedown"
 >
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </button>
 <MkA
 	v-else class="_button"
-	:class="[$style.root, { [$style.inline]: inline, [$style.primary]: primary, [$style.gradate]: gradate, [$style.danger]: danger, [$style.rounded]: rounded, [$style.full]: full, [$style.small]: small, [$style.large]: large, [$style.transparent]: transparent, [$style.asLike]: asLike, [$style.iconOnly]: iconOnly, [$style.wait]: wait }]"
+	:class="[$style.root, { [$style.inline]: inline, [$style.primary]: primary, [$style.gradate]: gradate, [$style.danger]: danger, [$style.rounded]: rounded, [$style.full]: full, [$style.small]: small, [$style.large]: large, [$style.transparent]: transparent, [$style.asLike]: asLike, [$style.iconOnly]: iconOnly }]"
 	:to="to ?? '#'"
 	:behavior="linkBehavior"
 	@mousedown="onMousedown"
@@ -256,10 +256,6 @@ function onMousedown(evt: MouseEvent): void {
 		opacity: 0.5;
 	}
 
-	&.wait {
-		cursor: wait !important;
-	}
-
 	&:focus-visible {
 		outline-offset: 2px;
 	}

packages/frontend/src/components/MkDateSeparatedList.vue

@@ -168,17 +168,21 @@ export default defineComponent({
 	container-type: inline-size;
 
 	&:global {
-		> .list-move {
-			transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1);
-		}
+	> .list-move {
+		transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1);
+	}
 
-		> .list-enter-active {
-			transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1);
-		}
+	&.deny-move-transition > .list-move {
+		transition: none !important;
+	}
 
-		> *:empty {
-			display: none;
-		}
+	> .list-enter-active {
+		transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1);
+	}
+
+	> *:empty {
+		display: none;
+	}
 	}
 
 	&:not(.date-separated-list-nogap) > *:not(:last-child) {

packages/frontend/src/components/MkFukidashi.vue

@@ -10,7 +10,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		tail === 'left' ? $style.left : $style.right,
 		negativeMargin === true && $style.negativeMargin,
 		shadow === true && $style.shadow,
-		accented === true && $style.accented
 	]"
 >
 	<div :class="$style.bg">
@@ -31,12 +30,10 @@ withDefaults(defineProps<{
 	tail?: 'left' | 'right' | 'none';
 	negativeMargin?: boolean;
 	shadow?: boolean;
-	accented?: boolean;
 }>(), {
 	tail: 'right',
 	negativeMargin: false,
 	shadow: false,
-	accented: false,
 });
 </script>
 
@@ -50,10 +47,6 @@ withDefaults(defineProps<{
 	min-height: calc(var(--fukidashi-radius) * 2);
 	padding-top: calc(var(--fukidashi-radius) * .13);
 
-	&.accented {
-		--fukidashi-bg: var(--MI_THEME-accent);
-	}
-
 	&.shadow {
 		filter: drop-shadow(0 4px 32px var(--MI_THEME-shadow));
 	}
@@ -84,7 +77,7 @@ withDefaults(defineProps<{
 
 .content {
 	position: relative;
-	padding: 10px 14px;
+	padding: 8px 12px;
 }
 
 .tail {

packages/frontend/src/components/MkMenu.vue

@@ -11,7 +11,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		[$style.center]: align === 'center',
 		[$style.big]: big,
 		[$style.asDrawer]: asDrawer,
-		[$style.widthSpecified]: width != null,
 	}"
 	@focusin.passive.stop="() => {}"
 >
@@ -30,19 +29,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 	>
 		<template v-for="item in (items2 ?? [])">
 			<div v-if="item.type === 'divider'" role="separator" tabindex="-1" :class="$style.divider"></div>
-
 			<span v-else-if="item.type === 'label'" role="menuitem" tabindex="-1" :class="[$style.label, $style.item]">
 				<span style="opacity: 0.7;">{{ item.text }}</span>
 			</span>
-
 			<span v-else-if="item.type === 'pending'" role="menuitem" tabindex="0" :class="[$style.pending, $style.item]">
 				<span><MkEllipsis/></span>
 			</span>
-
 			<div v-else-if="item.type === 'component'" role="menuitem" tabindex="-1" :class="[$style.componentItem]">
 				<component :is="item.component" v-bind="item.props"/>
 			</div>
-
 			<MkA
 				v-else-if="item.type === 'link'"
 				role="menuitem"
@@ -56,14 +51,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar"/>
 				<div :class="$style.item_content">
-					<div :class="$style.item_content_text">
-						<div :class="$style.item_content_text_title">{{ item.text }}</div>
-						<div v-if="item.caption" :class="$style.item_content_text_caption">{{ item.caption }}</div>
-					</div>
+					<span :class="$style.item_content_text">{{ item.text }}</span>
 					<span v-if="item.indicate" :class="$style.indicator" class="_blink"><i class="_indicatorCircle"></i></span>
 				</div>
 			</MkA>
-
 			<a
 				v-else-if="item.type === 'a'"
 				role="menuitem"
@@ -79,14 +70,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<div :class="$style.item_content">
-					<div :class="$style.item_content_text">
-						<div :class="$style.item_content_text_title">{{ item.text }}</div>
-						<div v-if="item.caption" :class="$style.item_content_text_caption">{{ item.caption }}</div>
-					</div>
+					<span :class="$style.item_content_text">{{ item.text }}</span>
 					<span v-if="item.indicate" :class="$style.indicator" class="_blink"><i class="_indicatorCircle"></i></span>
 				</div>
 			</a>
-
 			<button
 				v-else-if="item.type === 'user'"
 				role="menuitem"
@@ -101,7 +88,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<span :class="$style.indicator" class="_blink"><i class="_indicatorCircle"></i></span>
 				</div>
 			</button>
-
 			<button
 				v-else-if="item.type === 'switch'"
 				role="menuitemcheckbox"
@@ -115,14 +101,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<MkSwitchButton v-else :class="$style.switchButton" :checked="item.ref" :disabled="item.disabled" @toggle="switchItem(item)"/>
 				<div :class="$style.item_content">
-					<div :class="[$style.item_content_text, { [$style.switchText]: !item.icon }]">
-						<div :class="$style.item_content_text_title">{{ item.text }}</div>
-						<div v-if="item.caption" :class="$style.item_content_text_caption">{{ item.caption }}</div>
-					</div>
+					<span :class="[$style.item_content_text, { [$style.switchText]: !item.icon }]">{{ item.text }}</span>
 					<MkSwitchButton v-if="item.icon" :class="[$style.switchButton, $style.caret]" :checked="item.ref" :disabled="item.disabled" @toggle="switchItem(item)"/>
 				</div>
 			</button>
-
 			<button
 				v-else-if="item.type === 'radio'"
 				role="menuitem"
@@ -135,14 +117,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]" style="pointer-events: none;"></i>
 				<div :class="$style.item_content">
-					<div :class="$style.item_content_text" style="pointer-events: none;">
-						<div :class="$style.item_content_text_title">{{ item.text }}</div>
-						<div v-if="item.caption" :class="$style.item_content_text_caption">{{ item.caption }}</div>
-					</div>
+					<span :class="$style.item_content_text" style="pointer-events: none;">{{ item.text }}</span>
 					<span :class="$style.caret" style="pointer-events: none;"><i class="ti ti-chevron-right ti-fw"></i></span>
 				</div>
 			</button>
-
 			<button
 				v-else-if="item.type === 'radioOption'"
 				role="menuitemradio"
@@ -156,13 +134,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<span :class="[$style.radioIcon, { [$style.radioChecked]: unref(item.active) }]"></span>
 				</div>
 				<div :class="$style.item_content">
-					<div :class="$style.item_content_text">
-						<div :class="$style.item_content_text_title">{{ item.text }}</div>
-						<div v-if="item.caption" :class="$style.item_content_text_caption">{{ item.caption }}</div>
-					</div>
+					<span :class="$style.item_content_text">{{ item.text }}</span>
 				</div>
 			</button>
-
 			<button
 				v-else-if="item.type === 'parent'"
 				role="menuitem"
@@ -174,17 +148,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]" style="pointer-events: none;"></i>
 				<div :class="$style.item_content">
-					<div :class="$style.item_content_text" style="pointer-events: none;">
-						<div :class="$style.item_content_text_title">{{ item.text }}</div>
-						<div v-if="item.caption" :class="$style.item_content_text_caption">{{ item.caption }}</div>
-					</div>
+					<span :class="$style.item_content_text" style="pointer-events: none;">{{ item.text }}</span>
 					<span :class="$style.caret" style="pointer-events: none;"><i class="ti ti-chevron-right ti-fw"></i></span>
 				</div>
 			</button>
-
 			<button
-				v-else
-				role="menuitem"
+				v-else role="menuitem"
 				tabindex="0"
 				:class="['_button', $style.item, { [$style.danger]: item.danger, [$style.active]: unref(item.active) }]"
 				@click.prevent="unref(item.active) ? close(false) : clicked(item.action, $event)"
@@ -194,15 +163,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar"/>
 				<div :class="$style.item_content">
-					<div :class="$style.item_content_text">
-						<div :class="$style.item_content_text_title">{{ item.text }}</div>
-						<div v-if="item.caption" :class="$style.item_content_text_caption">{{ item.caption }}</div>
-					</div>
+					<span :class="$style.item_content_text">{{ item.text }}</span>
 					<span v-if="item.indicate" :class="$style.indicator" class="_blink"><i class="_indicatorCircle"></i></span>
 				</div>
 			</button>
 		</template>
-
 		<span v-if="items2 == null || items2.length === 0" tabindex="-1" :class="[$style.none, $style.item]">
 			<span>{{ i18n.ts.none }}</span>
 		</span>
@@ -473,12 +438,6 @@ onBeforeUnmount(() => {
 		}
 	}
 
-	&:not(.widthSpecified) {
-		> .menu {
-			max-width: 400px;
-		}
-	}
-
 	&.big:not(.asDrawer) {
 		> .menu {
 			min-width: 230px;
@@ -648,19 +607,10 @@ onBeforeUnmount(() => {
 
 .item_content_text {
 	max-width: calc(100vw - 4rem);
-}
-
-.item_content_text_title {
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
 
-.item_content_text_caption {
-	text-wrap: auto;
-	font-size: 85%;
-	opacity: 0.7;
-}
-
 .switchButton {
 	margin-left: -2px;
 	--height: 1.35em;

packages/frontend/src/components/MkPagination.vue

@@ -24,16 +24,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</slot>
 	</div>
 
-	<div v-else ref="rootEl" class="_gaps">
-		<div v-show="pagination.reversed && more" key="_more_">
-			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMoreAhead : null" :class="$style.more" :wait="moreFetching" primary rounded @click="fetchMoreAhead">
+	<div v-else ref="rootEl">
+		<div v-show="pagination.reversed && more" key="_more_" class="_margin">
+			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMoreAhead : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary rounded @click="fetchMoreAhead">
 				{{ i18n.ts.loadMore }}
 			</MkButton>
 			<MkLoading v-else class="loading"/>
 		</div>
 		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching"></slot>
-		<div v-show="!pagination.reversed && more" key="_more_">
-			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMore : null" :class="$style.more" :wait="moreFetching" primary rounded @click="fetchMore">
+		<div v-show="!pagination.reversed && more" key="_more_" class="_margin">
+			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMore : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary rounded @click="fetchMore">
 				{{ i18n.ts.loadMore }}
 			</MkButton>
 			<MkLoading v-else class="loading"/>
@@ -46,7 +46,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, isRef, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onDeactivated, ref, useTemplateRef, watch } from 'vue';
 import * as Misskey from 'misskey-js';
 import { useDocumentVisibility } from '@@/js/use-document-visibility.js';
-import { onScrollTop, isHeadVisible, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll, isTailVisible } from '@@/js/scroll.js';
+import { onScrollTop, isTopVisible, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll, isBottomVisible } from '@@/js/scroll.js';
 import type { ComputedRef } from 'vue';
 import type { MisskeyEntity } from '@/types/date-separated-list.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
@@ -74,6 +74,8 @@ export type Paging<E extends keyof Misskey.Endpoints = keyof Misskey.Endpoints>
 	reversed?: boolean;
 
 	offsetMode?: boolean;
+
+	pageEl?: HTMLElement;
 };
 
 type MisskeyEntityMap = Map<string, MisskeyEntity>;
@@ -139,7 +141,8 @@ const {
 	enableInfiniteScroll,
 } = prefer.r;
 
-const scrollableElement = computed(() => rootEl.value ? getScrollContainer(rootEl.value) : window.document.body);
+const contentEl = computed(() => props.pagination.pageEl ?? rootEl.value);
+const scrollableElement = computed(() => contentEl.value ? getScrollContainer(contentEl.value) : window.document.body);
 
 const visibility = useDocumentVisibility();
 
@@ -170,13 +173,13 @@ watch(rootEl, () => {
 	});
 });
 
-watch([backed, rootEl], () => {
+watch([backed, contentEl], () => {
 	if (!backed.value) {
-		if (!rootEl.value) return;
+		if (!contentEl.value) return;
 
 		scrollRemove.value = props.pagination.reversed
-			? onScrollBottom(rootEl.value, executeQueue, TOLERANCE)
-			: onScrollTop(rootEl.value, (topVisible) => { if (topVisible) executeQueue(); }, TOLERANCE);
+			? onScrollBottom(contentEl.value, executeQueue, TOLERANCE)
+			: onScrollTop(contentEl.value, (topVisible) => { if (topVisible) executeQueue(); }, TOLERANCE);
 	} else {
 		if (scrollRemove.value) scrollRemove.value();
 		scrollRemove.value = null;
@@ -346,7 +349,7 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 	fetchMoreAppearTimeout();
 };
 
-const isHead = (): boolean => isBackTop.value || (props.pagination.reversed ? isTailVisible : isHeadVisible)(rootEl.value!, TOLERANCE);
+const isTop = (): boolean => isBackTop.value || (props.pagination.reversed ? isBottomVisible : isTopVisible)(contentEl.value!, TOLERANCE);
 
 watch(visibility, () => {
 	if (visibility.value === 'hidden') {
@@ -361,7 +364,7 @@ watch(visibility, () => {
 			timerForSetPause = null;
 		} else {
 			isPausingUpdate = false;
-			if (isHead()) {
+			if (isTop()) {
 				executeQueue();
 			}
 		}
@@ -373,18 +376,16 @@ watch(visibility, () => {
  * ストリーミングから降ってきたアイテムはこれで追加する
  * @param item アイテム
  */
-function prepend(item: MisskeyEntity): void {
+const prepend = (item: MisskeyEntity): void => {
 	if (items.value.size === 0) {
 		items.value.set(item.id, item);
 		fetching.value = false;
 		return;
 	}
 
-	console.log(isHead(), isPausingUpdate);
-
-	if (isHead() && !isPausingUpdate) unshiftItems([item]);
+	if (isTop() && !isPausingUpdate) unshiftItems([item]);
 	else prependQueue(item);
-}
+};
 
 /**
  * 新着アイテムをitemsの先頭に追加し、displayLimitを適用する
@@ -446,7 +447,7 @@ onDeactivated(() => {
 });
 
 function toBottom() {
-	scrollToBottom(rootEl.value!);
+	scrollToBottom(contentEl.value!);
 }
 
 onBeforeMount(() => {

packages/frontend/src/local-storage.ts

@@ -28,7 +28,7 @@ export type Keys = (
 	'theme' |
 	'themeId' |
 	'customCss' |
-	'chatMessageDrafts' |
+	'message_drafts' |
 	'scratchpad' |
 	'debug' |
 	'preferences' |

packages/frontend/src/navbar.ts

@@ -4,7 +4,6 @@
  */
 
 import { computed, reactive } from 'vue';
-import { ui } from '@@/js/config.js';
 import { clearCache } from './utility/clear-cache.js';
 import { $i } from '@/i.js';
 import { miLocalStorage } from '@/local-storage.js';
@@ -12,6 +11,7 @@ import { openInstanceMenu, openToolsMenu } from '@/ui/_common_/common.js';
 import { lookup } from '@/utility/lookup.js';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
+import { ui } from '@@/js/config.js';
 import { unisonReload } from '@/utility/unison-reload.js';
 
 export const navbarItemDef = reactive({
@@ -110,12 +110,6 @@ export const navbarItemDef = reactive({
 		icon: 'ti ti-device-tv',
 		to: '/channels',
 	},
-	chat: {
-		title: i18n.ts.chat,
-		icon: 'ti ti-message',
-		to: '/chat',
-		indicated: computed(() => $i != null && $i.hasUnreadChatMessages),
-	},
 	achievements: {
 		title: i18n.ts.achievements,
 		icon: 'ti ti-medal',

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

@@ -160,26 +160,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</MkFolder>
 
-			<MkFolder v-if="matchQuery([i18n.ts._role._options.canChat, 'canChat'])">
-				<template #label>{{ i18n.ts._role._options.canChat }}</template>
-				<template #suffix>
-					<span v-if="role.policies.canChat.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
-					<span v-else>{{ role.policies.canChat.value ? i18n.ts.yes : i18n.ts.no }}</span>
-					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.canChat)"></i></span>
-				</template>
-				<div class="_gaps">
-					<MkSwitch v-model="role.policies.canChat.useDefault" :readonly="readonly">
-						<template #label>{{ i18n.ts._role.useBaseValue }}</template>
-					</MkSwitch>
-					<MkSwitch v-model="role.policies.canChat.value" :disabled="role.policies.canChat.useDefault" :readonly="readonly">
-						<template #label>{{ i18n.ts.enable }}</template>
-					</MkSwitch>
-					<MkRange v-model="role.policies.canChat.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
-						<template #label>{{ i18n.ts._role.priority }}</template>
-					</MkRange>
-				</div>
-			</MkFolder>
-
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.mentionMax, 'mentionLimit'])">
 				<template #label>{{ i18n.ts._role._options.mentionMax }}</template>
 				<template #suffix>

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

@@ -51,14 +51,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkSwitch>
 						</MkFolder>
 
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canChat, 'canChat'])">
-							<template #label>{{ i18n.ts._role._options.canChat }}</template>
-							<template #suffix>{{ policies.canChat ? i18n.ts.yes : i18n.ts.no }}</template>
-							<MkSwitch v-model="policies.canChat">
-								<template #label>{{ i18n.ts.enable }}</template>
-							</MkSwitch>
-						</MkFolder>
-
 						<MkFolder v-if="matchQuery([i18n.ts._role._options.mentionMax, 'mentionLimit'])">
 							<template #label>{{ i18n.ts._role._options.mentionMax }}</template>
 							<template #suffix>{{ policies.mentionLimit }}</template>

packages/frontend/src/pages/chat/home.history.vue

@@ -1,204 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div class="_gaps">
-	<MkButton primary gradate :class="$style.start" @click="start"><i class="ti ti-plus"></i> {{ i18n.ts.startChat }}</MkButton>
-
-	<div v-if="history.length > 0" class="_gaps_s">
-		<MkA
-			v-for="item in history"
-			:key="item.id"
-			:class="[$style.message, { [$style.isMe]: item.isMe, [$style.isRead]: item.message.isRead }]"
-			class="_panel"
-			:to="item.message.toRoomId ? `/chat/room/${item.message.toRoomId}` : `/chat/user/${item.other!.id}`"
-		>
-			<MkAvatar v-if="item.other" :class="$style.messageAvatar" :user="item.other" indicator :preview="false"/>
-			<div :class="$style.messageBody">
-				<header v-if="item.message.toRoom" :class="$style.messageHeader">
-					<span :class="$style.messageHeaderName">{{ item.message.toRoom.name }}</span>
-					<MkTime :time="item.message.createdAt" :class="$style.messageHeaderTime"/>
-				</header>
-				<header v-else :class="$style.messageHeader">
-					<MkUserName :class="$style.messageHeaderName" :user="item.other!"/>
-					<MkAcct :class="$style.messageHeaderUsername" :user="item.other!"/>
-					<MkTime :time="item.message.createdAt" :class="$style.messageHeaderTime"/>
-				</header>
-				<div :class="$style.messageBodyText"><span v-if="item.isMe" :class="$style.youSaid">{{ i18n.ts.you }}:</span>{{ item.message.text }}</div>
-			</div>
-		</MkA>
-	</div>
-	<div v-if="!fetching && history.length == 0" class="_fullinfo">
-		<div>{{ i18n.ts._chat.noHistory }}</div>
-	</div>
-	<MkLoading v-if="fetching"/>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue';
-import * as Misskey from 'misskey-js';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { ensureSignin } from '@/i.js';
-import { useRouter } from '@/router.js';
-import * as os from '@/os.js';
-import { updateCurrentAccountPartial } from '@/accounts.js';
-
-const $i = ensureSignin();
-
-const router = useRouter();
-
-const fetching = ref(true);
-const history = ref<{
-	id: string;
-	message: Misskey.entities.ChatMessage;
-	other: Misskey.entities.ChatMessage['fromUser'] | Misskey.entities.ChatMessage['toUser'] | null;
-	isMe: boolean;
-}[]>([]);
-
-function start(ev: MouseEvent) {
-	os.popupMenu([{
-		text: i18n.ts._chat.individualChat,
-		caption: i18n.ts._chat.individualChat_description,
-		icon: 'ti ti-user',
-		action: () => { startUser(); },
-	}, { type: 'divider' }, {
-		type: 'parent',
-		text: i18n.ts._chat.roomChat,
-		caption: i18n.ts._chat.roomChat_description,
-		icon: 'ti ti-users-group',
-		children: [{
-			text: i18n.ts._chat.createRoom,
-			icon: 'ti ti-plus',
-			action: () => { createRoom(); },
-		}],
-	}], ev.currentTarget ?? ev.target);
-}
-
-async function startUser() {
-	os.selectUser().then(user => {
-		router.push(`/chat/user/${user.id}`);
-	});
-}
-
-async function createRoom() {
-	const { canceled, result } = await os.inputText({
-		title: i18n.ts.name,
-		minLength: 1,
-	});
-	if (canceled) return;
-
-	const room = await misskeyApi('chat/rooms/create', {
-		name: result,
-	});
-
-	router.push(`/chat/room/${room.id}`);
-}
-
-async function fetchHistory() {
-	fetching.value = true;
-
-	const [userMessages, roomMessages] = await Promise.all([
-		misskeyApi('chat/history', { room: false }),
-		misskeyApi('chat/history', { room: true }),
-	]);
-
-	history.value = [...userMessages, ...roomMessages]
-		.toSorted((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
-		.map(m => ({
-			id: m.id,
-			message: m,
-			other: m.room == null ? (m.fromUserId === $i.id ? m.toUser : m.fromUser) : null,
-			isMe: m.fromUserId === $i.id,
-		}));
-
-	fetching.value = false;
-
-	updateCurrentAccountPartial({ hasUnreadChatMessages: false });
-}
-
-onMounted(() => {
-	fetchHistory();
-});
-</script>
-
-<style lang="scss" module>
-.start {
-	margin: 0 auto;
-}
-
-.message {
-	position: relative;
-	display: flex;
-	padding: 16px 24px;
-
-	&.isRead,
-	&.isMe {
-		opacity: 0.8;
-	}
-
-	&:not(.isMe):not(.isRead) {
-		&::before {
-			content: '';
-			position: absolute;
-			top: 8px;
-			right: 8px;
-			width: 8px;
-			height: 8px;
-			border-radius: 100%;
-			background-color: var(--MI_THEME-accent);
-		}
-	}
-}
-
-.messageAvatar {
-	width: 50px;
-	height: 50px;
-	margin: 0 16px 0 0;
-}
-
-.messageBody {
-	flex: 1;
-	min-width: 0;
-}
-
-.messageHeader {
-	display: flex;
-	align-items: center;
-	margin-bottom: 2px;
-	white-space: nowrap;
-	overflow: clip;
-}
-
-.messageHeaderName {
-	margin: 0;
-	padding: 0;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	font-size: 1em;
-	font-weight: bold;
-}
-
-.messageHeaderUsername {
-	margin: 0 8px;
-}
-
-.messageHeaderTime {
-	margin-left: auto;
-}
-
-.messageBodyText {
-	overflow: hidden;
-	overflow-wrap: break-word;
-	font-size: 1.1em;
-}
-
-.youSaid {
-	font-weight: bold;
-	margin-right: 0.5em;
-}
-</style>

packages/frontend/src/pages/chat/home.invitations.vue

@@ -1,96 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div class="_gaps">
-	<div v-if="invitations.length > 0" class="_gaps_s">
-		<MkFolder v-for="invitation in invitations" :key="invitation.id" :defaultOpen="true">
-			<template #icon><i class="ti ti-users-group"></i></template>
-			<template #label>{{ invitation.room.name }}</template>
-			<template #suffix><MkTime :time="invitation.createdAt"/></template>
-			<template #footer>
-				<div class="_buttons">
-					<MkButton primary @click="join(invitation)"><i class="ti ti-plus"></i> {{ i18n.ts._chat.join }}</MkButton>
-					<MkButton danger @click="ignore(invitation)"><i class="ti ti-x"></i> {{ i18n.ts._chat.ignore }}</MkButton>
-				</div>
-			</template>
-
-			<div :class="$style.invitationBody">
-				<MkAvatar :user="invitation.room.owner" :class="$style.invitationBodyAvatar" link/>
-				<div>
-					<MkUserName :user="invitation.room.owner"/>
-				</div>
-			</div>
-		</MkFolder>
-	</div>
-	<div v-if="!fetching && invitations.length == 0" class="_fullinfo">
-		<div>{{ i18n.ts._chat.noInvitations }}</div>
-	</div>
-	<MkLoading v-if="fetching"/>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue';
-import * as Misskey from 'misskey-js';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { ensureSignin } from '@/i.js';
-import { useRouter } from '@/router.js';
-import * as os from '@/os.js';
-import MkFolder from '@/components/MkFolder.vue';
-
-const $i = ensureSignin();
-
-const router = useRouter();
-
-const fetching = ref(true);
-const invitations = ref<Misskey.entities.ChatRoomInvitation[]>([]);
-
-async function fetchInvitations() {
-	fetching.value = true;
-
-	const res = await misskeyApi('chat/rooms/invitations/inbox', {
-	});
-
-	invitations.value = res;
-
-	fetching.value = false;
-}
-
-async function join(invitation: Misskey.entities.ChatRoomInvitation) {
-	await misskeyApi('chat/rooms/join', {
-		roomId: invitation.room.id,
-	});
-
-	router.push(`/chat/room/${invitation.room.id}`);
-}
-
-async function ignore(invitation: Misskey.entities.ChatRoomInvitation) {
-	await misskeyApi('chat/rooms/invitations/ignore', {
-		roomId: invitation.room.id,
-	});
-
-	invitations.value = invitations.value.filter(i => i.id !== invitation.id);
-}
-
-onMounted(() => {
-	fetchInvitations();
-});
-</script>
-
-<style lang="scss" module>
-.invitationBody {
-	display: flex;
-	align-items: center;
-}
-
-.invitationBodyAvatar {
-	margin-right: 12px;
-	width: 50px;
-	height: 50px;
-}
-</style>

packages/frontend/src/pages/chat/home.ownedRooms.vue

@@ -1,57 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div class="_gaps">
-	<div v-if="rooms.length > 0" class="_gaps_s">
-		<MkA v-for="room in rooms" :key="room.id" :to="`/chat/room/${room.id}`" class="_panel" :class="$style.room">
-			<div>{{ room.name }}</div>
-		</MkA>
-	</div>
-	<div v-if="!fetching && rooms.length == 0" class="_fullinfo">
-		<div>{{ i18n.ts._chat.noRooms }}</div>
-	</div>
-	<MkLoading v-if="fetching"/>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue';
-import * as Misskey from 'misskey-js';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { ensureSignin } from '@/i.js';
-import { useRouter } from '@/router.js';
-import * as os from '@/os.js';
-
-const $i = ensureSignin();
-
-const router = useRouter();
-
-const fetching = ref(true);
-const rooms = ref<Misskey.entities.ChatRoom[]>([]);
-
-async function fetchRooms() {
-	fetching.value = true;
-
-	const res = await misskeyApi('chat/rooms/owned', {
-	});
-
-	rooms.value = res;
-
-	fetching.value = false;
-}
-
-onMounted(() => {
-	fetchRooms();
-});
-</script>
-
-<style lang="scss" module>
-.room {
-	padding: 16px;
-}
-</style>

packages/frontend/src/pages/chat/home.vue

@@ -1,56 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<PageWithHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs">
-	<MkSpacer :contentMax="700">
-		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
-			<XHistory v-if="tab === 'home'"/>
-			<XInvitations v-else-if="tab === 'invitations'"/>
-			<XOwnedRooms v-else-if="tab === 'ownedRooms'"/>
-		</MkHorizontalSwipe>
-	</MkSpacer>
-</PageWithHeader>
-</template>
-
-<script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue';
-import XHistory from './home.history.vue';
-import XInvitations from './home.invitations.vue';
-import XOwnedRooms from './home.ownedRooms.vue';
-import { i18n } from '@/i18n.js';
-import { definePage } from '@/page.js';
-import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
-
-const tab = ref('home');
-
-const headerActions = computed(() => []);
-
-const headerTabs = computed(() => [{
-	key: 'home',
-	title: i18n.ts._chat.history,
-	icon: 'ti ti-home',
-}, {
-	key: 'invitations',
-	title: i18n.ts._chat.invitations,
-	icon: 'ti ti-ticket',
-}, {
-	key: 'joiningRooms',
-	title: i18n.ts._chat.joiningRooms,
-	icon: 'ti ti-users-group',
-}, {
-	key: 'ownedRooms',
-	title: i18n.ts._chat.yourRooms,
-	icon: 'ti ti-settings',
-}]);
-
-definePage(() => ({
-	title: i18n.ts.chat,
-	icon: 'ti ti-message',
-}));
-</script>
-
-<style lang="scss" module>
-</style>

packages/frontend/src/pages/chat/message.vue

@@ -1,55 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<PageWithHeader>
-	<MkSpacer :contentMax="700">
-		<div v-if="initializing">
-			<MkLoading/>
-		</div>
-		<div v-else>
-			<XMessage :message="message" :user="message.fromUser"/>
-		</div>
-	</MkSpacer>
-</PageWithHeader>
-</template>
-
-<script lang="ts" setup>
-import { ref, useTemplateRef, computed, watch, onMounted, nextTick, onBeforeUnmount, onDeactivated, onActivated } from 'vue';
-import * as Misskey from 'misskey-js';
-import XMessage from './room.message.vue';
-import * as os from '@/os.js';
-import { useStream } from '@/stream.js';
-import { i18n } from '@/i18n.js';
-import { ensureSignin } from '@/i.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { definePage } from '@/page.js';
-import MkButton from '@/components/MkButton.vue';
-
-const props = defineProps<{
-	messageId?: string;
-}>();
-
-const initializing = ref(true);
-const message = ref<Misskey.entities.ChatMessage>();
-
-async function initialize() {
-	initializing.value = true;
-
-	message.value = await misskeyApi('chat/messages/show', {
-		messageId: props.messageId,
-	});
-
-	initializing.value = false;
-}
-
-onMounted(() => {
-	initialize();
-});
-
-definePage({
-	title: i18n.ts.chat,
-});
-</script>

packages/frontend/src/pages/chat/room.form.vue

@@ -1,371 +0,0 @@
-<template>
-<div
-	:class="$style.root"
-	@dragover.stop="onDragover"
-	@drop.stop="onDrop"
->
-	<textarea
-		ref="textEl"
-		v-model="text"
-		:class="$style.textarea"
-		class="_acrylic"
-		:placeholder="i18n.ts.inputMessageHere"
-		@keydown="onKeydown"
-		@paste="onPaste"
-	></textarea>
-	<footer :class="$style.footer">
-		<div v-if="file" :class="$style.file" @click="file = null">{{ file.name }}</div>
-		<div :class="$style.buttons">
-			<button class="_button" :class="$style.button" @click="chooseFile"><i class="ti ti-photo-plus"></i></button>
-			<button class="_button" :class="$style.button" @click="insertEmoji"><i class="ti ti-mood-happy"></i></button>
-			<button class="_button" :class="[$style.button, $style.send]" :disabled="!canSend || sending" :title="i18n.ts.send" @click="send">
-				<template v-if="!sending"><i class="ti ti-send"></i></template><template v-if="sending"><MkLoading :em="true"/></template>
-			</button>
-		</div>
-	</footer>
-	<input ref="fileEl" style="display: none;" type="file" @change="onChangeFile"/>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, watch, ref, shallowRef, computed } from 'vue';
-import * as Misskey from 'misskey-js';
-//import insertTextAtCursor from 'insert-text-at-cursor';
-import { throttle } from 'throttle-debounce';
-import { formatTimeString } from '@/utility/format-time-string.js';
-import { selectFile } from '@/utility/select-file.js';
-import * as os from '@/os.js';
-import { useStream } from '@/stream.js';
-import { i18n } from '@/i18n.js';
-//import { Autocomplete } from '@/utility/autocomplete.js';
-import { uploadFile } from '@/utility/upload.js';
-import { miLocalStorage } from '@/local-storage.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { prefer } from '@/preferences.js';
-
-const props = defineProps<{
-	user?: Misskey.entities.UserDetailed | null;
-	room?: Misskey.entities.ChatRoom | null;
-}>();
-
-const textEl = shallowRef<HTMLTextAreaElement>();
-const fileEl = shallowRef<HTMLInputElement>();
-
-const text = ref<string>('');
-const file = ref<Misskey.entities.DriveFile | null>(null);
-const sending = ref(false);
-
-const canSend = computed(() => (text.value != null && text.value !== '') || file.value != null);
-
-function getDraftKey() {
-	return props.user ? 'user:' + props.user.id : 'room:' + props.room?.id;
-}
-
-watch([text, file], saveDraft);
-
-async function onPaste(ev: ClipboardEvent) {
-	if (!ev.clipboardData) return;
-
-	const pastedFileName = 'yyyy-MM-dd HH-mm-ss [{{number}}]';
-
-	const clipboardData = ev.clipboardData;
-	const items = clipboardData.items;
-
-	if (items.length === 1) {
-		if (items[0].kind === 'file') {
-			const pastedFile = items[0].getAsFile();
-			if (!pastedFile) return;
-			const lio = pastedFile.name.lastIndexOf('.');
-			const ext = lio >= 0 ? pastedFile.name.slice(lio) : '';
-			const formatted = formatTimeString(new Date(pastedFile.lastModified), pastedFileName).replace(/{{number}}/g, '1') + ext;
-			if (formatted) upload(pastedFile, formatted);
-		}
-	} else {
-		if (items[0].kind === 'file') {
-			os.alert({
-				type: 'error',
-				text: i18n.ts.onlyOneFileCanBeAttached,
-			});
-		}
-	}
-}
-
-function onDragover(ev: DragEvent) {
-	if (!ev.dataTransfer) return;
-
-	const isFile = ev.dataTransfer.items[0].kind === 'file';
-	const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
-	if (isFile || isDriveFile) {
-		ev.preventDefault();
-		switch (ev.dataTransfer.effectAllowed) {
-			case 'all':
-			case 'uninitialized':
-			case 'copy':
-			case 'copyLink':
-			case 'copyMove':
-				ev.dataTransfer.dropEffect = 'copy';
-				break;
-			case 'linkMove':
-			case 'move':
-				ev.dataTransfer.dropEffect = 'move';
-				break;
-			default:
-				ev.dataTransfer.dropEffect = 'none';
-				break;
-		}
-	}
-}
-
-function onDrop(ev: DragEvent): void {
-	if (!ev.dataTransfer) return;
-
-	// ファイルだったら
-	if (ev.dataTransfer.files.length === 1) {
-		ev.preventDefault();
-		upload(ev.dataTransfer.files[0]);
-		return;
-	} else if (ev.dataTransfer.files.length > 1) {
-		ev.preventDefault();
-		os.alert({
-			type: 'error',
-			text: i18n.ts.onlyOneFileCanBeAttached,
-		});
-		return;
-	}
-
-	//#region ドライブのファイル
-	const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
-	if (driveFile != null && driveFile !== '') {
-		file.value = JSON.parse(driveFile);
-		ev.preventDefault();
-	}
-	//#endregion
-}
-
-function onKeydown(ev: KeyboardEvent) {
-	if ((ev.key === 'Enter') && (ev.ctrlKey || ev.metaKey)) {
-		send();
-	}
-}
-
-function chooseFile(ev: MouseEvent) {
-	selectFile(ev.currentTarget ?? ev.target, i18n.ts.selectFile).then(selectedFile => {
-		file.value = selectedFile;
-	});
-}
-
-function onChangeFile() {
-	if (fileEl.value.files![0]) upload(fileEl.value.files[0]);
-}
-
-function upload(fileToUpload: File, name?: string) {
-	uploadFile(fileToUpload, prefer.s.uploadFolder, name).then(res => {
-		file.value = res;
-	});
-}
-
-function send() {
-	if (!canSend.value) return;
-
-	sending.value = true;
-
-	if (props.user) {
-		misskeyApi('chat/messages/create-to-user', {
-			toUserId: props.user.id,
-			text: text.value ? text.value : undefined,
-			fileId: file.value ? file.value.id : undefined,
-		}).then(message => {
-			clear();
-		}).catch(err => {
-			console.error(err);
-		}).then(() => {
-			sending.value = false;
-		});
-	} else if (props.room) {
-		misskeyApi('chat/messages/create-to-room', {
-			toRoomId: props.room.id,
-			text: text.value ? text.value : undefined,
-			fileId: file.value ? file.value.id : undefined,
-		}).then(message => {
-			clear();
-		}).catch(err => {
-			console.error(err);
-		}).then(() => {
-			sending.value = false;
-		});
-	}
-}
-
-function clear() {
-	text.value = '';
-	file.value = null;
-	deleteDraft();
-}
-
-function saveDraft() {
-	const drafts = JSON.parse(miLocalStorage.getItem('chatMessageDrafts') || '{}');
-
-	drafts[getDraftKey()] = {
-		updatedAt: new Date(),
-		data: {
-			text: text.value,
-			file: file.value,
-		},
-	};
-
-	miLocalStorage.setItem('chatMessageDrafts', JSON.stringify(drafts));
-}
-
-function deleteDraft() {
-	const drafts = JSON.parse(miLocalStorage.getItem('chatMessageDrafts') || '{}');
-
-	delete drafts[getDraftKey()];
-
-	miLocalStorage.setItem('chatMessageDrafts', JSON.stringify(drafts));
-}
-
-async function insertEmoji(ev: MouseEvent) {
-	os.openEmojiPicker(ev.currentTarget ?? ev.target, {}, textEl);
-}
-
-onMounted(() => {
-	//autosize(textEl);
-
-	// TODO: detach when unmount
-	// TODO
-	//new Autocomplete(textEl, this, { model: 'text' });
-
-	// 書きかけの投稿を復元
-	const draft = JSON.parse(miLocalStorage.getItem('chatMessageDrafts') || '{}')[getDraftKey()];
-	if (draft) {
-		text.value = draft.data.text;
-		file.value = draft.data.file;
-	}
-});
-</script>
-
-<style lang="scss" module>
-.root {
-	position: relative;
-	border-bottom: none;
-	border-radius: 14px 14px 0 0;
-	overflow: clip;
-}
-
-.textarea {
-	cursor: auto;
-	display: block;
-	width: 100%;
-	min-width: 100%;
-	max-width: 100%;
-	min-height: 80px;
-	margin: 0;
-	padding: 16px 16px 0 16px;
-	resize: none;
-	font-size: 1em;
-	font-family: inherit;
-	outline: none;
-	border: none;
-	border-radius: 0;
-	box-shadow: none;
-	box-sizing: border-box;
-	color: var(--MI_THEME-fg);
-}
-
-.footer {
-	position: sticky;
-	bottom: 0;
-	background: var(--MI_THEME-panel);
-}
-
-.file {
-	padding: 8px;
-	color: var(--fg);
-	background: transparent;
-	cursor: pointer;
-}
-/*
-.files {
-	display: block;
-	margin: 0;
-	padding: 0 8px;
-	list-style: none;
-
-	&:after {
-		content: '';
-		display: block;
-		clear: both;
-	}
-
-	> li {
-		display: block;
-		float: left;
-		margin: 4px;
-		padding: 0;
-		width: 64px;
-		height: 64px;
-		background-color: #eee;
-		background-repeat: no-repeat;
-		background-position: center center;
-		background-size: cover;
-		cursor: move;
-
-		&:hover {
-			> .remove {
-				display: block;
-			}
-		}
-	}
-}
-
-.file-remove {
-	display: none;
-	position: absolute;
-	right: -6px;
-	top: -6px;
-	margin: 0;
-	padding: 0;
-	background: transparent;
-	outline: none;
-	border: none;
-	border-radius: 0;
-	box-shadow: none;
-	cursor: pointer;
-}
-*/
-
-.buttons {
-	display: flex;
-}
-
-.button {
-	margin: 0;
-	padding: 16px;
-	font-size: 1em;
-	font-weight: normal;
-	text-decoration: none;
-	transition: color 0.1s ease;
-
-	&:hover {
-		color: var(--accent);
-	}
-
-	&:active {
-		color: var(--accentDarken);
-		transition: color 0s ease;
-	}
-}
-.send {
-	margin-left: auto;
-	color: var(--accent);
-
-	&:hover {
-		color: var(--accentLighten);
-	}
-
-	&:active {
-		color: var(--accentDarken);
-		transition: color 0s ease;
-	}
-}
-</style>

packages/frontend/src/pages/chat/room.message.vue

@@ -1,134 +0,0 @@
-<template>
-<div :class="[$style.root, { [$style.isMe]: isMe }]">
-	<MkAvatar :class="$style.avatar" :user="user" :link="!isMe" :preview="false"/>
-	<div :class="$style.body">
-		<MkFukidashi :class="$style.fukidashi" :tail="isMe ? 'right' : 'left'" :accented="isMe">
-			<div v-if="!message.isDeleted" :class="$style.content">
-				<Mfm v-if="message.text" ref="text" class="_selectable" :text="message.text" :i="$i"/>
-				<div v-if="message.file" :class="$style.file">
-					<a :href="message.file.url" rel="noopener" target="_blank" :title="message.file.name">
-						<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"/>
-						<p v-else>{{ message.file.name }}</p>
-					</a>
-				</div>
-			</div>
-			<div v-else :class="$style.content">
-				<p>{{ i18n.ts.deleted }}</p>
-			</div>
-		</MkFukidashi>
-		<MkUrlPreview v-for="url in urls" :key="url" :url="url" style="margin: 8px 0;"/>
-		<div :class="$style.footer">
-			<button class="_textButton" style="color: currentColor;" @click="showMenu"><i class="ti ti-dots-circle-horizontal"></i></button>
-			<MkTime :class="$style.time" :time="message.createdAt"/>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, defineAsyncComponent } from 'vue';
-import * as mfm from 'mfm-js';
-import * as Misskey from 'misskey-js';
-import { url } from '@@/js/config.js';
-import type { MenuItem } from '@/types/menu.js';
-import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js';
-import MkUrlPreview from '@/components/MkUrlPreview.vue';
-import { ensureSignin } from '@/i.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { i18n } from '@/i18n.js';
-import MkFukidashi from '@/components/MkFukidashi.vue';
-import * as os from '@/os.js';
-
-const $i = ensureSignin();
-
-const props = defineProps<{
-	message: Misskey.entities.ChatMessageLite;
-	user: Misskey.entities.User;
-	isRoom?: boolean;
-}>();
-
-const isMe = computed(() => props.message.fromUserId === $i.id);
-const urls = computed(() => props.message.text ? extractUrlFromMfm(mfm.parse(props.message.text)) : []);
-
-function showMenu(ev: MouseEvent) {
-	const menu: MenuItem[] = [];
-	if (isMe.value) {
-		menu.push({
-			text: i18n.ts.delete,
-			icon: 'ti ti-trash',
-			danger: true,
-			action: () => {
-				misskeyApi('chat/messages/delete', {
-					messageId: props.message.id,
-				});
-			},
-		});
-	} else {
-		menu.push({
-			text: i18n.ts.reportAbuse,
-			icon: 'ti ti-exclamation-circle',
-			action: () => {
-				const localUrl = `${url}/chat/messages/${props.message.id}`;
-				const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
-					user: props.user,
-					initialComment: `${localUrl}\n-----\n`,
-				}, {
-					closed: () => dispose(),
-				});
-			},
-		});
-	}
-
-	os.popupMenu(menu, ev.currentTarget ?? ev.target);
-}
-</script>
-
-<style lang="scss" module>
-.root {
-	position: relative;
-	display: flex;
-
-	&.isMe {
-		flex-direction: row-reverse;
-		text-align: right;
-
-		.content {
-			color: var(--MI_THEME-fgOnAccent);
-		}
-
-		.footer {
-			flex-direction: row-reverse;
-		}
-	}
-}
-
-.avatar {
-	position: sticky;
-	top: calc(16px + var(--MI-stickyTop, 0px));
-	display: block;
-	width: 52px;
-	height: 52px;
-}
-
-.body {
-	margin: 0 12px;
-}
-
-.content {
-	overflow: hidden;
-	overflow-wrap: break-word;
-	word-break: break-word;
-}
-
-.footer {
-	display: flex;
-	flex-direction: row;
-	gap: 0.5em;
-	margin-top: 4px;
-	font-size: 75%;
-}
-
-.time {
-	opacity: 0.5;
-}
-</style>

packages/frontend/src/pages/chat/room.vue

@@ -1,324 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<PageWithHeader reversed :actions="headerActions">
-	<MkSpacer :contentMax="700">
-		<div v-if="initializing">
-			<MkLoading/>
-		</div>
-		<div v-else-if="messages.length === 0">
-			<div class="_gaps" style="text-align: center;">
-				<div>{{ i18n.ts._chat.noMessagesYet }}</div>
-				<template v-if="user">
-					<div v-if="user.chatScope === 'followers'">{{ i18n.ts._chat.thisUserAllowsChatOnlyFromFollowers }}</div>
-					<div v-else-if="user.chatScope === 'following'">{{ i18n.ts._chat.thisUserAllowsChatOnlyFromFollowing }}</div>
-					<div v-else-if="user.chatScope === 'mutual'">{{ i18n.ts._chat.thisUserAllowsChatOnlyFromMutualFollowing }}</div>
-					<div v-else>{{ i18n.ts._chat.thisUserNotAllowedChatAnyone }}</div>
-				</template>
-				<template v-else-if="room">
-					<div>{{ i18n.ts._chat.inviteUserToChat }}</div>
-				</template>
-			</div>
-		</div>
-		<div v-else class="_gaps">
-			<div v-if="canFetchMore">
-				<MkButton :class="$style.more" :wait="moreFetching" primary rounded @click="fetchMore">{{ i18n.ts.loadMore }}</MkButton>
-			</div>
-
-			<TransitionGroup
-				:enterActiveClass="prefer.s.animation ? $style.transition_x_enterActive : ''"
-				:leaveActiveClass="prefer.s.animation ? $style.transition_x_leaveActive : ''"
-				:enterFromClass="prefer.s.animation ? $style.transition_x_enterFrom : ''"
-				:leaveToClass="prefer.s.animation ? $style.transition_x_leaveTo : ''"
-				:moveClass="prefer.s.animation ? $style.transition_x_move : ''"
-				tag="div" class="_gaps"
-			>
-				<XMessage v-for="message in messages.toReversed()" :key="message.id" :message="message" :user="room != null ? message.fromUser : (message.fromUserId === $i.id ? $i : user)" :isRoom="room != null"/>
-			</TransitionGroup>
-		</div>
-	</MkSpacer>
-
-	<template #footer>
-		<div :class="$style.footer">
-			<div class="_gaps">
-				<Transition name="fade">
-					<div v-show="showIndicator" :class="$style.new">
-						<button class="_buttonPrimary" :class="$style.newButton" @click="onIndicatorClick">
-							<i class="fas ti-fw fa-arrow-circle-down" :class="$style.newIcon"></i>{{ i18n.ts.newMessageExists }}
-						</button>
-					</div>
-				</Transition>
-				<XForm v-if="!initializing" :user="user" :room="room" :class="$style.form"/>
-			</div>
-		</div>
-	</template>
-</PageWithHeader>
-</template>
-
-<script lang="ts" setup>
-import { ref, useTemplateRef, computed, watch, onMounted, nextTick, onBeforeUnmount, onDeactivated, onActivated } from 'vue';
-import * as Misskey from 'misskey-js';
-import { isTailVisible } from '@@/js/scroll.js';
-import XMessage from './room.message.vue';
-import XForm from './room.form.vue';
-import type { MenuItem } from '@/types/menu.js';
-import * as os from '@/os.js';
-import { useStream } from '@/stream.js';
-import * as sound from '@/utility/sound.js';
-import { i18n } from '@/i18n.js';
-import { ensureSignin } from '@/i.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { definePage } from '@/page.js';
-import { prefer } from '@/preferences.js';
-import MkButton from '@/components/MkButton.vue';
-
-const $i = ensureSignin();
-
-const props = defineProps<{
-	userId?: string;
-	roomId?: string;
-}>();
-
-const initializing = ref(true);
-const moreFetching = ref(false);
-const messages = ref<Misskey.entities.ChatMessage[]>([]);
-const canFetchMore = ref(false);
-const user = ref<Misskey.entities.UserDetailed | null>(null);
-const room = ref<Misskey.entities.ChatRoom | null>(null);
-const connection = ref<Misskey.ChannelConnection<Misskey.Channels['chatUser'] | Misskey.Channels['chatRoom']> | null>(null);
-const showIndicator = ref(false);
-
-async function initialize() {
-	const LIMIT = 20;
-
-	initializing.value = true;
-
-	if (props.userId) {
-		const [u, m] = await Promise.all([
-			misskeyApi('users/show', { userId: props.userId }),
-			misskeyApi('chat/messages/user-timeline', { userId: props.userId, limit: LIMIT }),
-		]);
-
-		user.value = u;
-		messages.value = m;
-
-		if (messages.value.length === LIMIT) {
-			canFetchMore.value = true;
-		}
-
-		connection.value = useStream().useChannel('chatUser', {
-			otherId: user.value.id,
-		});
-		connection.value.on('message', onMessage);
-		connection.value.on('deleted', onDeleted);
-	} else {
-		const [r, m] = await Promise.all([
-			misskeyApi('chat/rooms/show', { roomId: props.roomId }),
-			misskeyApi('chat/messages/room-timeline', { roomId: props.roomId, limit: LIMIT }),
-		]);
-
-		room.value = r;
-		messages.value = m;
-
-		if (messages.value.length === LIMIT) {
-			canFetchMore.value = true;
-		}
-
-		connection.value = useStream().useChannel('chatRoom', {
-			roomId: room.value.id,
-		});
-		connection.value.on('message', onMessage);
-		connection.value.on('deleted', onDeleted);
-	}
-
-	window.document.addEventListener('visibilitychange', onVisibilitychange);
-
-	initializing.value = false;
-}
-
-let isActivated = true;
-
-onActivated(() => {
-	isActivated = true;
-});
-
-onDeactivated(() => {
-	isActivated = false;
-});
-
-async function fetchMore() {
-	const LIMIT = 30;
-
-	moreFetching.value = true;
-
-	const newMessages = props.userId ? await misskeyApi('chat/messages/user-timeline', {
-		userId: user.value.id,
-		limit: LIMIT,
-		untilId: messages.value[messages.value.length - 1].id,
-	}) : await misskeyApi('chat/messages/room-timeline', {
-		roomId: room.value.id,
-		limit: LIMIT,
-		untilId: messages.value[messages.value.length - 1].id,
-	});
-
-	messages.value.push(...newMessages);
-
-	canFetchMore.value = newMessages.length === LIMIT;
-	moreFetching.value = false;
-}
-
-function onMessage(message: Misskey.entities.ChatMessage) {
-	//sound.play('chat');
-
-	messages.value.unshift(message);
-
-	// TODO: DOM的にバックグラウンドになっていないかどうかも考慮する
-	if (message.fromUserId !== $i.id && !window.document.hidden && isActivated) {
-		connection.value?.send('read', {
-			id: message.id,
-		});
-	}
-
-	if (message.fromUserId !== $i.id) {
-		//notifyNewMessage();
-	}
-}
-
-function onDeleted(id) {
-	const index = messages.value.findIndex(m => m.id === id);
-	if (index !== -1) {
-		messages.value.splice(index, 1);
-	}
-}
-
-function onIndicatorClick() {
-	showIndicator.value = false;
-}
-
-function notifyNewMessage() {
-	showIndicator.value = true;
-}
-
-function onVisibilitychange() {
-	if (window.document.hidden) return;
-	// TODO
-}
-
-onMounted(() => {
-	initialize();
-});
-
-onBeforeUnmount(() => {
-	connection.value?.dispose();
-	window.document.removeEventListener('visibilitychange', onVisibilitychange);
-});
-
-async function inviteUser() {
-	const invitee = await os.selectUser({ includeSelf: false, localOnly: true });
-	os.apiWithDialog('chat/rooms/invitations/create', {
-		roomId: room.value?.id,
-		userId: invitee.id,
-	});
-}
-
-function showMenu(ev: MouseEvent) {
-	const menuItems: MenuItem[] = [];
-
-	if (room.value) {
-		if (room.value.ownerId === $i.id) {
-			menuItems.push({
-				text: i18n.ts._chat.inviteUser,
-				icon: 'ti ti-user-plus',
-				action: () => {
-					inviteUser();
-				},
-			});
-		}
-	}
-
-	os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
-}
-
-const headerActions = computed(() => [{
-	icon: 'ti ti-dots',
-	handler: showMenu,
-}]);
-
-definePage(computed(() => !initializing.value ? user.value ? {
-	userName: user,
-	avatar: user,
-} : {
-	title: room.value?.name,
-	icon: 'ti ti-users',
-} : null));
-</script>
-
-<style lang="scss" module>
-.transition_x_move,
-.transition_x_enterActive,
-.transition_x_leaveActive {
-	transition: opacity 0.2s cubic-bezier(0,.5,.5,1), transform 0.2s cubic-bezier(0,.5,.5,1) !important;
-}
-.transition_x_enterFrom,
-.transition_x_leaveTo {
-	opacity: 0;
-	transform: translateY(80px);
-}
-.transition_x_leaveActive {
-	position: absolute;
-}
-
-.root {
-}
-
-.more {
-	margin: 0 auto;
-}
-
-.footer {
-	width: 100%;
-	padding-top: 8px;
-}
-
-.new {
-	width: 100%;
-	padding-bottom: 8px;
-	text-align: center;
-}
-
-.newButton {
-	display: inline-block;
-	margin: 0;
-	padding: 0 12px;
-	line-height: 32px;
-	font-size: 12px;
-	border-radius: 16px;
-}
-
-.newIcon {
-	display: inline-block;
-	margin-right: 8px;
-}
-
-.footer {
-
-}
-
-.form {
-	margin: 0 auto;
-	width: 100%;
-	max-width: 700px;
-}
-
-.fade-enter-active, .fade-leave-active {
-	transition: opacity 0.1s;
-}
-
-.fade-enter-from, .fade-leave-to {
-	transition: opacity 0.5s;
-	opacity: 0;
-}
-</style>

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

@@ -38,6 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<FormSection>
 		<div class="_gaps_m">
 			<FormLink @click="readAllNotifications">{{ i18n.ts.markAsReadAllNotifications }}</FormLink>
+			<FormLink @click="readAllUnreadNotes">{{ i18n.ts.markAsReadAllUnreadNotes }}</FormLink>
 		</div>
 	</FormSection>
 	<FormSection>
@@ -92,6 +93,10 @@ const pushRegistrationInServer = computed(() => allowButton.value?.pushRegistrat
 const sendReadMessage = computed(() => pushRegistrationInServer.value?.sendReadMessage || false);
 const userLists = await misskeyApi('users/lists/list');
 
+async function readAllUnreadNotes() {
+	await os.apiWithDialog('i/read-all-unread-notes');
+}
+
 async function readAllNotifications() {
 	await os.apiWithDialog('notifications/mark-all-as-read');
 }

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

@@ -78,20 +78,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkSwitch>
 		</SearchMarker>
 
-		<FormSection>
-			<SearchMarker :keywords="['chat']">
-				<MkSelect v-model="chatScope" @update:modelValue="save()">
-					<template #label><SearchLabel>{{ i18n.ts._chat.chatAllowedUsers }}</SearchLabel></template>
-					<option value="everyone">{{ i18n.ts._chat._chatAllowedUsers.everyone }}</option>
-					<option value="followers">{{ i18n.ts._chat._chatAllowedUsers.followers }}</option>
-					<option value="following">{{ i18n.ts._chat._chatAllowedUsers.following }}</option>
-					<option value="mutual">{{ i18n.ts._chat._chatAllowedUsers.mutual }}</option>
-					<option value="none">{{ i18n.ts._chat._chatAllowedUsers.none }}</option>
-					<template #caption>{{ i18n.ts._chat.chatAllowedUsers_note }}</template>
-				</MkSelect>
-			</SearchMarker>
-		</FormSection>
-
 		<SearchMarker :keywords="['lockdown']">
 			<FormSection>
 				<template #label><SearchLabel>{{ i18n.ts.lockdown }}</SearchLabel><span class="_beta">{{ i18n.ts.beta }}</span></template>
@@ -222,7 +208,6 @@ const hideOnlineStatus = ref($i.hideOnlineStatus);
 const publicReactions = ref($i.publicReactions);
 const followingVisibility = ref($i.followingVisibility);
 const followersVisibility = ref($i.followersVisibility);
-const chatScope = ref($i.chatScope);
 
 const makeNotesFollowersOnlyBefore_type = computed(() => {
 	if (makeNotesFollowersOnlyBefore.value == null) {
@@ -275,7 +260,6 @@ function save() {
 		publicReactions: !!publicReactions.value,
 		followingVisibility: followingVisibility.value,
 		followersVisibility: followersVisibility.value,
-		chatScope: chatScope.value,
 	});
 }
 

packages/frontend/src/preferences/def.ts

@@ -136,7 +136,6 @@ export const PREF_DEF = {
 			'clips',
 			'drive',
 			'followRequests',
-			'chat',
 			'-',
 			'explore',
 			'announcements',

packages/frontend/src/router.definition.ts

@@ -40,22 +40,6 @@ export const ROUTE_DEF = [{
 }, {
 	path: '/clips/:clipId',
 	component: page(() => import('@/pages/clip.vue')),
-}, {
-	path: '/chat',
-	component: page(() => import('@/pages/chat/home.vue')),
-	loginRequired: true,
-}, {
-	path: '/chat/user/:userId',
-	component: page(() => import('@/pages/chat/room.vue')),
-	loginRequired: true,
-}, {
-	path: '/chat/room/:roomId',
-	component: page(() => import('@/pages/chat/room.vue')),
-	loginRequired: true,
-}, {
-	path: '/chat/messages/:messageId',
-	component: page(() => import('@/pages/chat/message.vue')),
-	loginRequired: true,
 }, {
 	path: '/instance-info/:host',
 	component: page(() => import('@/pages/instance-info.vue')),

packages/frontend/src/style.scss

@@ -335,13 +335,13 @@ rt {
 ._gaps_m {
 	display: flex;
 	flex-direction: column;
-	gap: 21px;
+	gap: 1.5em;
 }
 
 ._gaps_s {
 	display: flex;
 	flex-direction: column;
-	gap: 10px;
+	gap: 0.75em;
 }
 
 ._gaps {

packages/frontend/src/types/menu.ts

@@ -15,16 +15,16 @@ export type MenuAction = (ev: MouseEvent) => void;
 
 export type MenuDivider = { type: 'divider' };
 export type MenuNull = undefined;
-export type MenuLabel = { type: 'label', text: string, caption?: string };
-export type MenuLink = { type: 'link', to: string, text: string, caption?: string, icon?: string, indicate?: boolean, avatar?: Misskey.entities.User };
-export type MenuA = { type: 'a', href: string, target?: string, download?: string, text: string, caption?: string, icon?: string, indicate?: boolean };
+export type MenuLabel = { type: 'label', text: string };
+export type MenuLink = { type: 'link', to: string, text: string, icon?: string, indicate?: boolean, avatar?: Misskey.entities.User };
+export type MenuA = { type: 'a', href: string, target?: string, download?: string, text: string, icon?: string, indicate?: boolean };
 export type MenuUser = { type: 'user', user: Misskey.entities.User, active?: boolean, indicate?: boolean, action: MenuAction };
-export type MenuSwitch = { type: 'switch', ref: Ref<boolean>, text: string, caption?: string, icon?: string, disabled?: boolean | Ref<boolean> };
-export type MenuButton = { type?: 'button', text: string, caption?: string, icon?: string, indicate?: boolean, danger?: boolean, active?: boolean | ComputedRef<boolean>, avatar?: Misskey.entities.User; action: MenuAction };
-export type MenuRadio = { type: 'radio', text: string, caption?: string, icon?: string, ref: Ref<MenuRadioOptionsDef[keyof MenuRadioOptionsDef]>, options: MenuRadioOptionsDef, disabled?: boolean | Ref<boolean> };
-export type MenuRadioOption = { type: 'radioOption', text: string, caption?: string, action: MenuAction; active?: boolean | ComputedRef<boolean> };
+export type MenuSwitch = { type: 'switch', ref: Ref<boolean>, text: string, icon?: string, disabled?: boolean | Ref<boolean> };
+export type MenuButton = { type?: 'button', text: string, icon?: string, indicate?: boolean, danger?: boolean, active?: boolean | ComputedRef<boolean>, avatar?: Misskey.entities.User; action: MenuAction };
+export type MenuRadio = { type: 'radio', text: string, icon?: string, ref: Ref<MenuRadioOptionsDef[keyof MenuRadioOptionsDef]>, options: MenuRadioOptionsDef, disabled?: boolean | Ref<boolean> };
+export type MenuRadioOption = { type: 'radioOption', text: string, action: MenuAction; active?: boolean | ComputedRef<boolean> };
 export type MenuComponent<T extends Component = any> = { type: 'component', component: T, props?: ComponentProps<T> };
-export type MenuParent = { type: 'parent', text: string, caption?: string, icon?: string, children: MenuItem[] | (() => Promise<MenuItem[]> | MenuItem[]) };
+export type MenuParent = { type: 'parent', text: string, icon?: string, children: MenuItem[] | (() => Promise<MenuItem[]> | MenuItem[]) };
 
 export type MenuPending = { type: 'pending' };
 

packages/frontend/src/utility/autogen/settings-search-index.ts

@@ -240,25 +240,20 @@ export const searchIndexes: SearchIndexItem[] = [
 				keywords: ['explore', i18n.ts.makeExplorableDescription],
 			},
 			{
-				id: 'xEYlOghao',
-				label: i18n.ts._chat.chatAllowedUsers,
-				keywords: ['chat'],
-			},
-			{
-				id: 'BnOtlyaAh',
+				id: '7vr04wKol',
 				children: [
 					{
-						id: 'BzMIVBpL0',
+						id: 'Av7fAaHv8',
 						label: i18n.ts._accountSettings.requireSigninToViewContents,
 						keywords: ['login', 'signin'],
 					},
 					{
-						id: 'jJUqPqBAv',
+						id: '5RbESWefG',
 						label: i18n.ts._accountSettings.makeNotesFollowersOnlyBefore,
 						keywords: ['follower', i18n.ts._accountSettings.makeNotesFollowersOnlyBeforeDescription],
 					},
 					{
-						id: 'ra10txIFV',
+						id: 'hdzwDs3qd',
 						label: i18n.ts._accountSettings.makeNotesHiddenBefore,
 						keywords: ['hidden', i18n.ts._accountSettings.makeNotesHiddenBeforeDescription],
 					},

packages/frontend/src/utility/get-user-menu.ts

@@ -151,16 +151,6 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 
 	const menuItems: MenuItem[] = [];
 
-	if (iAmModerator) {
-		menuItems.push({
-			icon: 'ti ti-user-exclamation',
-			text: i18n.ts.moderation,
-			action: () => {
-				router.push(`/admin/user/${user.id}`);
-			},
-		}, { type: 'divider' });
-	}
-
 	menuItems.push({
 		icon: 'ti ti-at',
 		text: i18n.ts.copyUsername,
@@ -169,14 +159,25 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 		},
 	});
 
-	menuItems.push({
-		icon: 'ti ti-share',
-		text: i18n.ts.copyProfileUrl,
-		action: () => {
-			const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`;
-			copyToClipboard(`${url}/${canonical}`);
-		},
-	});
+	if (notesSearchAvailable && (user.host == null || canSearchNonLocalNotes)) {
+		menuItems.push({
+			icon: 'ti ti-search',
+			text: i18n.ts.searchThisUsersNotes,
+			action: () => {
+				router.push(`/search?username=${encodeURIComponent(user.username)}${user.host != null ? '&host=' + encodeURIComponent(user.host) : ''}`);
+			},
+		});
+	}
+
+	if (iAmModerator) {
+		menuItems.push({
+			icon: 'ti ti-user-exclamation',
+			text: i18n.ts.moderation,
+			action: () => {
+				router.push(`/admin/user/${user.id}`);
+			},
+		});
+	}
 
 	menuItems.push({
 		icon: 'ti ti-rss',
@@ -209,18 +210,24 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 		});
 	}
 
-	if (notesSearchAvailable && (user.host == null || canSearchNonLocalNotes)) {
-		menuItems.push({
-			icon: 'ti ti-search',
-			text: i18n.ts.searchThisUsersNotes,
-			action: () => {
-				router.push(`/search?username=${encodeURIComponent(user.username)}${user.host != null ? '&host=' + encodeURIComponent(user.host) : ''}`);
-			},
-		});
-	}
+	menuItems.push({
+		icon: 'ti ti-share',
+		text: i18n.ts.copyProfileUrl,
+		action: () => {
+			const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`;
+			copyToClipboard(`${url}/${canonical}`);
+		},
+	});
 
 	if ($i) {
-		menuItems.push({ type: 'divider' }, {
+		menuItems.push({
+			icon: 'ti ti-mail',
+			text: i18n.ts.sendMessage,
+			action: () => {
+				const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${user.host}`;
+				os.post({ specified: user, initialText: `${canonical} ` });
+			},
+		}, { type: 'divider' }, {
 			icon: 'ti ti-pencil',
 			text: i18n.ts.editMemo,
 			action: editMemo,
@@ -356,18 +363,6 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 		//}
 
 		menuItems.push({ type: 'divider' }, {
-			icon: 'ti ti-mail',
-			text: i18n.ts.sendMessage,
-			action: () => {
-				const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${user.host}`;
-				os.post({ specified: user, initialText: `${canonical} ` });
-			},
-		}, {
-			type: 'link',
-			icon: 'ti ti-messages',
-			text: i18n.ts._chat.chatWithThisUser,
-			to: `/chat/user/${user.id}`,
-		}, { type: 'divider' }, {
 			icon: user.isMuted ? 'ti ti-eye' : 'ti ti-eye-off',
 			text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute,
 			action: toggleMute,