Merge pull request #11963 from misskey-dev/develop

Release: 2023.10.0

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"workspaceFolder": "/workspace",
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/pnpm:2": {
-			"version": "8.9.2"
+			"version": "8.8.0"
 		},
 		"ghcr.io/devcontainers/features/node:1": {
 			"version": "20.5.1"

CHANGELOG.md

@@ -12,42 +12,10 @@
 
 -->
 
-## 2023.x.x (unreleased)
-
-### General
-- Feat: アンテナでローカルの投稿のみ収集できるようになりました
-- Feat: サーバーサイレンス機能が追加されました
-- Enhance: 依存関係の更新
-- Enhance: 新規にフォローした人のをデフォルトでTLに追加できるように
-- Enhance: HTLとLTLを2023.10.0アップデート以前まで遡れるように
-- Enhance: フォロー/フォロー解除したときに過去分のHTLにも含まれる投稿が反映されるように
-- Change: nyaizeはAPIレスポンス時ではなく投稿時に一度だけ非可逆的に行われるようになりました
-
-### Client
-- Enhance: TLの返信表示オプションを記憶するように
-
-### Server
-- Enhance: ストリーミングAPIのパフォーマンスを向上
-- Fix: users/notesでDBから参照した際にチャンネル投稿のみ取得される問題を修正
-- Fix: コントロールパネルの設定項目が正しく保存できない問題を修正
-
-## 2023.10.1
-### General
-- Enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に
-
-### Client
-- Fix: 絵文字ピッカーで横に長いカスタム絵文字が見切れる問題を修正
-
-### Server
-- Fix: フォローしているユーザーからの自分の投稿への返信がタイムラインに含まれない問題を修正
-- Fix: users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
-
 ## 2023.10.0
 ### NOTE
 - 2023.9.2で導入されたノート編集機能はクオリティの高い実装が困難であることが判明したため撤回されました
 - アップデートを行うと、タイムラインが一時的にリセットされます
-	- アンテナ内のノートも含む
-- ソフトミュート設定はクライアントではなくサーバー側に保存されるようになったため、アップデートを行うとソフトミュートの設定がリセットされます
 
 ### Changes
 - API: users/notes, notes/local-timeline で fileType 指定はできなくなりました

locales/en-US.yml

@@ -195,7 +195,6 @@ perHour: "Per Hour"
 perDay: "Per Day"
 stopActivityDelivery: "Stop sending activities"
 blockThisInstance: "Block this instance"
-silenceThisInstance: "Silence this instance"
 operations: "Operations"
 software: "Software"
 version: "Version"
@@ -214,13 +213,6 @@ clearQueueConfirmText: "Any undelivered notes remaining in the queue will not be
 clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
 blockedInstances: "Blocked Instances"
-silencedInstances: "Silenced Instances"
-silencedInstancesDescription: "List the hostnames of the instances that you want to\
-  \ silence. Accounts in the listed instances are treated as \"Silenced\", can only make follow requests, and cannot mention local accounts if not followed. This will not affect the blocked instances."
-hiddenTags: "Hidden Hashtags"
-hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish\
-  \ to hide from trending and explore. Hidden hashtags are still discoverable via\
-  \ other means. Blocked instances are not affected even if listed here."
 blockedInstancesDescription: "List the hostnames of the instances that you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
@@ -802,7 +794,7 @@ active: "Active"
 offline: "Offline"
 notRecommended: "Not recommended"
 botProtection: "Bot Protection"
-instanceBlocking: "Blocked/Silenced Instances"
+instanceBlocking: "Blocked Instances"
 selectAccount: "Select account"
 switchAccount: "Switch account"
 enabled: "Enabled"

locales/index.d.ts

@@ -198,7 +198,6 @@ export interface Locale {
     "perDay": string;
     "stopActivityDelivery": string;
     "blockThisInstance": string;
-    "silenceThisInstance": string;
     "operations": string;
     "software": string;
     "version": string;
@@ -218,8 +217,6 @@ export interface Locale {
     "clearCachedFilesConfirm": string;
     "blockedInstances": string;
     "blockedInstancesDescription": string;
-    "silencedInstances": string;
-    "silencedInstancesDescription": string;
     "muteAndBlock": string;
     "mutedUsers": string;
     "blockedUsers": string;
@@ -537,7 +534,6 @@ export interface Locale {
     "deleteAll": string;
     "showFixedPostForm": string;
     "showFixedPostFormInChannel": string;
-    "withRepliesByDefaultForNewlyFollowed": string;
     "newNoteRecived": string;
     "sounds": string;
     "sound": string;
@@ -2055,7 +2051,6 @@ export interface Locale {
         "userLists": string;
         "excludeMutingUsers": string;
         "excludeInactiveUsers": string;
-        "withReplies": string;
     };
     "_charts": {
         "federation": string;

locales/ja-JP.yml

@@ -195,7 +195,6 @@ perHour: "1時間ごと"
 perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送を停止"
 blockThisInstance: "このサーバーをブロック"
-silenceThisInstance: "サーバーをサイレンス"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -214,9 +213,7 @@ clearQueueConfirmText: "未配達の投稿は配送されなくなります。
 clearCachedFiles: "キャッシュをクリア"
 clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除しますか？"
 blockedInstances: "ブロックしたサーバー"
-blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このインスタンスとやり取りできなくなります。"
-silencedInstances: "サイレンスしたサーバー"
-silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定します。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなります。ブロックしたインスタンスには影響しません。"
+blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このサーバーとやり取りできなくなります。サブドメインもブロックされます。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
@@ -534,7 +531,6 @@ serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
 showFixedPostFormInChannel: "タイムライン上部に投稿フォームを表示する(チャンネル)"
-withRepliesByDefaultForNewlyFollowed: "フォローする際、デフォルトで返信をTLに含むようにする"
 newNoteRecived: "新しいノートがあります"
 sounds: "サウンド"
 sound: "サウンド"
@@ -593,7 +589,7 @@ poll: "アンケート"
 useCw: "内容を隠す"
 enablePlayer: "プレイヤーを開く"
 disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ポストを展開する"
+expandTweet: "ツイートを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
 describeFile: "キャプションを付ける"
@@ -798,7 +794,7 @@ active: "アクティブ"
 offline: "オフライン"
 notRecommended: "非推奨"
 botProtection: "Botプロテクション"
-instanceBlocking: "サーバーブロック・サイレンス"
+instanceBlocking: "サーバーブロック"
 selectAccount: "アカウントを選択"
 switchAccount: "アカウントを切り替え"
 enabled: "有効"
@@ -1970,7 +1966,6 @@ _exportOrImport:
   userLists: "リスト"
   excludeMutingUsers: "ミュートしているユーザーを除外"
   excludeInactiveUsers: "使われていないアカウントを除外"
-  withReplies: "インポートした人による返信をTLに含むようにする"
 
 _charts:
   federation: "連合"

locales/zh-TW.yml

@@ -2141,11 +2141,3 @@ _moderationLogTypes:
   createAd: "建立廣告"
   deleteAd: "刪除廣告"
   updateAd: "更新廣告"
-_fileViewer:
-  title: "檔案詳細資訊"
-  type: "檔案類型 "
-  size: "檔案大小"
-  url: "URL"
-  uploadedAt: "加入日期"
-  attachedNotes: "含有附件的貼文"
-  thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2023.10.2-beta.1",
+	"version": "2023.10.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@8.9.2",
+	"packageManager": "pnpm@8.8.0",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -51,10 +51,10 @@
 		"typescript": "5.2.2"
 	},
 	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "6.8.0",
-		"@typescript-eslint/parser": "6.8.0",
+		"@typescript-eslint/eslint-plugin": "6.7.5",
+		"@typescript-eslint/parser": "6.7.5",
 		"cross-env": "7.0.3",
-		"cypress": "13.3.1",
+		"cypress": "13.3.0",
 		"eslint": "8.51.0",
 		"start-server-and-test": "2.0.1"
 	},

packages/backend/migration/1697247230117-InstanceSilence.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class InstanceSilence1697247230117 {
-    name = 'InstanceSilence1697247230117'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "silencedHosts" character varying(1024) array NOT NULL DEFAULT '{}'`);
-    }
-
-		async down(queryRunner) {
-				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
-		}
-}

packages/backend/migration/1697420555911-deleteCreatedAt.js

@@ -1,144 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class DeleteCreatedAt1697420555911 {
-    name = 'DeleteCreatedAt1697420555911'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_02878d441ceae15ce060b73daf"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_c8dfad3b72196dd1d6b5db168a"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_e11e649824a45d8ed01d597fd9"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_db2098070b2b5a523c58181f74"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_048a757923ed8b157e9895da53"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_1129c2ef687fc272df040bafaa"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_118ec703e596086fc4515acb39"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_b9a354f7941c1e779f3b33aea6"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_71cb7b435b7c0d4843317e7e16"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_11e71f2511589dcc8a4d3214f9"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_735a5544f9249d412255f47f95"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_582f8fab771a9040a12961f3e7"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_8f1a239bd077c8864a20c62c2c"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_f86d57fbca33c7a4e6897490cc"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_fbb4297c927a9b85e9cefa2eb1"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0fb627e1c2f753262a74f0562d"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_149d2e44785707548c82999b01"`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "app" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "announcement_read" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_list" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "auth_session" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "blocking" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "channel" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "channel_following" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "channel_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "clip" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "clip_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "follow_request" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "gallery_post" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "gallery_like" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "moderation_log" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "muting" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note_thread_muting" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "page_like" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "password_reset_request" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "promo_read" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "registration_ticket" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "registry_item" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "signin" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_list_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_pending" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "webhook" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "role_assignment" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "flash" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "flash_like" DROP COLUMN "createdAt"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "flash_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "flash" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "role_assignment" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "role" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "webhook" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_pending" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_list_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "signin" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "registry_item" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "registration_ticket" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "promo_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "password_reset_request" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "page_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "page" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note_thread_muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "moderation_log" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "gallery_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "gallery_post" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "follow_request" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "following" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "clip_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "clip" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "channel_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "channel_following" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "channel" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "blocking" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "auth_session" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_list" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "announcement_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "announcement" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "ad" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "app" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`CREATE INDEX "IDX_149d2e44785707548c82999b01" ON "flash" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0fb627e1c2f753262a74f0562d" ON "poll_vote" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fbb4297c927a9b85e9cefa2eb1" ON "page" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f86d57fbca33c7a4e6897490cc" ON "muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8f1a239bd077c8864a20c62c2c" ON "gallery_post" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_582f8fab771a9040a12961f3e7" ON "following" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_735a5544f9249d412255f47f95" ON "channel_favorite" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_11e71f2511589dcc8a4d3214f9" ON "channel_following" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_71cb7b435b7c0d4843317e7e16" ON "channel" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b9a354f7941c1e779f3b33aea6" ON "blocking" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_118ec703e596086fc4515acb39" ON "announcement" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_1129c2ef687fc272df040bafaa" ON "ad" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_048a757923ed8b157e9895da53" ON "app" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_db2098070b2b5a523c58181f74" ON "abuse_user_report" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e11e649824a45d8ed01d597fd9" ON "user" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c8dfad3b72196dd1d6b5db168a" ON "drive_file" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_02878d441ceae15ce060b73daf" ON "drive_folder" ("createdAt") `);
-    }
-}

packages/backend/migration/1697436246389-antenna-localOnly.js

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

packages/backend/migration/1697441463087-FollowRequestWithReplies.js

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

packages/backend/package.json

@@ -59,9 +59,9 @@
 		"@aws-sdk/client-s3": "3.412.0",
 		"@aws-sdk/lib-storage": "3.412.0",
 		"@smithy/node-http-handler": "2.1.5",
-		"@bull-board/api": "5.9.1",
-		"@bull-board/fastify": "5.9.1",
-		"@bull-board/ui": "5.9.1",
+		"@bull-board/api": "5.8.4",
+		"@bull-board/fastify": "5.8.4",
+		"@bull-board/ui": "5.8.4",
 		"@discordapp/twemoji": "14.1.2",
 		"@fastify/accepts": "4.2.0",
 		"@fastify/cookie": "9.1.0",
@@ -75,10 +75,10 @@
 		"@nestjs/core": "10.2.7",
 		"@nestjs/testing": "10.2.7",
 		"@peertube/http-signature": "1.7.0",
-		"@simplewebauthn/server": "8.3.2",
+		"@simplewebauthn/server": "8.2.0",
 		"@sinonjs/fake-timers": "11.1.0",
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.93",
+		"@swc/core": "1.3.92",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "6.0.1",
@@ -86,7 +86,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.12.4",
+		"bullmq": "4.12.3",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -97,7 +97,7 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "4.24.2",
+		"fastify": "4.23.2",
 		"feed": "4.2.2",
 		"file-type": "18.5.0",
 		"fluent-ffmpeg": "2.1.2",
@@ -121,13 +121,13 @@
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"ms": "3.0.0-canary.1",
-		"nanoid": "5.0.2",
+		"nanoid": "5.0.1",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
 		"nodemailer": "6.9.6",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
-		"oauth2orize": "1.12.0",
+		"oauth2orize": "1.11.1",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
 		"otpauth": "9.1.5",
@@ -155,7 +155,7 @@
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.21.12",
+		"systeminformation": "5.21.11",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.8",
@@ -173,36 +173,36 @@
 		"@jest/globals": "29.7.0",
 		"@simplewebauthn/typescript-types": "8.0.0",
 		"@swc/jest": "0.2.29",
-		"@types/accepts": "1.3.6",
-		"@types/archiver": "5.3.4",
-		"@types/bcryptjs": "2.4.5",
-		"@types/body-parser": "1.19.4",
+		"@types/accepts": "1.3.5",
+		"@types/archiver": "5.3.3",
+		"@types/bcryptjs": "2.4.4",
+		"@types/body-parser": "1.19.3",
 		"@types/cbor": "6.0.0",
-		"@types/color-convert": "2.0.2",
-		"@types/content-disposition": "0.5.7",
+		"@types/color-convert": "2.0.1",
+		"@types/content-disposition": "0.5.6",
 		"@types/fluent-ffmpeg": "2.1.22",
 		"@types/http-link-header": "1.0.3",
 		"@types/jest": "29.5.5",
-		"@types/js-yaml": "4.0.7",
+		"@types/js-yaml": "4.0.6",
 		"@types/jsdom": "21.1.3",
 		"@types/jsonld": "1.5.10",
 		"@types/jsrsasign": "10.5.9",
 		"@types/mime-types": "2.1.2",
 		"@types/ms": "0.7.32",
-		"@types/node": "20.8.6",
+		"@types/node": "20.8.4",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.11",
 		"@types/oauth": "0.9.2",
 		"@types/oauth2orize": "1.11.1",
 		"@types/oauth2orize-pkce": "0.1.0",
-		"@types/pg": "8.10.5",
+		"@types/pg": "8.10.4",
 		"@types/pug": "2.0.7",
 		"@types/punycode": "2.1.0",
 		"@types/qrcode": "1.5.2",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
 		"@types/rename": "1.0.5",
-		"@types/sanitize-html": "2.9.2",
+		"@types/sanitize-html": "2.9.1",
 		"@types/semver": "7.5.3",
 		"@types/sharp": "0.32.0",
 		"@types/simple-oauth2": "5.0.5",
@@ -211,9 +211,9 @@
 		"@types/tmp": "0.2.4",
 		"@types/vary": "1.1.1",
 		"@types/web-push": "3.6.1",
-		"@types/ws": "8.5.7",
-		"@typescript-eslint/eslint-plugin": "6.8.0",
-		"@typescript-eslint/parser": "6.8.0",
+		"@types/ws": "8.5.6",
+		"@typescript-eslint/eslint-plugin": "6.7.5",
+		"@typescript-eslint/parser": "6.7.5",
 		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
 		"eslint": "8.51.0",

packages/backend/src/core/AccountMoveService.ts

@@ -180,13 +180,13 @@ export class AccountMoveService {
 			{ muteeId: dst.id, expiresAt: IsNull() },
 		).then(mutings => mutings.map(muting => muting.muterId));
 
-		const newMutings: Map<string, { muterId: string; muteeId: string; expiresAt: Date | null; }> = new Map();
+		const newMutings: Map<string, { muterId: string; muteeId: string; createdAt: Date; expiresAt: Date | null; }> = new Map();
 
 		// 重複しないようにIDを生成
 		const genId = (): string => {
 			let id: string;
 			do {
-				id = this.idService.gen();
+				id = this.idService.genId();
 			} while (newMutings.has(id));
 			return id;
 		};
@@ -194,6 +194,7 @@ export class AccountMoveService {
 			if (existingMutingsMuterUserIds.includes(muting.muterId)) continue; // skip if already muted indefinitely
 			newMutings.set(genId(), {
 				...muting,
+				createdAt: new Date(),
 				muteeId: dst.id,
 			});
 		}
@@ -227,19 +228,20 @@ export class AccountMoveService {
 			},
 		}).then(memberships => memberships.map(membership => membership.userListId));
 
-		const newMemberships: Map<string, { userId: string; userListId: string; userListUserId: string; }> = new Map();
+		const newMemberships: Map<string, { createdAt: Date; userId: string; userListId: string; userListUserId: string; }> = new Map();
 
 		// 重複しないようにIDを生成
 		const genId = (): string => {
 			let id: string;
 			do {
-				id = this.idService.gen();
+				id = this.idService.genId();
 			} while (newMemberships.has(id));
 			return id;
 		};
 		for (const membership of oldMemberships) {
 			if (existingUserListIds.includes(membership.userListId)) continue; // skip if dst exists in this user's list
 			newMemberships.set(genId(), {
+				createdAt: new Date(),
 				userId: dst.id,
 				userListId: membership.userListId,
 				userListUserId: membership.userListUserId,

packages/backend/src/core/AnnouncementService.ts

@@ -53,7 +53,7 @@ export class AnnouncementService {
 			}))
 			.andWhere(new Brackets(qb => {
 				qb.orWhere('announcement.forExistingUsers = false');
-				qb.orWhere('announcement.id > :userId', { userId: user.id });
+				qb.orWhere('announcement.createdAt > :createdAt', { createdAt: user.createdAt });
 			}))
 			.andWhere(`announcement.id NOT IN (${ readsQuery.getQuery() })`);
 
@@ -65,7 +65,8 @@ export class AnnouncementService {
 	@bindThis
 	public async create(values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
 		const announcement = await this.announcementsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			updatedAt: null,
 			title: values.title,
 			text: values.text,
@@ -178,7 +179,8 @@ export class AnnouncementService {
 	public async read(user: MiUser, announcementId: MiAnnouncement['id']): Promise<void> {
 		try {
 			await this.announcementReadsRepository.insert({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
+				createdAt: new Date(),
 				announcementId: announcementId,
 				userId: user.id,
 			});
@@ -202,7 +204,7 @@ export class AnnouncementService {
 		const reads = me ? (options?.reads ?? await this.getReads(me.id)) : [];
 		return announcements.map(announcement => ({
 			id: announcement.id,
-			createdAt: this.idService.parse(announcement.id).date.toISOString(),
+			createdAt: announcement.createdAt.toISOString(),
 			updatedAt: announcement.updatedAt?.toISOString() ?? null,
 			text: announcement.text,
 			title: announcement.title,

packages/backend/src/core/AntennaService.ts

@@ -16,7 +16,7 @@ import type { AntennasRepository, UserListMembershipsRepository } from '@/models
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
+import { RedisTimelineService } from '@/core/RedisTimelineService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -39,7 +39,7 @@ export class AntennaService implements OnApplicationShutdown {
 
 		private utilityService: UtilityService,
 		private globalEventService: GlobalEventService,
-		private funoutTimelineService: FunoutTimelineService,
+		private redisTimelineService: RedisTimelineService,
 	) {
 		this.antennasFetched = false;
 		this.antennas = [];
@@ -57,12 +57,14 @@ export class AntennaService implements OnApplicationShutdown {
 				case 'antennaCreated':
 					this.antennas.push({
 						...body,
+						createdAt: new Date(body.createdAt),
 						lastUsedAt: new Date(body.lastUsedAt),
 					});
 					break;
 				case 'antennaUpdated':
 					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = {
 						...body,
+						createdAt: new Date(body.createdAt),
 						lastUsedAt: new Date(body.lastUsedAt),
 					};
 					break;
@@ -84,7 +86,7 @@ export class AntennaService implements OnApplicationShutdown {
 		const redisPipeline = this.redisForTimelines.pipeline();
 
 		for (const antenna of matchedAntennas) {
-			this.funoutTimelineService.push(`antennaTimeline:${antenna.id}`, note.id, 200, redisPipeline);
+			this.redisTimelineService.push(`antennaTimeline:${antenna.id}`, note.id, 200, redisPipeline);
 			this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
 		}
 
@@ -98,8 +100,6 @@ export class AntennaService implements OnApplicationShutdown {
 		if (note.visibility === 'specified') return false;
 		if (note.visibility === 'followers') return false;
 
-		if (antenna.localOnly && noteUser.host != null) return false;
-
 		if (!antenna.withReplies && note.replyId != null) return false;
 
 		if (antenna.src === 'home') {

packages/backend/src/core/ClipService.ts

@@ -46,7 +46,8 @@ export class ClipService {
 		}
 
 		const clip = await this.clipsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			userId: me.id,
 			name: name,
 			isPublic: isPublic,
@@ -108,7 +109,7 @@ export class ClipService {
 
 		try {
 			await this.clipNotesRepository.insert({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
 				noteId: noteId,
 				clipId: clip.id,
 			});

packages/backend/src/core/CoreModule.ts

@@ -61,7 +61,7 @@ import { FileInfoService } from './FileInfoService.js';
 import { SearchService } from './SearchService.js';
 import { ClipService } from './ClipService.js';
 import { FeaturedService } from './FeaturedService.js';
-import { FunoutTimelineService } from './FunoutTimelineService.js';
+import { RedisTimelineService } from './RedisTimelineService.js';
 import { ChartLoggerService } from './chart/ChartLoggerService.js';
 import FederationChart from './chart/charts/federation.js';
 import NotesChart from './chart/charts/notes.js';
@@ -190,7 +190,7 @@ const $FileInfoService: Provider = { provide: 'FileInfoService', useExisting: Fi
 const $SearchService: Provider = { provide: 'SearchService', useExisting: SearchService };
 const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService };
 const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService };
-const $FunoutTimelineService: Provider = { provide: 'FunoutTimelineService', useExisting: FunoutTimelineService };
+const $RedisTimelineService: Provider = { provide: 'RedisTimelineService', useExisting: RedisTimelineService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -323,7 +323,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		SearchService,
 		ClipService,
 		FeaturedService,
-		FunoutTimelineService,
+		RedisTimelineService,
 		ChartLoggerService,
 		FederationChart,
 		NotesChart,
@@ -449,7 +449,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$SearchService,
 		$ClipService,
 		$FeaturedService,
-		$FunoutTimelineService,
+		$RedisTimelineService,
 		$ChartLoggerService,
 		$FederationChart,
 		$NotesChart,
@@ -576,7 +576,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		SearchService,
 		ClipService,
 		FeaturedService,
-		FunoutTimelineService,
+		RedisTimelineService,
 		FederationChart,
 		NotesChart,
 		UsersChart,
@@ -701,7 +701,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$SearchService,
 		$ClipService,
 		$FeaturedService,
-		$FunoutTimelineService,
+		$RedisTimelineService,
 		$FederationChart,
 		$NotesChart,
 		$UsersChart,

packages/backend/src/core/CreateSystemUserService.ts

@@ -52,7 +52,8 @@ export class CreateSystemUserService {
 			if (exist) throw new Error('the user is already exists');
 
 			account = await transactionalEntityManager.insert(MiUser, {
-				id: this.idService.gen(),
+				id: this.idService.genId(),
+				createdAt: new Date(),
 				username: username,
 				usernameLower: username.toLowerCase(),
 				host: null,

packages/backend/src/core/CustomEmojiService.ts

@@ -69,7 +69,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		roleIdsThatCanBeUsedThisEmojiAsReaction: MiRole['id'][];
 	}, moderator?: MiUser): Promise<MiEmoji> {
 		const emoji = await this.emojisRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
 			updatedAt: new Date(),
 			name: data.name,
 			category: data.category,
@@ -331,7 +331,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 		const queryOrNull = async () => (await this.emojisRepository.findOneBy({
 			name,
-			host,
+			host: host ?? IsNull(),
 		})) ?? null;
 
 		const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull);

packages/backend/src/core/DriveService.ts

@@ -564,7 +564,8 @@ export class DriveService {
 		const folder = await fetchFolder();
 
 		let file = new MiDriveFile();
-		file.id = this.idService.gen();
+		file.id = this.idService.genId();
+		file.createdAt = new Date();
 		file.userId = user ? user.id : null;
 		file.userHost = user ? user.host : null;
 		file.folderId = folder !== null ? folder.id : null;

packages/backend/src/core/FederatedInstanceService.ts

@@ -56,7 +56,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 
 		if (index == null) {
 			const i = await this.instancesRepository.insert({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
 				host,
 				firstRetrievedAt: new Date(),
 			}).then(x => this.instancesRepository.findOneByOrFail(x.identifiers[0]));

packages/backend/src/core/HashtagService.ts

@@ -45,7 +45,7 @@ export class HashtagService {
 			await this.updateHashtag(user, tag, true, true);
 		}
 
-		for (const tag of user.tags.filter(x => !tags.includes(x))) {
+		for (const tag of (user.tags ?? []).filter(x => !tags.includes(x))) {
 			await this.updateHashtag(user, tag, true, false);
 		}
 	}
@@ -120,7 +120,7 @@ export class HashtagService {
 		} else {
 			if (isUserAttached) {
 				this.hashtagsRepository.insert({
-					id: this.idService.gen(),
+					id: this.idService.genId(),
 					name: tag,
 					mentionedUserIds: [],
 					mentionedUsersCount: 0,
@@ -137,7 +137,7 @@ export class HashtagService {
 				} as MiHashtag);
 			} else {
 				this.hashtagsRepository.insert({
-					id: this.idService.gen(),
+					id: this.idService.genId(),
 					name: tag,
 					mentionedUserIds: [user.id],
 					mentionedUsersCount: 1,

packages/backend/src/core/IdService.ts

@@ -26,21 +26,17 @@ export class IdService {
 		this.method = config.id.toLowerCase();
 	}
 
-	/**
-	 * 時間を元にIDを生成します(省略時は現在日時)
-	 * @param time 日時
-	 */
 	@bindThis
-	public gen(time?: number): string {
-		const t = (!time || (time > Date.now())) ? Date.now() : time;
+	public genId(date?: Date): string {
+		if (!date || (date > new Date())) date = new Date();
 
 		switch (this.method) {
-			case 'aid': return genAid(t);
-			case 'aidx': return genAidx(t);
-			case 'meid': return genMeid(t);
-			case 'meidg': return genMeidg(t);
-			case 'ulid': return ulid(t);
-			case 'objectid': return genObjectId(t);
+			case 'aid': return genAid(date);
+			case 'aidx': return genAidx(date);
+			case 'meid': return genMeid(date);
+			case 'meidg': return genMeidg(date);
+			case 'ulid': return ulid(date.getTime());
+			case 'objectid': return genObjectId(date);
 			default: throw new Error('unrecognized id generation method');
 		}
 	}

packages/backend/src/core/ModerationLogService.ts

@@ -24,7 +24,8 @@ export class ModerationLogService {
 	@bindThis
 	public async log<T extends typeof moderationLogTypes[number]>(moderator: { id: MiUser['id'] }, type: T, info?: ModerationLogPayloads[T]) {
 		await this.moderationLogsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			userId: moderator.id,
 			type: type,
 			info: (info as any) ?? {},

packages/backend/src/core/NoteCreateService.ts

@@ -54,9 +54,7 @@ import { RoleService } from '@/core/RoleService.js';
 import { MetaService } from '@/core/MetaService.js';
 import { SearchService } from '@/core/SearchService.js';
 import { FeaturedService } from '@/core/FeaturedService.js';
-import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
-import { nyaize } from '@/misc/nyaize.js';
-import { UtilityService } from '@/core/UtilityService.js';
+import { RedisTimelineService } from '@/core/RedisTimelineService.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -197,7 +195,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private idService: IdService,
 		private globalEventService: GlobalEventService,
 		private queueService: QueueService,
-		private funoutTimelineService: FunoutTimelineService,
+		private redisTimelineService: RedisTimelineService,
 		private noteReadService: NoteReadService,
 		private notificationService: NotificationService,
 		private relayService: RelayService,
@@ -216,7 +214,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private perUserNotesChart: PerUserNotesChart,
 		private activeUsersChart: ActiveUsersChart,
 		private instanceChart: InstanceChart,
-		private utilityService: UtilityService,
 	) { }
 
 	@bindThis
@@ -224,11 +221,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 		id: MiUser['id'];
 		username: MiUser['username'];
 		host: MiUser['host'];
+		createdAt: MiUser['createdAt'];
 		isBot: MiUser['isBot'];
-		isCat: MiUser['isCat'];
 	}, data: Option, silent = false): Promise<MiNote> {
-		let patsedText: mfm.MfmNode[] | null = null;
-
 		// チャンネル外にリプライしたら対象のスコープに合わせる
 		// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
 		if (data.reply && data.channel && data.reply.channelId !== data.channel.id) {
@@ -252,10 +247,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (data.channel != null) data.visibleUsers = [];
 		if (data.channel != null) data.localOnly = true;
 
-		const meta = await this.metaService.fetch();
-
 		if (data.visibility === 'public' && data.channel == null) {
-			const sensitiveWords = meta.sensitiveWords;
+			const sensitiveWords = (await this.metaService.fetch()).sensitiveWords;
 			if (this.isSensitive(data, sensitiveWords)) {
 				data.visibility = 'home';
 			} else if ((await this.roleService.getUserPolicies(user.id)).canPublicNote === false) {
@@ -263,12 +256,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 		}
 
-		const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host);
-
-		if (data.visibility === 'public' && inSilencedInstance && user.host !== null) {
-			data.visibility = 'home';
-		}
-
 		if (data.renote) {
 			switch (data.renote.visibility) {
 				case 'public':
@@ -315,25 +302,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 				data.text = data.text.slice(0, DB_MAX_NOTE_TEXT_LENGTH);
 			}
 			data.text = data.text.trim();
-
-			if (user.isCat) {
-				patsedText = mfm.parse(data.text);
-				function nyaizeNode(node: mfm.MfmNode) {
-					if (node.type === 'quote') return;
-					if (node.type === 'text') {
-						node.props.text = nyaize(node.props.text);
-					}
-					if (node.children) {
-						for (const child of node.children) {
-							nyaizeNode(child);
-						}
-					}
-				}
-				for (const node of patsedText) {
-					nyaizeNode(node);
-				}
-				data.text = mfm.toString(patsedText);
-			}
 		} else {
 			data.text = null;
 		}
@@ -344,7 +312,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		// Parse MFM if needed
 		if (!tags || !emojis || !mentionedUsers) {
-			const tokens = patsedText ?? (data.text ? mfm.parse(data.text)! : []);
+			const tokens = data.text ? mfm.parse(data.text)! : [];
 			const cwTokens = data.cw ? mfm.parse(data.cw)! : [];
 			const choiceTokens = data.poll && data.poll.choices
 				? concat(data.poll.choices.map(choice => mfm.parse(choice)!))
@@ -359,7 +327,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			mentionedUsers = data.apMentions ?? await this.extractMentionedUsers(user, combinedTokens);
 		}
 
-		tags = tags.filter(tag => Array.from(tag).length <= 128).splice(0, 32);
+		tags = tags.filter(tag => Array.from(tag ?? '').length <= 128).splice(0, 32);
 
 		if (data.reply && (user.id !== data.reply.userId) && !mentionedUsers.some(u => u.id === data.reply!.userId)) {
 			mentionedUsers.push(await this.usersRepository.findOneByOrFail({ id: data.reply!.userId }));
@@ -392,7 +360,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 	@bindThis
 	private async insertNote(user: { id: MiUser['id']; host: MiUser['host']; }, data: Option, tags: string[], emojis: string[], mentionedUsers: MinimumUser[]) {
 		const insert = new MiNote({
-			id: this.idService.gen(data.createdAt?.getTime()),
+			id: this.idService.genId(data.createdAt!),
+			createdAt: data.createdAt!,
 			fileIds: data.files ? data.files.map(file => file.id) : [],
 			replyId: data.reply ? data.reply.id : null,
 			renoteId: data.renote ? data.renote.id : null,
@@ -491,6 +460,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		id: MiUser['id'];
 		username: MiUser['username'];
 		host: MiUser['host'];
+		createdAt: MiUser['createdAt'];
 		isBot: MiUser['isBot'];
 	}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
 		const meta = await this.metaService.fetch();
@@ -584,7 +554,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 
 			// Pack the note
-			const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true });
+			const noteObj = await this.noteEntityService.pack(note);
 
 			this.globalEventService.publishNotesStream(noteObj);
 
@@ -851,9 +821,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 		const r = this.redisForTimelines.pipeline();
 
 		if (note.channelId) {
-			this.funoutTimelineService.push(`channelTimeline:${note.channelId}`, note.id, this.config.perChannelMaxNoteCacheCount, r);
+			this.redisTimelineService.push(`channelTimeline:${note.channelId}`, note.id, this.config.perChannelMaxNoteCacheCount, r);
 
-			this.funoutTimelineService.push(`userTimelineWithChannel:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
+			this.redisTimelineService.push(`userTimelineWithChannel:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 
 			const channelFollowings = await this.channelFollowingsRepository.find({
 				where: {
@@ -863,9 +833,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 
 			for (const channelFollowing of channelFollowings) {
-				this.funoutTimelineService.push(`homeTimeline:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
+				this.redisTimelineService.push(`homeTimeline:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`homeTimelineWithFiles:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+					this.redisTimelineService.push(`homeTimelineWithFiles:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
 				}
 			}
 		} else {
@@ -898,14 +868,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 				// 基本的にvisibleUserIdsには自身のidが含まれている前提であること
 				if (note.visibility === 'specified' && !note.visibleUserIds.some(v => v === following.followerId)) continue;
 
-				// 「自分自身への返信 or そのフォロワーへの返信」のどちらでもない場合
-				if (note.replyId && !(note.replyUserId === note.userId || note.replyUserId === following.followerId)) {
+				// 自分自身以外への返信
+				if (note.replyId && note.replyUserId !== note.userId) {
 					if (!following.withReplies) continue;
 				}
 
-				this.funoutTimelineService.push(`homeTimeline:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
+				this.redisTimelineService.push(`homeTimeline:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`homeTimelineWithFiles:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+					this.redisTimelineService.push(`homeTimelineWithFiles:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
 				}
 			}
 
@@ -916,41 +886,37 @@ export class NoteCreateService implements OnApplicationShutdown {
 					!note.visibleUserIds.some(v => v === userListMembership.userListUserId)
 				) continue;
 
-				// 「自分自身への返信 or そのリストの作成者への返信」のどちらでもない場合
-				if (note.replyId && !(note.replyUserId === note.userId || note.replyUserId === userListMembership.userListUserId)) {
+				// 自分自身以外への返信
+				if (note.replyId && note.replyUserId !== note.userId) {
 					if (!userListMembership.withReplies) continue;
 				}
 
-				this.funoutTimelineService.push(`userListTimeline:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax, r);
+				this.redisTimelineService.push(`userListTimeline:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`userListTimelineWithFiles:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax / 2, r);
+					this.redisTimelineService.push(`userListTimelineWithFiles:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax / 2, r);
 				}
 			}
 
 			if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id)) { // 自分自身のHTL
-				this.funoutTimelineService.push(`homeTimeline:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax, r);
+				this.redisTimelineService.push(`homeTimeline:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+					this.redisTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
 				}
 			}
 
 			// 自分自身以外への返信
 			if (note.replyId && note.replyUserId !== note.userId) {
-				this.funoutTimelineService.push(`userTimelineWithReplies:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
-
-				if (note.visibility === 'public' && note.userHost == null) {
-					this.funoutTimelineService.push('localTimelineWithReplies', note.id, 300, r);
-				}
+				this.redisTimelineService.push(`userTimelineWithReplies:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 			} else {
-				this.funoutTimelineService.push(`userTimeline:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
+				this.redisTimelineService.push(`userTimeline:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
-					this.funoutTimelineService.push(`userTimelineWithFiles:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax / 2 : meta.perRemoteUserUserTimelineCacheMax / 2, r);
+					this.redisTimelineService.push(`userTimelineWithFiles:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax / 2 : meta.perRemoteUserUserTimelineCacheMax / 2, r);
 				}
 
 				if (note.visibility === 'public' && note.userHost == null) {
-					this.funoutTimelineService.push('localTimeline', note.id, 1000, r);
+					this.redisTimelineService.push('localTimeline', note.id, 1000, r);
 					if (note.fileIds.length > 0) {
-						this.funoutTimelineService.push('localTimelineWithFiles', note.id, 500, r);
+						this.redisTimelineService.push('localTimelineWithFiles', note.id, 500, r);
 					}
 				}
 			}

packages/backend/src/core/NotePiningService.ts

@@ -71,7 +71,8 @@ export class NotePiningService {
 		}
 
 		await this.userNotePiningsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			userId: user.id,
 			noteId: note.id,
 		} as MiUserNotePining);

packages/backend/src/core/NoteReadService.ts

@@ -57,7 +57,7 @@ export class NoteReadService implements OnApplicationShutdown {
 		if (isThreadMuted) return;
 
 		const unread = {
-			id: this.idService.gen(),
+			id: this.idService.genId(),
 			noteId: note.id,
 			userId: userId,
 			isSpecified: params.isSpecified,

packages/backend/src/core/NotificationService.ts

@@ -125,7 +125,7 @@ export class NotificationService implements OnApplicationShutdown {
 		}
 
 		const notification = {
-			id: this.idService.gen(),
+			id: this.idService.genId(),
 			createdAt: new Date(),
 			type: type,
 			notifierId: notifierId,

packages/backend/src/core/PollService.ts

@@ -72,8 +72,10 @@ export class PollService {
 			throw new Error('already voted');
 		}
 
+		// Create vote
 		await this.pollVotesRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			noteId: note.id,
 			userId: user.id,
 			choice: choice,

packages/backend/src/core/QueryService.ts

@@ -52,14 +52,14 @@ export class QueryService {
 			q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
 			q.orderBy(`${q.alias}.id`, 'DESC');
 		} else if (sinceDate && untilDate) {
-			q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: this.idService.gen(sinceDate) });
-			q.andWhere(`${q.alias}.id < :untilId`, { untilId: this.idService.gen(untilDate) });
+			q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: this.idService.genId(new Date(sinceDate)) });
+			q.andWhere(`${q.alias}.id < :untilId`, { untilId: this.idService.genId(new Date(untilDate)) });
 			q.orderBy(`${q.alias}.id`, 'DESC');
 		} else if (sinceDate) {
-			q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: this.idService.gen(sinceDate) });
+			q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: this.idService.genId(new Date(sinceDate)) });
 			q.orderBy(`${q.alias}.id`, 'ASC');
 		} else if (untilDate) {
-			q.andWhere(`${q.alias}.id < :untilId`, { untilId: this.idService.gen(untilDate) });
+			q.andWhere(`${q.alias}.id < :untilId`, { untilId: this.idService.genId(new Date(untilDate)) });
 			q.orderBy(`${q.alias}.id`, 'DESC');
 		} else {
 			q.orderBy(`${q.alias}.id`, 'DESC');

packages/backend/src/core/QueueService.ts

@@ -237,11 +237,10 @@ export class QueueService {
 	}
 
 	@bindThis
-	public createImportFollowingJob(user: ThinUser, fileId: MiDriveFile['id'], withReplies?: boolean) {
+	public createImportFollowingJob(user: ThinUser, fileId: MiDriveFile['id']) {
 		return this.dbQueue.add('importFollowing', {
 			user: { id: user.id },
 			fileId: fileId,
-			withReplies,
 		}, {
 			removeOnComplete: true,
 			removeOnFail: true,
@@ -249,8 +248,8 @@ export class QueueService {
 	}
 
 	@bindThis
-	public createImportFollowingToDbJob(user: ThinUser, targets: string[], withReplies?: boolean) {
-		const jobs = targets.map(rel => this.generateToDbJobData('importFollowingToDb', { user, target: rel, withReplies }));
+	public createImportFollowingToDbJob(user: ThinUser, targets: string[]) {
+		const jobs = targets.map(rel => this.generateToDbJobData('importFollowingToDb', { user, target: rel }));
 		return this.dbQueue.addBulk(jobs);
 	}
 
@@ -343,7 +342,7 @@ export class QueueService {
 	}
 
 	@bindThis
-	public createFollowJob(followings: { from: ThinUser, to: ThinUser, requestId?: string, silent?: boolean, withReplies?: boolean }[]) {
+	public createFollowJob(followings: { from: ThinUser, to: ThinUser, requestId?: string, silent?: boolean }[]) {
 		const jobs = followings.map(rel => this.generateRelationshipJobData('follow', rel));
 		return this.relationshipQueue.addBulk(jobs);
 	}
@@ -385,7 +384,6 @@ export class QueueService {
 				to: { id: data.to.id },
 				silent: data.silent,
 				requestId: data.requestId,
-				withReplies: data.withReplies,
 			},
 			opts: {
 				removeOnComplete: true,

packages/backend/src/core/ReactionService.ts

@@ -148,12 +148,13 @@ export class ReactionService {
 					reaction = FALLBACK;
 				}
 			} else {
-				reaction = this.normalize(reaction);
+				reaction = this.normalize(reaction ?? null);
 			}
 		}
 
 		const record: MiNoteReaction = {
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			noteId: note.id,
 			userId: user.id,
 			reaction,

packages/backend/src/core/RedisTimelineService.ts

@@ -10,7 +10,7 @@ import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
 
 @Injectable()
-export class FunoutTimelineService {
+export class RedisTimelineService {
 	constructor(
 		@Inject(DI.redisForTimelines)
 		private redisForTimelines: Redis.Redis,
@@ -77,9 +77,4 @@ export class FunoutTimelineService {
 			);
 		});
 	}
-
-	@bindThis
-	public purge(name: string) {
-		return this.redisForTimelines.del('list:' + name);
-	}
 }

packages/backend/src/core/RelayService.ts

@@ -54,7 +54,7 @@ export class RelayService {
 	@bindThis
 	public async addRelay(inbox: string): Promise<MiRelay> {
 		const relay = await this.relaysRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
 			inbox,
 			status: 'requesting',
 		}).then(x => this.relaysRepository.findOneByOrFail(x.identifiers[0]));

packages/backend/src/core/RoleService.ts

@@ -20,7 +20,7 @@ import { IdService } from '@/core/IdService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import type { Packed } from '@/misc/json-schema.js';
-import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
+import { RedisTimelineService } from '@/core/RedisTimelineService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 export type RolePolicies = {
@@ -103,7 +103,7 @@ export class RoleService implements OnApplicationShutdown {
 		private globalEventService: GlobalEventService,
 		private idService: IdService,
 		private moderationLogService: ModerationLogService,
-		private funoutTimelineService: FunoutTimelineService,
+		private redisTimelineService: RedisTimelineService,
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
@@ -125,6 +125,7 @@ export class RoleService implements OnApplicationShutdown {
 					if (cached) {
 						cached.push({
 							...body,
+							createdAt: new Date(body.createdAt),
 							updatedAt: new Date(body.updatedAt),
 							lastUsedAt: new Date(body.lastUsedAt),
 						});
@@ -138,6 +139,7 @@ export class RoleService implements OnApplicationShutdown {
 						if (i > -1) {
 							cached[i] = {
 								...body,
+								createdAt: new Date(body.createdAt),
 								updatedAt: new Date(body.updatedAt),
 								lastUsedAt: new Date(body.lastUsedAt),
 							};
@@ -157,6 +159,7 @@ export class RoleService implements OnApplicationShutdown {
 					if (cached) {
 						cached.push({
 							...body,
+							createdAt: new Date(body.createdAt),
 							expiresAt: body.expiresAt ? new Date(body.expiresAt) : null,
 						});
 					}
@@ -195,10 +198,10 @@ export class RoleService implements OnApplicationShutdown {
 					return this.userEntityService.isRemoteUser(user);
 				}
 				case 'createdLessThan': {
-					return this.idService.parse(user.id).date.getTime() > (Date.now() - (value.sec * 1000));
+					return user.createdAt.getTime() > (Date.now() - (value.sec * 1000));
 				}
 				case 'createdMoreThan': {
-					return this.idService.parse(user.id).date.getTime() < (Date.now() - (value.sec * 1000));
+					return user.createdAt.getTime() < (Date.now() - (value.sec * 1000));
 				}
 				case 'followersLessThanOrEq': {
 					return user.followersCount <= value.value;
@@ -379,7 +382,7 @@ export class RoleService implements OnApplicationShutdown {
 
 	@bindThis
 	public async assign(userId: MiUser['id'], roleId: MiRole['id'], expiresAt: Date | null = null, moderator?: MiUser): Promise<void> {
-		const now = Date.now();
+		const now = new Date();
 
 		const role = await this.rolesRepository.findOneByOrFail({ id: roleId });
 
@@ -389,7 +392,7 @@ export class RoleService implements OnApplicationShutdown {
 		});
 
 		if (existing) {
-			if (existing.expiresAt && (existing.expiresAt.getTime() < now)) {
+			if (existing.expiresAt && (existing.expiresAt.getTime() < now.getTime())) {
 				await this.roleAssignmentsRepository.delete({
 					roleId: roleId,
 					userId: userId,
@@ -400,7 +403,8 @@ export class RoleService implements OnApplicationShutdown {
 		}
 
 		const created = await this.roleAssignmentsRepository.insert({
-			id: this.idService.gen(now),
+			id: this.idService.genId(),
+			createdAt: now,
 			expiresAt: expiresAt,
 			roleId: roleId,
 			userId: userId,
@@ -470,7 +474,7 @@ export class RoleService implements OnApplicationShutdown {
 		const redisPipeline = this.redisClient.pipeline();
 
 		for (const role of roles) {
-			this.funoutTimelineService.push(`roleTimeline:${role.id}`, note.id, 1000, redisPipeline);
+			this.redisTimelineService.push(`roleTimeline:${role.id}`, note.id, 1000, redisPipeline);
 			this.globalEventService.publishRoleTimelineStream(role.id, 'note', note);
 		}
 
@@ -481,7 +485,8 @@ export class RoleService implements OnApplicationShutdown {
 	public async create(values: Partial<MiRole>, moderator?: MiUser): Promise<MiRole> {
 		const date = new Date();
 		const created = await this.rolesRepository.insert({
-			id: this.idService.gen(date.getTime()),
+			id: this.idService.genId(),
+			createdAt: date,
 			updatedAt: date,
 			lastUsedAt: date,
 			name: values.name,

packages/backend/src/core/SearchService.ts

@@ -131,7 +131,7 @@ export class SearchService {
 
 			await this.meilisearchNoteIndex?.addDocuments([{
 				id: note.id,
-				createdAt: this.idService.parse(note.id).date.getTime(),
+				createdAt: note.createdAt.getTime(),
 				userId: note.userId,
 				userHost: note.userHost,
 				channelId: note.channelId,

packages/backend/src/core/SignupService.ts

@@ -120,7 +120,8 @@ export class SignupService {
 			if (exist) throw new Error(' the username is already used');
 
 			account = await transactionalEntityManager.save(new MiUser({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
+				createdAt: new Date(),
 				username: username,
 				usernameLower: username.toLowerCase(),
 				host: this.utilityService.toPunyNullable(host),

packages/backend/src/core/UserBlockingService.ts

@@ -68,7 +68,8 @@ export class UserBlockingService implements OnModuleInit {
 		]);
 
 		const blocking = {
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			blocker,
 			blockerId: blocker.id,
 			blockee,

packages/backend/src/core/UserFollowingService.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { Inject, Injectable, OnModuleInit, forwardRef } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { IsNull } from 'typeorm';
 import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
@@ -28,8 +28,6 @@ import { MetaService } from '@/core/MetaService.js';
 import { CacheService } from '@/core/CacheService.js';
 import type { Config } from '@/config.js';
 import { AccountMoveService } from '@/core/AccountMoveService.js';
-import { UtilityService } from '@/core/UtilityService.js';
-import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
 import Logger from '../logger.js';
 
 const logger = new Logger('following/create');
@@ -73,7 +71,6 @@ export class UserFollowingService implements OnModuleInit {
 		private instancesRepository: InstancesRepository,
 
 		private cacheService: CacheService,
-		private utilityService: UtilityService,
 		private userEntityService: UserEntityService,
 		private idService: IdService,
 		private queueService: QueueService,
@@ -84,7 +81,6 @@ export class UserFollowingService implements OnModuleInit {
 		private webhookService: WebhookService,
 		private apRendererService: ApRendererService,
 		private accountMoveService: AccountMoveService,
-		private funoutTimelineService: FunoutTimelineService,
 		private perUserFollowingChart: PerUserFollowingChart,
 		private instanceChart: InstanceChart,
 	) {
@@ -95,15 +91,7 @@ export class UserFollowingService implements OnModuleInit {
 	}
 
 	@bindThis
-	public async follow(
-		_follower: { id: MiUser['id'] },
-		_followee: { id: MiUser['id'] },
-		{ requestId, silent = false, withReplies }: {
-			requestId?: string,
-			silent?: boolean,
-			withReplies?: boolean,
-		} = {},
-	): Promise<void> {
+	public async follow(_follower: { id: MiUser['id'] }, _followee: { id: MiUser['id'] }, requestId?: string, silent = false): Promise<void> {
 		const [follower, followee] = await Promise.all([
 			this.usersRepository.findOneByOrFail({ id: _follower.id }),
 			this.usersRepository.findOneByOrFail({ id: _followee.id }),
@@ -130,16 +118,15 @@ export class UserFollowingService implements OnModuleInit {
 		}
 
 		const followeeProfile = await this.userProfilesRepository.findOneByOrFail({ userId: followee.id });
+
 		// フォロー対象が鍵アカウントである or
 		// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
-		// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである or
-		// フォロワーがローカルユーザーであり、フォロー対象がサイレンスされているサーバーである
+		// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである
 		// 上記のいずれかに当てはまる場合はすぐフォローせずにフォローリクエストを発行しておく
 		if (
 			followee.isLocked ||
 			(followeeProfile.carefulBot && follower.isBot) ||
-			(this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee) && process.env.FORCE_FOLLOW_REMOTE_USER_FOR_TESTING !== 'true') ||
-			(this.userEntityService.isLocalUser(followee) && this.userEntityService.isRemoteUser(follower) && this.utilityService.isSilencedHost((await this.metaService.fetch()).silencedHosts, follower.host))
+			(this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee) && process.env.FORCE_FOLLOW_REMOTE_USER_FOR_TESTING !== 'true')
 		) {
 			let autoAccept = false;
 
@@ -181,12 +168,12 @@ export class UserFollowingService implements OnModuleInit {
 			}
 
 			if (!autoAccept) {
-				await this.createFollowRequest(follower, followee, requestId, withReplies);
+				await this.createFollowRequest(follower, followee, requestId);
 				return;
 			}
 		}
 
-		await this.insertFollowingDoc(followee, follower, silent, withReplies);
+		await this.insertFollowingDoc(followee, follower, silent);
 
 		if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
 			const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, requestId), followee));
@@ -203,17 +190,16 @@ export class UserFollowingService implements OnModuleInit {
 			id: MiUser['id']; host: MiUser['host']; uri: MiUser['host']; inbox: MiUser['inbox']; sharedInbox: MiUser['sharedInbox']
 		},
 		silent = false,
-		withReplies?: boolean,
 	): Promise<void> {
 		if (follower.id === followee.id) return;
 
 		let alreadyFollowed = false as boolean;
 
 		await this.followingsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			followerId: follower.id,
 			followeeId: followee.id,
-			withReplies: withReplies,
 
 			// 非正規化
 			followerHost: follower.host,
@@ -290,8 +276,8 @@ export class UserFollowingService implements OnModuleInit {
 			this.perUserFollowingChart.update(follower, followee, true);
 		}
 
+		// Publish follow event
 		if (this.userEntityService.isLocalUser(follower) && !silent) {
-			// Publish follow event
 			this.userEntityService.pack(followee.id, follower, {
 				detail: true,
 			}).then(async packed => {
@@ -304,8 +290,6 @@ export class UserFollowingService implements OnModuleInit {
 					});
 				}
 			});
-
-			this.funoutTimelineService.purge(`homeTimeline:${follower.id}`);
 		}
 
 		// Publish followed event
@@ -359,8 +343,8 @@ export class UserFollowingService implements OnModuleInit {
 
 		this.decrementFollowing(following.follower, following.followee);
 
+		// Publish unfollow event
 		if (!silent && this.userEntityService.isLocalUser(follower)) {
-			// Publish unfollow event
 			this.userEntityService.pack(followee.id, follower, {
 				detail: true,
 			}).then(async packed => {
@@ -373,8 +357,6 @@ export class UserFollowingService implements OnModuleInit {
 					});
 				}
 			});
-
-			this.funoutTimelineService.purge(`homeTimeline:${follower.id}`);
 		}
 
 		if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
@@ -470,7 +452,6 @@ export class UserFollowingService implements OnModuleInit {
 			id: MiUser['id']; host: MiUser['host']; uri: MiUser['host']; inbox: MiUser['inbox']; sharedInbox: MiUser['sharedInbox'];
 		},
 		requestId?: string,
-		withReplies?: boolean,
 	): Promise<void> {
 		if (follower.id === followee.id) return;
 
@@ -484,11 +465,11 @@ export class UserFollowingService implements OnModuleInit {
 		if (blocked) throw new Error('blocked');
 
 		const followRequest = await this.followRequestsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			followerId: follower.id,
 			followeeId: followee.id,
 			requestId,
-			withReplies,
 
 			// 非正規化
 			followerHost: follower.host,
@@ -573,7 +554,7 @@ export class UserFollowingService implements OnModuleInit {
 			throw new IdentifiableError('8884c2dd-5795-4ac9-b27e-6a01d38190f9', 'No follow request.');
 		}
 
-		await this.insertFollowingDoc(followee, follower, false, request.withReplies);
+		await this.insertFollowingDoc(followee, follower);
 
 		if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
 			const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee as MiPartialLocalUser, request.requestId!), followee));
@@ -713,12 +694,4 @@ export class UserFollowingService implements OnModuleInit {
 			});
 		}
 	}
-
-	@bindThis
-	public getFollowees(userId: MiUser['id']) {
-		return this.followingsRepository.createQueryBuilder('following')
-			.select('following.followeeId')
-			.where('following.followerId = :followerId', { followerId: userId })
-			.getMany();
-	}
 }

packages/backend/src/core/UserListService.ts

@@ -93,7 +93,8 @@ export class UserListService implements OnApplicationShutdown {
 		}
 
 		await this.userListMembershipsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			userId: target.id,
 			userListId: list.id,
 			userListUserId: list.userId,

packages/backend/src/core/UserMutingService.ts

@@ -26,7 +26,8 @@ export class UserMutingService {
 	@bindThis
 	public async mute(user: MiUser, target: MiUser, expiresAt: Date | null = null): Promise<void> {
 		await this.mutingsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			expiresAt: expiresAt ?? null,
 			muterId: user.id,
 			muteeId: target.id,

packages/backend/src/core/UtilityService.ts

@@ -35,12 +35,6 @@ export class UtilityService {
 		return blockedHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`));
 	}
 
-	@bindThis
-	public isSilencedHost(silencedHosts: string[] | undefined, host: string | null): boolean {
-		if (!silencedHosts || host == null) return false;
-		return silencedHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`));
-	}
-
 	@bindThis
 	public extractDbHost(uri: string): string {
 		const url = new URL(uri);

packages/backend/src/core/WebhookService.ts

@@ -51,6 +51,7 @@ export class WebhookService implements OnApplicationShutdown {
 					if (body.active) {
 						this.webhooks.push({
 							...body,
+							createdAt: new Date(body.createdAt),
 							latestSentAt: body.latestSentAt ? new Date(body.latestSentAt) : null,
 						});
 					}
@@ -61,11 +62,13 @@ export class WebhookService implements OnApplicationShutdown {
 						if (i > -1) {
 							this.webhooks[i] = {
 								...body,
+								createdAt: new Date(body.createdAt),
 								latestSentAt: body.latestSentAt ? new Date(body.latestSentAt) : null,
 							};
 						} else {
 							this.webhooks.push({
 								...body,
+								createdAt: new Date(body.createdAt),
 								latestSentAt: body.latestSentAt ? new Date(body.latestSentAt) : null,
 							});
 						}

packages/backend/src/core/activitypub/ApInboxService.ts

@@ -164,7 +164,7 @@ export class ApInboxService {
 		}
 
 		// don't queue because the sender may attempt again when timeout
-		await this.userFollowingService.follow(actor, followee, { requestId: activity.id });
+		await this.userFollowingService.follow(actor, followee, activity.id);
 		return 'ok';
 	}
 
@@ -514,7 +514,8 @@ export class ApInboxService {
 		if (users.length < 1) return 'skip';
 
 		await this.abuseUserReportsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			targetUserId: users[0].id,
 			targetUserHost: users[0].host,
 			reporterId: actor.id,

packages/backend/src/core/activitypub/ApRendererService.ts

@@ -27,7 +27,6 @@ import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFil
 import { bindThis } from '@/decorators.js';
 import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { isNotNull } from '@/misc/is-not-null.js';
-import { IdService } from '@/core/IdService.js';
 import { LdSignatureService } from './LdSignatureService.js';
 import { ApMfmService } from './ApMfmService.js';
 import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
@@ -60,7 +59,6 @@ export class ApRendererService {
 		private userKeypairService: UserKeypairService,
 		private apMfmService: ApMfmService,
 		private mfmService: MfmService,
-		private idService: IdService,
 	) {
 	}
 
@@ -107,7 +105,7 @@ export class ApRendererService {
 			id: `${this.config.url}/notes/${note.id}/activity`,
 			actor: this.userEntityService.genLocalUserUri(note.userId),
 			type: 'Announce',
-			published: this.idService.parse(note.id).date.toISOString(),
+			published: note.createdAt.toISOString(),
 			to,
 			cc,
 			object,
@@ -139,7 +137,7 @@ export class ApRendererService {
 			id: `${this.config.url}/notes/${note.id}/activity`,
 			actor: this.userEntityService.genLocalUserUri(note.userId),
 			type: 'Create',
-			published: this.idService.parse(note.id).date.toISOString(),
+			published: note.createdAt.toISOString(),
 			object,
 		};
 
@@ -439,7 +437,7 @@ export class ApRendererService {
 			},
 			_misskey_quote: quote,
 			quoteUrl: quote,
-			published: this.idService.parse(note.id).date.toISOString(),
+			published: note.createdAt.toISOString(),
 			to,
 			cc,
 			inReplyTo,

packages/backend/src/core/activitypub/models/ApNoteService.ts

@@ -386,7 +386,7 @@ export class ApNoteService {
 			this.logger.info(`register emoji host=${host}, name=${name}`);
 
 			return await this.emojisRepository.insert({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
 				host,
 				name,
 				uri: tag.id,

packages/backend/src/core/activitypub/models/ApPersonService.ts

@@ -295,9 +295,10 @@ export class ApPersonService implements OnModuleInit {
 			// Start transaction
 			await this.db.transaction(async transactionalEntityManager => {
 				user = await transactionalEntityManager.save(new MiUser({
-					id: this.idService.gen(),
+					id: this.idService.genId(),
 					avatarId: null,
 					bannerId: null,
+					createdAt: new Date(),
 					lastFetchedAt: new Date(),
 					name: truncate(person.name, nameLength),
 					isLocked: person.manuallyApprovesFollowers,
@@ -606,7 +607,8 @@ export class ApPersonService implements OnModuleInit {
 			for (const note of featuredNotes.filter((note): note is MiNote => note != null)) {
 				td -= 1000;
 				transactionalEntityManager.insert(MiUserNotePining, {
-					id: this.idService.gen(Date.now() + td),
+					id: this.idService.genId(new Date(Date.now() + td)),
+					createdAt: new Date(),
 					userId: user.id,
 					noteId: note.id,
 				});

packages/backend/src/core/chart/charts/active-users.ts

@@ -9,7 +9,6 @@ import { AppLockService } from '@/core/AppLockService.js';
 import type { MiUser } from '@/models/User.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/active-users.js';
@@ -30,7 +29,6 @@ export default class ActiveUsersChart extends Chart<typeof schema> { // eslint-d
 
 		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
-		private idService: IdService,
 	) {
 		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
 	}
@@ -44,21 +42,20 @@ export default class ActiveUsersChart extends Chart<typeof schema> { // eslint-d
 	}
 
 	@bindThis
-	public async read(user: { id: MiUser['id'], host: null }): Promise<void> {
-		const createdAt = this.idService.parse(user.id).date;
+	public async read(user: { id: MiUser['id'], host: null, createdAt: MiUser['createdAt'] }): Promise<void> {
 		await this.commit({
 			'read': [user.id],
-			'registeredWithinWeek': (Date.now() - createdAt.getTime() < week) ? [user.id] : [],
-			'registeredWithinMonth': (Date.now() - createdAt.getTime() < month) ? [user.id] : [],
-			'registeredWithinYear': (Date.now() - createdAt.getTime() < year) ? [user.id] : [],
-			'registeredOutsideWeek': (Date.now() - createdAt.getTime() > week) ? [user.id] : [],
-			'registeredOutsideMonth': (Date.now() - createdAt.getTime() > month) ? [user.id] : [],
-			'registeredOutsideYear': (Date.now() - createdAt.getTime() > year) ? [user.id] : [],
+			'registeredWithinWeek': (Date.now() - user.createdAt.getTime() < week) ? [user.id] : [],
+			'registeredWithinMonth': (Date.now() - user.createdAt.getTime() < month) ? [user.id] : [],
+			'registeredWithinYear': (Date.now() - user.createdAt.getTime() < year) ? [user.id] : [],
+			'registeredOutsideWeek': (Date.now() - user.createdAt.getTime() > week) ? [user.id] : [],
+			'registeredOutsideMonth': (Date.now() - user.createdAt.getTime() > month) ? [user.id] : [],
+			'registeredOutsideYear': (Date.now() - user.createdAt.getTime() > year) ? [user.id] : [],
 		});
 	}
 
 	@bindThis
-	public async write(user: { id: MiUser['id'], host: null }): Promise<void> {
+	public async write(user: { id: MiUser['id'], host: null, createdAt: MiUser['createdAt'] }): Promise<void> {
 		await this.commit({
 			'write': [user.id],
 		});

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

@@ -9,7 +9,6 @@ import type { AbuseUserReportsRepository } from '@/models/_.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -19,7 +18,6 @@ export class AbuseUserReportEntityService {
 		private abuseUserReportsRepository: AbuseUserReportsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -31,7 +29,7 @@ export class AbuseUserReportEntityService {
 
 		return await awaitAll({
 			id: report.id,
-			createdAt: this.idService.parse(report.id).date.toISOString(),
+			createdAt: report.createdAt.toISOString(),
 			comment: report.comment,
 			resolved: report.resolved,
 			reporterId: report.reporterId,

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

@@ -9,15 +9,12 @@ import type { AntennasRepository } from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
 import type { MiAntenna } from '@/models/Antenna.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 
 @Injectable()
 export class AntennaEntityService {
 	constructor(
 		@Inject(DI.antennasRepository)
 		private antennasRepository: AntennasRepository,
-
-		private idService: IdService,
 	) {
 	}
 
@@ -29,7 +26,7 @@ export class AntennaEntityService {
 
 		return {
 			id: antenna.id,
-			createdAt: this.idService.parse(antenna.id).date.toISOString(),
+			createdAt: antenna.createdAt.toISOString(),
 			name: antenna.name,
 			keywords: antenna.keywords,
 			excludeKeywords: antenna.excludeKeywords,
@@ -37,7 +34,6 @@ export class AntennaEntityService {
 			userListId: antenna.userListId,
 			users: antenna.users,
 			caseSensitive: antenna.caseSensitive,
-			localOnly: antenna.localOnly,
 			notify: antenna.notify,
 			withReplies: antenna.withReplies,
 			withFile: antenna.withFile,

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

@@ -11,7 +11,6 @@ import type { Packed } from '@/misc/json-schema.js';
 import type { MiBlocking } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -21,7 +20,6 @@ export class BlockingEntityService {
 		private blockingsRepository: BlockingsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -34,7 +32,7 @@ export class BlockingEntityService {
 
 		return await awaitAll({
 			id: blocking.id,
-			createdAt: this.idService.parse(blocking.id).date.toISOString(),
+			createdAt: blocking.createdAt.toISOString(),
 			blockeeId: blocking.blockeeId,
 			blockee: this.userEntityService.pack(blocking.blockeeId, me, {
 				detail: true,

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

@@ -11,7 +11,6 @@ import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiChannel } from '@/models/Channel.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { DriveFileEntityService } from './DriveFileEntityService.js';
 import { NoteEntityService } from './NoteEntityService.js';
 import { In } from 'typeorm';
@@ -39,7 +38,6 @@ export class ChannelEntityService {
 
 		private noteEntityService: NoteEntityService,
 		private driveFileEntityService: DriveFileEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -83,7 +81,7 @@ export class ChannelEntityService {
 
 		return {
 			id: channel.id,
-			createdAt: this.idService.parse(channel.id).date.toISOString(),
+			createdAt: channel.createdAt.toISOString(),
 			lastNotedAt: channel.lastNotedAt ? channel.lastNotedAt.toISOString() : null,
 			name: channel.name,
 			description: channel.description,

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

@@ -11,7 +11,6 @@ import type { Packed } from '@/misc/json-schema.js';
 import type { } from '@/models/Blocking.js';
 import type { MiClip } from '@/models/Clip.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -24,7 +23,6 @@ export class ClipEntityService {
 		private clipFavoritesRepository: ClipFavoritesRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -38,7 +36,7 @@ export class ClipEntityService {
 
 		return await awaitAll({
 			id: clip.id,
-			createdAt: this.idService.parse(clip.id).date.toISOString(),
+			createdAt: clip.createdAt.toISOString(),
 			lastClippedAt: clip.lastClippedAt ? clip.lastClippedAt.toISOString() : null,
 			userId: clip.userId,
 			user: this.userEntityService.pack(clip.user ?? clip.userId),

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

@@ -17,7 +17,6 @@ import { deepClone } from '@/misc/clone.js';
 import { bindThis } from '@/decorators.js';
 import { isMimeImage } from '@/misc/is-mime-image.js';
 import { isNotNull } from '@/misc/is-not-null.js';
-import { IdService } from '@/core/IdService.js';
 import { UtilityService } from '../UtilityService.js';
 import { VideoProcessingService } from '../VideoProcessingService.js';
 import { UserEntityService } from './UserEntityService.js';
@@ -45,7 +44,6 @@ export class DriveFileEntityService {
 		private utilityService: UtilityService,
 		private driveFolderEntityService: DriveFolderEntityService,
 		private videoProcessingService: VideoProcessingService,
-		private idService: IdService,
 	) {
 	}
 
@@ -90,7 +88,7 @@ export class DriveFileEntityService {
 		if (file.type.startsWith('video')) {
 			if (file.thumbnailUrl) return file.thumbnailUrl;
 
-			return this.videoProcessingService.getExternalVideoThumbnailUrl(file.webpublicUrl ?? file.url);
+			return this.videoProcessingService.getExternalVideoThumbnailUrl(file.webpublicUrl ?? file.url ?? file.uri);
 		} else if (file.uri != null && file.userHost != null && this.config.externalMediaProxyEnabled) {
 			// 動画ではなくリモートかつメディアプロキシ
 			return this.getProxiedUrl(file.uri, 'static');
@@ -145,7 +143,7 @@ export class DriveFileEntityService {
 			.select('SUM(file.size)', 'sum')
 			.getRawOne();
 
-		return parseInt(sum, 10) || 0;
+		return parseInt(sum, 10) ?? 0;
 	}
 
 	@bindThis
@@ -157,7 +155,7 @@ export class DriveFileEntityService {
 			.select('SUM(file.size)', 'sum')
 			.getRawOne();
 
-		return parseInt(sum, 10) || 0;
+		return parseInt(sum, 10) ?? 0;
 	}
 
 	@bindThis
@@ -169,7 +167,7 @@ export class DriveFileEntityService {
 			.select('SUM(file.size)', 'sum')
 			.getRawOne();
 
-		return parseInt(sum, 10) || 0;
+		return parseInt(sum, 10) ?? 0;
 	}
 
 	@bindThis
@@ -181,7 +179,7 @@ export class DriveFileEntityService {
 			.select('SUM(file.size)', 'sum')
 			.getRawOne();
 
-		return parseInt(sum, 10) || 0;
+		return parseInt(sum, 10) ?? 0;
 	}
 
 	@bindThis
@@ -198,7 +196,7 @@ export class DriveFileEntityService {
 
 		return await awaitAll<Packed<'DriveFile'>>({
 			id: file.id,
-			createdAt: this.idService.parse(file.id).date.toISOString(),
+			createdAt: file.createdAt.toISOString(),
 			name: file.name,
 			type: file.type,
 			md5: file.md5,
@@ -233,7 +231,7 @@ export class DriveFileEntityService {
 
 		return await awaitAll<Packed<'DriveFile'>>({
 			id: file.id,
-			createdAt: this.idService.parse(file.id).date.toISOString(),
+			createdAt: file.createdAt.toISOString(),
 			name: file.name,
 			type: file.type,
 			md5: file.md5,

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

@@ -11,7 +11,6 @@ import type { Packed } from '@/misc/json-schema.js';
 import type { } from '@/models/Blocking.js';
 import type { MiDriveFolder } from '@/models/DriveFolder.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 
 @Injectable()
 export class DriveFolderEntityService {
@@ -21,8 +20,6 @@ export class DriveFolderEntityService {
 
 		@Inject(DI.driveFilesRepository)
 		private driveFilesRepository: DriveFilesRepository,
-
-		private idService: IdService,
 	) {
 	}
 
@@ -41,7 +38,7 @@ export class DriveFolderEntityService {
 
 		return await awaitAll({
 			id: folder.id,
-			createdAt: this.idService.parse(folder.id).date.toISOString(),
+			createdAt: folder.createdAt.toISOString(),
 			name: folder.name,
 			parentId: folder.parentId,
 

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

@@ -12,7 +12,6 @@ import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiFlash } from '@/models/Flash.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -25,7 +24,6 @@ export class FlashEntityService {
 		private flashLikesRepository: FlashLikesRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -39,7 +37,7 @@ export class FlashEntityService {
 
 		return await awaitAll({
 			id: flash.id,
-			createdAt: this.idService.parse(flash.id).date.toISOString(),
+			createdAt: flash.createdAt.toISOString(),
 			updatedAt: flash.updatedAt.toISOString(),
 			userId: flash.userId,
 			user: this.userEntityService.pack(flash.user ?? flash.userId, me), // { detail: true } すると無限ループするので注意

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

@@ -12,7 +12,6 @@ import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiFollowing } from '@/models/Following.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 type LocalFollowerFollowing = MiFollowing & {
@@ -46,7 +45,6 @@ export class FollowingEntityService {
 		private followingsRepository: FollowingsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -85,7 +83,7 @@ export class FollowingEntityService {
 
 		return await awaitAll({
 			id: following.id,
-			createdAt: this.idService.parse(following.id).date.toISOString(),
+			createdAt: following.createdAt.toISOString(),
 			followeeId: following.followeeId,
 			followerId: following.followerId,
 			followee: opts.populateFollowee ? this.userEntityService.pack(following.followee ?? following.followeeId, me, {

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

@@ -12,7 +12,6 @@ import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiGalleryPost } from '@/models/GalleryPost.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 import { DriveFileEntityService } from './DriveFileEntityService.js';
 
@@ -27,7 +26,6 @@ export class GalleryPostEntityService {
 
 		private userEntityService: UserEntityService,
 		private driveFileEntityService: DriveFileEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -41,7 +39,7 @@ export class GalleryPostEntityService {
 
 		return await awaitAll({
 			id: post.id,
-			createdAt: this.idService.parse(post.id).date.toISOString(),
+			createdAt: post.createdAt.toISOString(),
 			updatedAt: post.updatedAt.toISOString(),
 			userId: post.userId,
 			user: this.userEntityService.pack(post.user ?? post.userId, me),

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

@@ -3,8 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/Blocking.js';
 import type { MiInstance } from '@/models/Instance.js';
 import { MetaService } from '@/core/MetaService.js';
 import { bindThis } from '@/decorators.js';
@@ -42,7 +43,6 @@ export class InstanceEntityService {
 			description: instance.description,
 			maintainerName: instance.maintainerName,
 			maintainerEmail: instance.maintainerEmail,
-			isSilenced: this.utilityService.isSilencedHost(meta.silencedHosts, instance.host),
 			iconUrl: instance.iconUrl,
 			faviconUrl: instance.faviconUrl,
 			themeColor: instance.themeColor,

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

@@ -11,7 +11,6 @@ import type { Packed } from '@/misc/json-schema.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiRegistrationTicket } from '@/models/RegistrationTicket.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -21,7 +20,6 @@ export class InviteCodeEntityService {
 		private registrationTicketsRepository: RegistrationTicketsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -41,7 +39,7 @@ export class InviteCodeEntityService {
 			id: target.id,
 			code: target.code,
 			expiresAt: target.expiresAt ? target.expiresAt.toISOString() : null,
-			createdAt: this.idService.parse(target.id).date.toISOString(),
+			createdAt: target.createdAt.toISOString(),
 			createdBy: target.createdBy ? await this.userEntityService.pack(target.createdBy, me) : null,
 			usedBy: target.usedBy ? await this.userEntityService.pack(target.usedBy, me) : null,
 			usedAt: target.usedAt ? target.usedAt.toISOString() : null,

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

@@ -10,7 +10,6 @@ import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { } from '@/models/Blocking.js';
 import type { MiModerationLog } from '@/models/ModerationLog.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -20,7 +19,6 @@ export class ModerationLogEntityService {
 		private moderationLogsRepository: ModerationLogsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -32,7 +30,7 @@ export class ModerationLogEntityService {
 
 		return await awaitAll({
 			id: log.id,
-			createdAt: this.idService.parse(log.id).date.toISOString(),
+			createdAt: log.createdAt.toISOString(),
 			type: log.type,
 			info: log.info,
 			userId: log.userId,

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

@@ -12,7 +12,6 @@ import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiMuting } from '@/models/Muting.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -22,7 +21,6 @@ export class MutingEntityService {
 		private mutingsRepository: MutingsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -35,7 +33,7 @@ export class MutingEntityService {
 
 		return await awaitAll({
 			id: muting.id,
-			createdAt: this.idService.parse(muting.id).date.toISOString(),
+			createdAt: muting.createdAt.toISOString(),
 			expiresAt: muting.expiresAt ? muting.expiresAt.toISOString() : null,
 			muteeId: muting.muteeId,
 			mutee: this.userEntityService.pack(muting.muteeId, me, {

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

@@ -5,9 +5,11 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
+import * as mfm from 'mfm-js';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { Packed } from '@/misc/json-schema.js';
+import { nyaize } from '@/misc/nyaize.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
@@ -16,7 +18,6 @@ import type { UsersRepository, NotesRepository, FollowingsRepository, PollsRepos
 import { bindThis } from '@/decorators.js';
 import { isNotNull } from '@/misc/is-not-null.js';
 import { DebounceLoader } from '@/misc/loader.js';
-import { IdService } from '@/core/IdService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { CustomEmojiService } from '../CustomEmojiService.js';
 import type { ReactionService } from '../ReactionService.js';
@@ -29,7 +30,6 @@ export class NoteEntityService implements OnModuleInit {
 	private driveFileEntityService: DriveFileEntityService;
 	private customEmojiService: CustomEmojiService;
 	private reactionService: ReactionService;
-	private idService: IdService;
 	private noteLoader = new DebounceLoader(this.findNoteOrFail);
 
 	constructor(
@@ -68,7 +68,6 @@ export class NoteEntityService implements OnModuleInit {
 		this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
 		this.customEmojiService = this.moduleRef.get('CustomEmojiService');
 		this.reactionService = this.moduleRef.get('ReactionService');
-		this.idService = this.moduleRef.get('IdService');
 	}
 
 	@bindThis
@@ -170,11 +169,11 @@ export class NoteEntityService implements OnModuleInit {
 	}
 
 	@bindThis
-	public async populateMyReaction(noteId: MiNote['id'], meId: MiUser['id'], _hint_?: {
+	private async populateMyReaction(note: MiNote, meId: MiUser['id'], _hint_?: {
 		myReactions: Map<MiNote['id'], MiNoteReaction | null>;
 	}) {
 		if (_hint_?.myReactions) {
-			const reaction = _hint_.myReactions.get(noteId);
+			const reaction = _hint_.myReactions.get(note.id);
 			if (reaction) {
 				return this.reactionService.convertLegacyReaction(reaction.reaction);
 			} else if (reaction === null) {
@@ -183,14 +182,14 @@ export class NoteEntityService implements OnModuleInit {
 		// 実装上抜けがあるだけかもしれないので、「ヒントに含まれてなかったら(=undefinedなら)return」のようにはしない
 		}
 
-		// パフォーマンスのためノートが作成されてから2秒以上経っていない場合はリアクションを取得しない
-		if (this.idService.parse(noteId).date.getTime() + 2000 > Date.now()) {
+		// パフォーマンスのためノートが作成されてから1秒以上経っていない場合はリアクションを取得しない
+		if (note.createdAt.getTime() + 1000 > Date.now()) {
 			return undefined;
 		}
 
 		const reaction = await this.noteReactionsRepository.findOneBy({
 			userId: meId,
-			noteId: noteId,
+			noteId: note.id,
 		});
 
 		if (reaction) {
@@ -310,7 +309,7 @@ export class NoteEntityService implements OnModuleInit {
 
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
-			createdAt: this.idService.parse(note.id).date.toISOString(),
+			createdAt: note.createdAt.toISOString(),
 			userId: note.userId,
 			user: this.userEntityService.pack(note.user ?? note.userId, me, {
 				detail: false,
@@ -318,7 +317,7 @@ export class NoteEntityService implements OnModuleInit {
 			text: text,
 			cw: note.cw,
 			visibility: note.visibility,
-			localOnly: note.localOnly,
+			localOnly: note.localOnly ?? undefined,
 			reactionAcceptance: note.reactionAcceptance,
 			visibleUserIds: note.visibility === 'specified' ? note.visibleUserIds : undefined,
 			renoteCount: note.renoteCount,
@@ -358,11 +357,30 @@ export class NoteEntityService implements OnModuleInit {
 				poll: note.hasPoll ? this.populatePoll(note, meId) : undefined,
 
 				...(meId ? {
-					myReaction: this.populateMyReaction(note.id, meId, options?._hint_),
+					myReaction: this.populateMyReaction(note, meId, options?._hint_),
 				} : {}),
 			} : {}),
 		});
 
+		if (packed.user.isCat && packed.text) {
+			const tokens = packed.text ? mfm.parse(packed.text) : [];
+			function nyaizeNode(node: mfm.MfmNode) {
+				if (node.type === 'quote') return;
+				if (node.type === 'text') {
+					node.props.text = nyaize(node.props.text);
+				}
+				if (node.children) {
+					for (const child of node.children) {
+						nyaizeNode(child);
+					}
+				}
+			}
+			for (const node of tokens) {
+				nyaizeNode(node);
+			}
+			packed.text = mfm.toString(tokens);
+		}
+
 		if (!opts.skipHide) {
 			await this.hideNote(packed, meId);
 		}
@@ -385,9 +403,8 @@ export class NoteEntityService implements OnModuleInit {
 		const myReactionsMap = new Map<MiNote['id'], MiNoteReaction | null>();
 		if (meId) {
 			const renoteIds = notes.filter(n => n.renoteId != null).map(n => n.renoteId!);
-			// パフォーマンスのためノートが作成されてから2秒以上経っていない場合はリアクションを取得しない
-			const oldId = this.idService.gen(Date.now() - 2000);
-			const targets = [...notes.filter(n => n.id < oldId).map(n => n.id), ...renoteIds];
+			// パフォーマンスのためノートが作成されてから1秒以上経っていない場合はリアクションを取得しない
+			const targets = [...notes.filter(n => n.createdAt.getTime() + 1000 < Date.now()).map(n => n.id), ...renoteIds];
 			const myReactions = await this.noteReactionsRepository.findBy({
 				userId: meId,
 				noteId: In(targets),

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

@@ -10,7 +10,6 @@ import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiNoteFavorite } from '@/models/NoteFavorite.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { NoteEntityService } from './NoteEntityService.js';
 
 @Injectable()
@@ -20,7 +19,6 @@ export class NoteFavoriteEntityService {
 		private noteFavoritesRepository: NoteFavoritesRepository,
 
 		private noteEntityService: NoteEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -33,7 +31,7 @@ export class NoteFavoriteEntityService {
 
 		return {
 			id: favorite.id,
-			createdAt: this.idService.parse(favorite.id).date.toISOString(),
+			createdAt: favorite.createdAt.toISOString(),
 			noteId: favorite.noteId,
 			note: await this.noteEntityService.pack(favorite.note ?? favorite.noteId, me),
 		};

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

@@ -8,7 +8,6 @@ import { DI } from '@/di-symbols.js';
 import type { NoteReactionsRepository } from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
@@ -23,7 +22,6 @@ export class NoteReactionEntityService implements OnModuleInit {
 	private userEntityService: UserEntityService;
 	private noteEntityService: NoteEntityService;
 	private reactionService: ReactionService;
-	private idService: IdService;
 
 	constructor(
 		private moduleRef: ModuleRef,
@@ -34,7 +32,6 @@ export class NoteReactionEntityService implements OnModuleInit {
 		//private userEntityService: UserEntityService,
 		//private noteEntityService: NoteEntityService,
 		//private reactionService: ReactionService,
-		//private idService: IdService,
 	) {
 	}
 
@@ -42,7 +39,6 @@ export class NoteReactionEntityService implements OnModuleInit {
 		this.userEntityService = this.moduleRef.get('UserEntityService');
 		this.noteEntityService = this.moduleRef.get('NoteEntityService');
 		this.reactionService = this.moduleRef.get('ReactionService');
-		this.idService = this.moduleRef.get('IdService');
 	}
 
 	@bindThis
@@ -61,7 +57,7 @@ export class NoteReactionEntityService implements OnModuleInit {
 
 		return {
 			id: reaction.id,
-			createdAt: this.idService.parse(reaction.id).date.toISOString(),
+			createdAt: reaction.createdAt.toISOString(),
 			user: await this.userEntityService.pack(reaction.user ?? reaction.userId, me),
 			type: this.reactionService.convertLegacyReaction(reaction.reaction),
 			...(opts.withNote ? {

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

@@ -13,7 +13,6 @@ import type { MiUser } from '@/models/User.js';
 import type { MiPage } from '@/models/Page.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 import { DriveFileEntityService } from './DriveFileEntityService.js';
 
@@ -31,7 +30,6 @@ export class PageEntityService {
 
 		private userEntityService: UserEntityService,
 		private driveFileEntityService: DriveFileEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -87,7 +85,7 @@ export class PageEntityService {
 
 		return await awaitAll({
 			id: page.id,
-			createdAt: this.idService.parse(page.id).date.toISOString(),
+			createdAt: page.createdAt.toISOString(),
 			updatedAt: page.updatedAt.toISOString(),
 			userId: page.userId,
 			user: this.userEntityService.pack(page.user ?? page.userId, me), // { detail: true } すると無限ループするので注意

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

@@ -12,7 +12,6 @@ import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiRenoteMuting } from '@/models/RenoteMuting.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -22,7 +21,6 @@ export class RenoteMutingEntityService {
 		private renoteMutingsRepository: RenoteMutingsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -35,7 +33,7 @@ export class RenoteMutingEntityService {
 
 		return await awaitAll({
 			id: muting.id,
-			createdAt: this.idService.parse(muting.id).date.toISOString(),
+			createdAt: muting.createdAt.toISOString(),
 			muteeId: muting.muteeId,
 			mutee: this.userEntityService.pack(muting.muteeId, me, {
 				detail: true,

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

@@ -12,7 +12,6 @@ import type { MiUser } from '@/models/User.js';
 import type { MiRole } from '@/models/Role.js';
 import { bindThis } from '@/decorators.js';
 import { DEFAULT_POLICIES } from '@/core/RoleService.js';
-import { IdService } from '@/core/IdService.js';
 
 @Injectable()
 export class RoleEntityService {
@@ -22,8 +21,6 @@ export class RoleEntityService {
 
 		@Inject(DI.roleAssignmentsRepository)
 		private roleAssignmentsRepository: RoleAssignmentsRepository,
-
-		private idService: IdService,
 	) {
 	}
 
@@ -54,7 +51,7 @@ export class RoleEntityService {
 
 		return await awaitAll({
 			id: role.id,
-			createdAt: this.idService.parse(role.id).date.toISOString(),
+			createdAt: role.createdAt.toISOString(),
 			updatedAt: role.updatedAt.toISOString(),
 			name: role.name,
 			description: role.description,

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

@@ -20,7 +20,6 @@ import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
-import { IdService } from '@/core/IdService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { AnnouncementService } from '../AnnouncementService.js';
 import type { CustomEmojiService } from '../CustomEmojiService.js';
@@ -61,7 +60,6 @@ export class UserEntityService implements OnModuleInit {
 	private announcementService: AnnouncementService;
 	private roleService: RoleService;
 	private federatedInstanceService: FederatedInstanceService;
-	private idService: IdService;
 
 	constructor(
 		private moduleRef: ModuleRef,
@@ -113,6 +111,13 @@ export class UserEntityService implements OnModuleInit {
 
 		@Inject(DI.userMemosRepository)
 		private userMemosRepository: UserMemoRepository,
+
+		//private noteEntityService: NoteEntityService,
+		//private driveFileEntityService: DriveFileEntityService,
+		//private pageEntityService: PageEntityService,
+		//private customEmojiService: CustomEmojiService,
+		//private antennaService: AntennaService,
+		//private roleService: RoleService,
 	) {
 	}
 
@@ -125,7 +130,6 @@ export class UserEntityService implements OnModuleInit {
 		this.announcementService = this.moduleRef.get('AnnouncementService');
 		this.roleService = this.moduleRef.get('RoleService');
 		this.federatedInstanceService = this.moduleRef.get('FederatedInstanceService');
-		this.idService = this.moduleRef.get('IdService');
 	}
 
 	//#region Validators
@@ -333,8 +337,8 @@ export class UserEntityService implements OnModuleInit {
 			host: user.host,
 			avatarUrl: user.avatarUrl ?? this.getIdenticonUrl(user),
 			avatarBlurhash: user.avatarBlurhash,
-			isBot: user.isBot,
-			isCat: user.isCat,
+			isBot: user.isBot ?? falsy,
+			isCat: user.isCat ?? falsy,
 			instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
 				name: instance.name,
 				softwareName: instance.softwareName,
@@ -360,14 +364,14 @@ export class UserEntityService implements OnModuleInit {
 					? Promise.all(user.alsoKnownAs.map(uri => this.apPersonService.fetchPerson(uri).then(user => user?.id).catch(() => null)))
 						.then(xs => xs.length === 0 ? null : xs.filter(x => x != null) as string[])
 					: null,
-				createdAt: this.idService.parse(user.id).date.toISOString(),
+				createdAt: user.createdAt.toISOString(),
 				updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,
 				lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null,
 				bannerUrl: user.bannerUrl,
 				bannerBlurhash: user.bannerBlurhash,
 				isLocked: user.isLocked,
 				isSilenced: this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
-				isSuspended: user.isSuspended,
+				isSuspended: user.isSuspended ?? falsy,
 				description: profile!.description,
 				location: profile!.location,
 				birthday: profile!.birthday,

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

@@ -10,7 +10,6 @@ import type { Packed } from '@/misc/json-schema.js';
 import type { } from '@/models/Blocking.js';
 import type { MiUserList } from '@/models/UserList.js';
 import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
 @Injectable()
@@ -23,7 +22,6 @@ export class UserListEntityService {
 		private userListMembershipsRepository: UserListMembershipsRepository,
 
 		private userEntityService: UserEntityService,
-		private idService: IdService,
 	) {
 	}
 
@@ -39,7 +37,7 @@ export class UserListEntityService {
 
 		return {
 			id: userList.id,
-			createdAt: this.idService.parse(userList.id).date.toISOString(),
+			createdAt: userList.createdAt.toISOString(),
 			name: userList.name,
 			userIds: users.map(x => x.userId),
 			isPublic: userList.isPublic,
@@ -52,7 +50,7 @@ export class UserListEntityService {
 	) {
 		return Promise.all(memberships.map(async x => ({
 			id: x.id,
-			createdAt: this.idService.parse(x.id).date.toISOString(),
+			createdAt: x.createdAt.toISOString(),
 			userId: x.userId,
 			user: await this.userEntityService.pack(x.userId),
 			withReplies: x.withReplies,

packages/backend/src/daemons/ServerStatsService.ts

@@ -108,5 +108,6 @@ async function net() {
 
 // FS STAT
 async function fs() {
-	return await si.disksIO().catch(() => ({ rIO_sec: 0, wIO_sec: 0 }));
+	const data = await si.disksIO().catch(() => ({ rIO_sec: 0, wIO_sec: 0 }));
+	return data ?? { rIO_sec: 0, wIO_sec: 0 };
 }

packages/backend/src/misc/id/aid.ts

@@ -24,7 +24,8 @@ function getNoise(): string {
 	return counter.toString(36).padStart(2, '0').slice(-2);
 }
 
-export function genAid(t: number): string {
+export function genAid(date: Date): string {
+	const t = date.getTime();
 	if (isNaN(t)) throw new Error('Failed to create AID: Invalid Date');
 	counter++;
 	return getTime(t) + getNoise();

packages/backend/src/misc/id/aidx.ts

@@ -31,7 +31,8 @@ function getNoise(): string {
 	return counter.toString(36).padStart(NOISE_LENGTH, '0').slice(-NOISE_LENGTH);
 }
 
-export function genAidx(t: number): string {
+export function genAidx(date: Date): string {
+	const t = date.getTime();
 	if (isNaN(t)) throw new Error('Failed to create AIDX: Invalid Date');
 	counter++;
 	return getTime(t) + nodeId + getNoise();

packages/backend/src/misc/id/meid.ts

@@ -29,8 +29,8 @@ function getRandom() {
 	return str;
 }
 
-export function genMeid(t: number): string {
-	return getTime(t) + getRandom();
+export function genMeid(date: Date): string {
+	return getTime(date.getTime()) + getRandom();
 }
 
 export function parseMeid(id: string): { date: Date; } {

packages/backend/src/misc/id/meidg.ts

@@ -29,8 +29,8 @@ function getRandom() {
 	return str;
 }
 
-export function genMeidg(t: number): string {
-	return 'g' + getTime(t) + getRandom();
+export function genMeidg(date: Date): string {
+	return 'g' + getTime(date.getTime()) + getRandom();
 }
 
 export function parseMeidg(id: string): { date: Date; } {

packages/backend/src/misc/id/object-id.ts

@@ -29,8 +29,8 @@ function getRandom() {
 	return str;
 }
 
-export function genObjectId(t: number): string {
-	return getTime(t) + getRandom();
+export function genObjectId(date: Date): string {
+	return getTime(date.getTime()) + getRandom();
 }
 
 export function parseObjectId(id: string): { date: Date; } {

packages/backend/src/models/AbuseUserReport.ts

@@ -12,6 +12,12 @@ export class MiAbuseUserReport {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the AbuseUserReport.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column(id())
 	public targetUserId: MiUser['id'];

packages/backend/src/models/AccessToken.ts

@@ -13,6 +13,11 @@ export class MiAccessToken {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the AccessToken.',
+	})
+	public createdAt: Date;
+
 	@Column('timestamp with time zone', {
 		nullable: true,
 	})

packages/backend/src/models/Ad.ts

@@ -11,6 +11,12 @@ export class MiAd {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Ad.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column('timestamp with time zone', {
 		comment: 'The expired date of the Ad.',

packages/backend/src/models/Announcement.ts

@@ -12,6 +12,12 @@ export class MiAnnouncement {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Announcement.',
+	})
+	public createdAt: Date;
+
 	@Column('timestamp with time zone', {
 		comment: 'The updated date of the Announcement.',
 		nullable: true,

packages/backend/src/models/AnnouncementRead.ts

@@ -14,6 +14,11 @@ export class MiAnnouncementRead {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the AnnouncementRead.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column(id())
 	public userId: MiUser['id'];

packages/backend/src/models/Antenna.ts

@@ -13,6 +13,11 @@ export class MiAntenna {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Antenna.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column('timestamp with time zone')
 	public lastUsedAt: Date;
@@ -93,9 +98,4 @@ export class MiAntenna {
 		default: true,
 	})
 	public isActive: boolean;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public localOnly: boolean;
 }

packages/backend/src/models/App.ts

@@ -12,6 +12,12 @@ export class MiApp {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the App.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column({
 		...id(),

packages/backend/src/models/AuthSession.ts

@@ -13,6 +13,11 @@ export class MiAuthSession {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the AuthSession.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column('varchar', {
 		length: 128,

packages/backend/src/models/Blocking.ts

@@ -13,6 +13,12 @@ export class MiBlocking {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Blocking.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column({
 		...id(),

packages/backend/src/models/Channel.ts

@@ -13,6 +13,12 @@ export class MiChannel {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Channel.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column('timestamp with time zone', {
 		nullable: true,

packages/backend/src/models/ChannelFavorite.ts

@@ -14,6 +14,12 @@ export class MiChannelFavorite {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the ChannelFavorite.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column({
 		...id(),

packages/backend/src/models/ChannelFollowing.ts

@@ -14,6 +14,12 @@ export class MiChannelFollowing {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the ChannelFollowing.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column({
 		...id(),

packages/backend/src/models/Clip.ts

@@ -12,6 +12,11 @@ export class MiClip {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Clip.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column('timestamp with time zone', {
 		nullable: true,

packages/backend/src/models/ClipFavorite.ts

@@ -14,6 +14,9 @@ export class MiClipFavorite {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone')
+	public createdAt: Date;
+
 	@Index()
 	@Column(id())
 	public userId: MiUser['id'];

packages/backend/src/models/DriveFile.ts

@@ -14,6 +14,12 @@ export class MiDriveFile {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the DriveFile.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column({
 		...id(),

packages/backend/src/models/DriveFolder.ts

@@ -12,6 +12,12 @@ export class MiDriveFolder {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the DriveFolder.',
+	})
+	public createdAt: Date;
+
 	@Column('varchar', {
 		length: 128,
 		comment: 'The name of the DriveFolder.',

packages/backend/src/models/Flash.ts

@@ -12,6 +12,12 @@ export class MiFlash {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Flash.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column('timestamp with time zone', {
 		comment: 'The updated date of the Flash.',

packages/backend/src/models/FlashLike.ts

@@ -14,6 +14,9 @@ export class MiFlashLike {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone')
+	public createdAt: Date;
+
 	@Index()
 	@Column(id())
 	public userId: MiUser['id'];

packages/backend/src/models/FollowRequest.ts

@@ -13,6 +13,11 @@ export class MiFollowRequest {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the FollowRequest.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column({
 		...id(),
@@ -45,11 +50,6 @@ export class MiFollowRequest {
 	})
 	public requestId: string | null;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public withReplies: boolean;
-
 	//#region Denormalized fields
 	@Column('varchar', {
 		length: 128, nullable: true,

packages/backend/src/models/Following.ts

@@ -14,6 +14,12 @@ export class MiFollowing {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Following.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column({
 		...id(),

packages/backend/src/models/GalleryLike.ts

@@ -14,6 +14,9 @@ export class MiGalleryLike {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone')
+	public createdAt: Date;
+
 	@Index()
 	@Column(id())
 	public userId: MiUser['id'];

packages/backend/src/models/GalleryPost.ts

@@ -13,6 +13,12 @@ export class MiGalleryPost {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the GalleryPost.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column('timestamp with time zone', {
 		comment: 'The updated date of the GalleryPost.',

packages/backend/src/models/Meta.ts

@@ -76,11 +76,6 @@ export class MiMeta {
 	})
 	public sensitiveWords: string[];
 
-	@Column('varchar', {
-		length: 1024, array: true, default: '{}',
-	})
-	public silencedHosts: string[];
-
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,

packages/backend/src/models/ModerationLog.ts

@@ -12,6 +12,11 @@ export class MiModerationLog {
 	@PrimaryColumn(id())
 	public id: string;
 
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the ModerationLog.',
+	})
+	public createdAt: Date;
+
 	@Index()
 	@Column(id())
 	public userId: MiUser['id'];