Merge pull request #176 from anatawa12/vmimi-relay-timeline

virtual kemomimi relay social timeline

CHANGELOG.md

@@ -12,6 +12,19 @@
 
 -->
 
+## 2024.3.1-kinel.3
+
+### General
+- Enhance: ぶいみみリレーソーシャルタイムラインを追加しました
+  - ぶいみみリレーソーシャルタイムラインは、ぶいみみリレータイムラインとホームタイムラインのノートが流れます
+- Feat: ぶいみみリレータイムラインの`TLに他の人への返信を含める`の動作をローカルタイムラインに揃えました
+  - `TLに他の人への返信を含める`を有効にすると、ぶいみみリレーに参加しているサーバーのユーザーが他の誰かにリプライしたノートが表示されます。無効にするとこれらが含まれなくなります。
+
+### Client
+
+### Server
+- Feat: ぶいみみリレータイムラインがFFTを用いて再実装されました。
+
 ## 2024.3.1-kinel.2
 
 ### General

locales/index.d.ts

@@ -8601,6 +8601,10 @@ export interface Locale extends ILocale {
          * ぶいみみリレー
          */
         "vmimiRelay": string;
+        /**
+         * ぶいみみリレーソーシャル
+         */
+        "vmimiRelaySocial": string;
     };
     "_play": {
         /**

locales/ja-JP.yml

@@ -2270,6 +2270,7 @@ _timelines:
   social: "ソーシャル"
   global: "グローバル"
   vmimiRelay: "ぶいみみリレー"
+  vmimiRelaySocial: "ぶいみみリレーソーシャル"
 
 _play:
   new: "Playの作成"

packages/backend/migration/1713168415416-VmimiRelayTimeline.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: anatawa12 and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class VmimiRelayTimeline1713168415416 {
+    name = 'VmimiRelayTimeline1713168415416'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "vmimiRelayTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "vmimiRelayTimelineCacheMax"`);
+    }
+}

packages/backend/src/core/FanoutTimelineService.ts

@@ -38,6 +38,11 @@ export type FanoutTimelineName =
 	// role timelines
 	| `roleTimeline:${string}` // any notes are included
 
+	// vmimi relay timelines
+	| 'vmimiRelayTimeline' // replies are not included
+	| 'vmimiRelayTimelineWithFiles' // only non-reply notes with files are included
+	| 'vmimiRelayTimelineWithReplies' // only replies are included
+
 @Injectable()
 export class FanoutTimelineService {
 	constructor(

packages/backend/src/core/NoteCreateService.ts

@@ -50,6 +50,7 @@ import { NoteReadService } from '@/core/NoteReadService.js';
 import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
 import { bindThis } from '@/decorators.js';
 import { DB_MAX_NOTE_TEXT_LENGTH } from '@/const.js';
+import { VmimiRelayTimelineService } from '@/core/VmimiRelayTimelineService.js';
 import { RoleService } from '@/core/RoleService.js';
 import { MetaService } from '@/core/MetaService.js';
 import { SearchService } from '@/core/SearchService.js';
@@ -196,6 +197,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		@Inject(DI.channelFollowingsRepository)
 		private channelFollowingsRepository: ChannelFollowingsRepository,
 
+		private vmimiRelayTimelineService: VmimiRelayTimelineService,
 		private userEntityService: UserEntityService,
 		private noteEntityService: NoteEntityService,
 		private idService: IdService,
@@ -958,6 +960,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 						this.fanoutTimelineService.push(`localTimelineWithReplyTo:${note.replyUserId}`, note.id, 300 / 10, r);
 					}
 				}
+				if (note.visibility === 'public' && this.vmimiRelayTimelineService.isRelayedInstance(note.userHost)) {
+					this.fanoutTimelineService.push('vmimiRelayTimelineWithReplies', note.id, meta.vmimiRelayTimelineCacheMax, r);
+				}
 			} else {
 				this.fanoutTimelineService.push(`userTimeline:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
@@ -970,6 +975,12 @@ export class NoteCreateService implements OnApplicationShutdown {
 						this.fanoutTimelineService.push('localTimelineWithFiles', note.id, 500, r);
 					}
 				}
+				if (note.visibility === 'public' && this.vmimiRelayTimelineService.isRelayedInstance(note.userHost)) {
+					this.fanoutTimelineService.push('vmimiRelayTimeline', note.id, meta.vmimiRelayTimelineCacheMax, r);
+					if (note.fileIds.length > 0) {
+						this.fanoutTimelineService.push('vmimiRelayTimelineWithFiles', note.id, meta.vmimiRelayTimelineCacheMax / 2, r);
+					}
+				}
 			}
 
 			if (Math.random() < 0.1) {

packages/backend/src/core/RoleService.ts

@@ -32,6 +32,7 @@ import { NotificationService } from '@/core/NotificationService.js';
 import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
 
 export type RolePolicies = {
+	vrtlAvailable: boolean;
 	gtlAvailable: boolean;
 	ltlAvailable: boolean;
 	canPublicNote: boolean;
@@ -60,6 +61,7 @@ export type RolePolicies = {
 };
 
 export const DEFAULT_POLICIES: RolePolicies = {
+	vrtlAvailable: true,
 	gtlAvailable: true,
 	ltlAvailable: true,
 	canPublicNote: true,
@@ -327,6 +329,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		}
 
 		return {
+			vrtlAvailable: calc('vrtlAvailable', vs => vs.some(v => v === true)),
 			gtlAvailable: calc('gtlAvailable', vs => vs.some(v => v === true)),
 			ltlAvailable: calc('ltlAvailable', vs => vs.some(v => v === true)),
 			canPublicNote: calc('canPublicNote', vs => vs.some(v => v === true)),

packages/backend/src/core/VmimiRelayTimelineService.ts

@@ -74,23 +74,4 @@ export class VmimiRelayTimelineService {
 		this.checkForUpdateInstanceList();
 		return this.instanceHostsArray;
 	}
-
-	@bindThis
-	generateFilterQuery(query: SelectQueryBuilder<any>, excludeReplies: boolean) {
-		const names = this.hostNames;
-		query.andWhere(new Brackets(qb => {
-			qb.where('note.userHost IS NULL');
-			if (names.length !== 0) {
-				qb.orWhere('note.userHost IN (:...vmimiRelayInstances)', { vmimiRelayInstances: names });
-			}
-		}));
-		if (excludeReplies) {
-			query.andWhere(new Brackets(qb => {
-				qb.where('note.replyUserHost IS NULL');
-				if (names.length !== 0) {
-					qb.orWhere('note.replyUserHost IN (:...vmimiRelayInstances)', { vmimiRelayInstances: names });
-				}
-			}));
-		}
-	}
 }

packages/backend/src/models/Meta.ts

@@ -554,6 +554,11 @@ export class MiMeta {
 	})
 	public preservedUsernames: string[];
 
+	@Column('integer', {
+		default: 300,
+	})
+	public vmimiRelayTimelineCacheMax: number;
+
 	@Column('boolean', {
 		default: true,
 	})

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

@@ -151,6 +151,10 @@ export const packedRolePoliciesSchema = {
 	type: 'object',
 	optional: false, nullable: false,
 	properties: {
+		vrtlAvailable: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		gtlAvailable: {
 			type: 'boolean',
 			optional: false, nullable: false,

packages/backend/src/server/ServerModule.ts

@@ -36,6 +36,7 @@ import { ChannelChannelService } from './api/stream/channels/channel.js';
 import { DriveChannelService } from './api/stream/channels/drive.js';
 import { GlobalTimelineChannelService } from './api/stream/channels/global-timeline.js';
 import { VmimiRelayTimelineChannelService } from './api/stream/channels/vmimi-relay-timeline.js';
+import { VmimiRelayHybridTimelineChannelService } from './api/stream/channels/vmimi-relay-hybrid-timeline.js';
 import { HashtagChannelService } from './api/stream/channels/hashtag.js';
 import { HomeTimelineChannelService } from './api/stream/channels/home-timeline.js';
 import { HybridTimelineChannelService } from './api/stream/channels/hybrid-timeline.js';
@@ -80,6 +81,7 @@ import { ReversiGameChannelService } from './api/stream/channels/reversi-game.js
 		DriveChannelService,
 		GlobalTimelineChannelService,
 		VmimiRelayTimelineChannelService,
+		VmimiRelayHybridTimelineChannelService,
 		HashtagChannelService,
 		RoleTimelineChannelService,
 		ReversiChannelService,

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

@@ -275,6 +275,7 @@ import * as ep___notes_favorites_delete from './endpoints/notes/favorites/delete
 import * as ep___notes_featured from './endpoints/notes/featured.js';
 import * as ep___notes_globalTimeline from './endpoints/notes/global-timeline.js';
 import * as ep___notes_vmimiRelayTimeline from './endpoints/notes/vmimi-relay-timeline.js';
+import * as ep___notes_vmimiRelayHybridTimeline from './endpoints/notes/vmimi-relay-hybrid-timeline.js';
 import * as ep___notes_hybridTimeline from './endpoints/notes/hybrid-timeline.js';
 import * as ep___notes_localTimeline from './endpoints/notes/local-timeline.js';
 import * as ep___notes_mentions from './endpoints/notes/mentions.js';
@@ -650,6 +651,7 @@ const $notes_favorites_delete: Provider = { provide: 'ep:notes/favorites/delete'
 const $notes_featured: Provider = { provide: 'ep:notes/featured', useClass: ep___notes_featured.default };
 const $notes_globalTimeline: Provider = { provide: 'ep:notes/global-timeline', useClass: ep___notes_globalTimeline.default };
 const $notes_vmimiRelayTimeline: Provider = { provide: 'ep:notes/vmimi-relay-timeline', useClass: ep___notes_vmimiRelayTimeline.default };
+const $notes_vmimiRelayHybridTimeline: Provider = { provide: 'ep:notes/vmimi-relay-hybrid-timeline', useClass: ep___notes_vmimiRelayHybridTimeline.default };
 const $notes_hybridTimeline: Provider = { provide: 'ep:notes/hybrid-timeline', useClass: ep___notes_hybridTimeline.default };
 const $notes_localTimeline: Provider = { provide: 'ep:notes/local-timeline', useClass: ep___notes_localTimeline.default };
 const $notes_mentions: Provider = { provide: 'ep:notes/mentions', useClass: ep___notes_mentions.default };
@@ -1029,6 +1031,7 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
 		$notes_featured,
 		$notes_globalTimeline,
 		$notes_vmimiRelayTimeline,
+		$notes_vmimiRelayHybridTimeline,
 		$notes_hybridTimeline,
 		$notes_localTimeline,
 		$notes_mentions,
@@ -1402,6 +1405,7 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
 		$notes_featured,
 		$notes_globalTimeline,
 		$notes_vmimiRelayTimeline,
+		$notes_vmimiRelayHybridTimeline,
 		$notes_hybridTimeline,
 		$notes_localTimeline,
 		$notes_mentions,

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

@@ -275,6 +275,7 @@ import * as ep___notes_favorites_delete from './endpoints/notes/favorites/delete
 import * as ep___notes_featured from './endpoints/notes/featured.js';
 import * as ep___notes_globalTimeline from './endpoints/notes/global-timeline.js';
 import * as ep___notes_vmimiRelayTimeline from './endpoints/notes/vmimi-relay-timeline.js';
+import * as ep___notes_vmimiRelayHybridTimeline from './endpoints/notes/vmimi-relay-hybrid-timeline.js';
 import * as ep___notes_hybridTimeline from './endpoints/notes/hybrid-timeline.js';
 import * as ep___notes_localTimeline from './endpoints/notes/local-timeline.js';
 import * as ep___notes_mentions from './endpoints/notes/mentions.js';
@@ -648,6 +649,7 @@ const eps = [
 	['notes/featured', ep___notes_featured],
 	['notes/global-timeline', ep___notes_globalTimeline],
 	['notes/vmimi-relay-timeline', ep___notes_vmimiRelayTimeline],
+	['notes/vmimi-relay-hybrid-timeline', ep___notes_vmimiRelayHybridTimeline],
 	['notes/hybrid-timeline', ep___notes_hybridTimeline],
 	['notes/local-timeline', ep___notes_localTimeline],
 	['notes/mentions', ep___notes_mentions],

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -570,6 +570,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				bannedEmailDomains: instance.bannedEmailDomains,
 				policies: { ...DEFAULT_POLICIES, ...instance.policies },
 				manifestJsonOverride: instance.manifestJsonOverride,
+				vmimiRelayTimelineCacheMax: instance.vmimiRelayTimelineCacheMax,
 				enableFanoutTimeline: instance.enableFanoutTimeline,
 				enableFanoutTimelineDbFallback: instance.enableFanoutTimelineDbFallback,
 				perLocalUserUserTimelineCacheMax: instance.perLocalUserUserTimelineCacheMax,

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -138,6 +138,7 @@ export const paramDef = {
 		manifestJsonOverride: { type: 'string' },
 		enableFanoutTimeline: { type: 'boolean' },
 		enableFanoutTimelineDbFallback: { type: 'boolean' },
+		vmimiRelayTimelineCacheMax: { type: 'integer' },
 		perLocalUserUserTimelineCacheMax: { type: 'integer' },
 		perRemoteUserUserTimelineCacheMax: { type: 'integer' },
 		perUserHomeTimelineCacheMax: { type: 'integer' },
@@ -561,6 +562,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.perLocalUserUserTimelineCacheMax = ps.perLocalUserUserTimelineCacheMax;
 			}
 
+			if (ps.vmimiRelayTimelineCacheMax !== undefined) {
+				set.vmimiRelayTimelineCacheMax = ps.vmimiRelayTimelineCacheMax;
+			}
+
 			if (ps.perRemoteUserUserTimelineCacheMax !== undefined) {
 				set.perRemoteUserUserTimelineCacheMax = ps.perRemoteUserUserTimelineCacheMax;
 			}