enhance: TLキャッシュ容量を設定できるように

kaseiski · Oct 3, 2023 · 17b83ff · 17b83ff
1 parent 5fd0cb3
commit 17b83ff
Show file tree

Hide file tree

Showing 12 changed files with 251 additions and 74 deletions.
diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -1131,6 +1131,7 @@ export interface Locale {
     "fileAttachedOnly": string;
     "showRepliesToOthersInTimeline": string;
     "hideRepliesToOthersInTimeline": string;
+    "externalServices": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1128,6 +1128,7 @@ mutualFollow: "相互フォロー"
 fileAttachedOnly: "ファイル付きのみ"
 showRepliesToOthersInTimeline: "TLに他の人への返信を含める"
 hideRepliesToOthersInTimeline: "TLに他の人への返信を含めない"
+externalServices: "外部サービス"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"

diff --git a/packages/backend/migration/1696373953614-meta-cache-settings.js b/packages/backend/migration/1696373953614-meta-cache-settings.js
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class MetaCacheSettings1696373953614 {
+    name = 'MetaCacheSettings1696373953614'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "perLocalUserUserTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "perRemoteUserUserTimelineCacheMax" integer NOT NULL DEFAULT '100'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "perUserHomeTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "perUserListTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perUserListTimelineCacheMax"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perUserHomeTimelineCacheMax"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perRemoteUserUserTimelineCacheMax"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perLocalUserUserTimelineCacheMax"`);
+    }
+}
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
@@ -803,6 +803,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 	@bindThis
 	private async pushToTl(note: MiNote, user: { id: MiUser['id']; host: MiUser['host']; }) {
+		const meta = await this.metaService.fetch();
+
 		const redisPipeline = this.redisForTimelines.pipeline();
 
 		if (note.channelId) {
@@ -816,14 +818,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 			for (const channelFollowing of channelFollowings) {
 				redisPipeline.xadd(
 					`homeTimeline:${channelFollowing.followerId}`,
-					'MAXLEN', '~', '200',
+					'MAXLEN', '~', meta.perUserHomeTimelineCacheMax.toString(),
 					'*',
 					'note', note.id);
 
 				if (note.fileIds.length > 0) {
 					redisPipeline.xadd(
 						`homeTimelineWithFiles:${channelFollowing.followerId}`,
-						'MAXLEN', '~', '100',
+						'MAXLEN', '~', (meta.perUserHomeTimelineCacheMax / 2).toString(),
 						'*',
 						'note', note.id);
 				}
@@ -855,14 +857,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 				redisPipeline.xadd(
 					`homeTimeline:${following.followerId}`,
-					'MAXLEN', '~', '200',
+					'MAXLEN', '~', meta.perUserHomeTimelineCacheMax.toString(),
 					'*',
 					'note', note.id);
 
 				if (note.fileIds.length > 0) {
 					redisPipeline.xadd(
 						`homeTimelineWithFiles:${following.followerId}`,
-						'MAXLEN', '~', '100',
+						'MAXLEN', '~', (meta.perUserHomeTimelineCacheMax / 2).toString(),
 						'*',
 						'note', note.id);
 				}
@@ -882,14 +884,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 				redisPipeline.xadd(
 					`userListTimeline:${userListMembership.userListId}`,
-					'MAXLEN', '~', '200',
+					'MAXLEN', '~', meta.perUserListTimelineCacheMax.toString(),
 					'*',
 					'note', note.id);
 
 				if (note.fileIds.length > 0) {
 					redisPipeline.xadd(
 						`userListTimelineWithFiles:${userListMembership.userListId}`,
-						'MAXLEN', '~', '100',
+						'MAXLEN', '~', (meta.perUserListTimelineCacheMax / 2).toString(),
 						'*',
 						'note', note.id);
 				}
@@ -898,14 +900,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 			{ // 自分自身のHTL
 				redisPipeline.xadd(
 					`homeTimeline:${user.id}`,
-					'MAXLEN', '~', '200',
+					'MAXLEN', '~', meta.perUserHomeTimelineCacheMax.toString(),
 					'*',
 					'note', note.id);
 
 				if (note.fileIds.length > 0) {
 					redisPipeline.xadd(
 						`homeTimelineWithFiles:${user.id}`,
-						'MAXLEN', '~', '100',
+						'MAXLEN', '~', (meta.perUserHomeTimelineCacheMax / 2).toString(),
 						'*',
 						'note', note.id);
 				}
@@ -916,20 +918,20 @@ export class NoteCreateService implements OnApplicationShutdown {
 				if (note.replyId && note.replyUserId !== note.userId) {
 					redisPipeline.xadd(
 						`userTimelineWithReplies:${user.id}`,
-						'MAXLEN', '~', '1000',
+						'MAXLEN', '~', note.userHost == null ? meta.perLocalUserUserTimelineCacheMax.toString() : meta.perRemoteUserUserTimelineCacheMax.toString(),
 						'*',
 						'note', note.id);
 				} else {
 					redisPipeline.xadd(
 						`userTimeline:${user.id}`,
-						'MAXLEN', '~', '1000',
+						'MAXLEN', '~', note.userHost == null ? meta.perLocalUserUserTimelineCacheMax.toString() : meta.perRemoteUserUserTimelineCacheMax.toString(),
 						'*',
 						'note', note.id);
 
 					if (note.fileIds.length > 0) {
 						redisPipeline.xadd(
 							`userTimelineWithFiles:${user.id}`,
-							'MAXLEN', '~', '500',
+							'MAXLEN', '~', note.userHost == null ? (meta.perLocalUserUserTimelineCacheMax / 2).toString() : (meta.perRemoteUserUserTimelineCacheMax / 2).toString(),
 							'*',
 							'note', note.id);
 					}

diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
@@ -471,4 +471,24 @@ export class MiMeta {
 		length: 1024, array: true, default: '{ "admin", "administrator", "root", "system", "maintainer", "host", "mod", "moderator", "owner", "superuser", "staff", "auth", "i", "me", "everyone", "all", "mention", "mentions", "example", "user", "users", "account", "accounts", "official", "help", "helps", "support", "supports", "info", "information", "informations", "announce", "announces", "announcement", "announcements", "notice", "notification", "notifications", "dev", "developer", "developers", "tech", "misskey" }',
 	})
 	public preservedUsernames: string[];
+
+	@Column('integer', {
+		default: 300,
+	})
+	public perLocalUserUserTimelineCacheMax: number;
+
+	@Column('integer', {
+		default: 100,
+	})
+	public perRemoteUserUserTimelineCacheMax: number;
+
+	@Column('integer', {
+		default: 300,
+	})
+	public perUserHomeTimelineCacheMax: number;
+
+	@Column('integer', {
+		default: 300,
+	})
+	public perUserListTimelineCacheMax: number;
 }