Revert "Feat: ホームタイムラインとローカルくっつけたみたいなTLを実装 (#83)"

This reverts commit c497f6f

Author: mattyatea

packages/backend/src/core/FanoutTimelineService.ts

@@ -13,17 +13,12 @@ export type FanoutTimelineName = (
 	// home timeline
 	| `homeTimeline:${string}`
 	| `homeTimelineWithFiles:${string}` // only notes with files are included
-
 	// local timeline
 	| 'localTimeline' // replies are not included
 	| 'localTimelineWithFiles' // only non-reply notes with files are included
 	| 'localTimelineWithReplies' // only replies are included
 	| `localTimelineWithReplyTo:${string}` // Only replies to specific local user are included. Parameter is reply user id.
 
-	// local home timeline
-	| `localHomeTimeline:${string}`
-	| `localHomeTimelineWithFiles:${string}` // only notes with files are included
-
 	// antenna
 	| `antennaTimeline:${string}`
 
@@ -42,9 +37,9 @@ export type FanoutTimelineName = (
 
 	// role timelines
 	| `roleTimeline:${string}` // any notes are included
+);
 
 	| `remoteLocalTimeline:${string}`
-);
 
 @Injectable()
 export class FanoutTimelineService {

packages/backend/src/core/NoteCreateService.ts

@@ -861,11 +861,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 			for (const channelFollowing of channelFollowings) {
 				this.fanoutTimelineService.push(`homeTimeline:${channelFollowing.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
-				this.fanoutTimelineService.push(`localHomeTimeline:${channelFollowing.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
-
 				if (note.fileIds.length > 0) {
 					this.fanoutTimelineService.push(`homeTimelineWithFiles:${channelFollowing.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax / 2, r);
-					this.fanoutTimelineService.push(`localHomeTimelineWithFiles:${channelFollowing.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
 				}
 			}
 		} else {
@@ -904,10 +901,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 				}
 
 				this.fanoutTimelineService.push(`homeTimeline:${following.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
-				if (user.host === null) this.fanoutTimelineService.push(`localHomeTimeline:${following.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {
 					this.fanoutTimelineService.push(`homeTimelineWithFiles:${following.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax / 2, r);
-					if (user.host === null) this.fanoutTimelineService.push(`localHomeTimelineWithFiles:${following.followerId}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
 				}
 			}
 
@@ -934,10 +929,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 			if (note.userHost == null) {
 				if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id)) {
 					this.fanoutTimelineService.push(`homeTimeline:${user.id}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
-					this.fanoutTimelineService.push(`localHomeTimeline:${user.id}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
 					if (note.fileIds.length > 0) {
 						this.fanoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, this.meta.perUserHomeTimelineCacheMax / 2, r);
-						this.fanoutTimelineService.push(`localHomeTimelineWithFiles:${user.id}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
 					}
 				}
 			}
@@ -960,13 +953,10 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 				if (note.visibility === 'public' && note.userHost == null) {
 					this.fanoutTimelineService.push('localTimeline', note.id, 1000, r);
-					this.fanoutTimelineService.push(`localHomeTimeline:${user.id}`, note.id, 1000, r);
 					if (note.fileIds.length > 0) {
 						this.fanoutTimelineService.push('localTimelineWithFiles', note.id, 500, r);
-						this.fanoutTimelineService.push(`localHomeTimelineWithFiles:${user.id}`, note.id, 1000, r);
 					}
 				}
-
 				if (note.visibility === 'public' && note.userHost !== null) {
 					this.fanoutTimelineService.push(`remoteLocalTimeline:${note.userHost}`, note.id, 1000, r);
 				}

packages/backend/src/server/ServerModule.ts

@@ -38,7 +38,6 @@ import { DriveChannelService } from './api/stream/channels/drive.js';
 import { GlobalTimelineChannelService } from './api/stream/channels/global-timeline.js';
 import { HashtagChannelService } from './api/stream/channels/hashtag.js';
 import { HomeTimelineChannelService } from './api/stream/channels/home-timeline.js';
-import { HomeLocalTimelineChannelService } from './api/stream/channels/home-local-timeline.js';
 import { HybridTimelineChannelService } from './api/stream/channels/hybrid-timeline.js';
 import { LocalTimelineChannelService } from './api/stream/channels/local-timeline.js';
 import { QueueStatsChannelService } from './api/stream/channels/queue-stats.js';
@@ -88,7 +87,6 @@ import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.j
 		ReversiChannelService,
 		ReversiGameChannelService,
 		HomeTimelineChannelService,
-		HomeLocalTimelineChannelService,
 		HybridTimelineChannelService,
 		LocalTimelineChannelService,
 		QueueStatsChannelService,

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

@@ -415,5 +415,4 @@ export * as 'admin/inbox-rule/set' from './endpoints/admin/inbox-rule/set.js';
 export * as 'admin/inbox-rule/delete' from './endpoints/admin/inbox-rule/delete.js';
 export * as 'admin/inbox-rule/list' from './endpoints/admin/inbox-rule/list.js';
 export * as 'users/lists/list-favorite' from './endpoints/users/lists/list-favorite.js';
-export * as 'notes/home-local-timeline' from './endpoints/notes/home-local-timeline.js'
 export * as 'point/send' from './endpoints/point/send.js';

packages/backend/src/server/api/endpoints/notes/home-local-timeline.ts

@@ -21,7 +21,6 @@ import { HashtagChannelService } from './channels/hashtag.js';
 import { RoleTimelineChannelService } from './channels/role-timeline.js';
 import { ReversiChannelService } from './channels/reversi.js';
 import { ReversiGameChannelService } from './channels/reversi-game.js';
-import { HomeLocalTimelineChannelService } from './channels/home-local-timeline.js';
 import { type MiChannelService } from './channel.js';
 
 @Injectable()
@@ -43,7 +42,6 @@ export class ChannelsService {
 		private adminChannelService: AdminChannelService,
 		private reversiChannelService: ReversiChannelService,
 		private reversiGameChannelService: ReversiGameChannelService,
-		private homeLocalTimelineChannel: HomeLocalTimelineChannelService,
 	) {
 	}
 
@@ -66,7 +64,6 @@ export class ChannelsService {
 			case 'admin': return this.adminChannelService;
 			case 'reversi': return this.reversiChannelService;
 			case 'reversiGame': return this.reversiGameChannelService;
-			case 'homeLocalTimeline': return this.homeLocalTimelineChannel;
 
 			default:
 				throw new Error(`no such channel: ${name}`);