From 2e5792f213e99d91050ab7004c3d15e346b6ba07 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 3 Jun 2025 17:58:39 -0400
Subject: [PATCH] copy changes to bubble channel

---
 .../api/stream/channels/bubble-timeline.ts    | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/server/api/stream/channels/bubble-timeline.ts b/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
index 6f41fbd437..393fe3883c 100644
--- a/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
@@ -5,11 +5,9 @@
 
 import { Injectable } from '@nestjs/common';
 import type { Packed } from '@/misc/json-schema.js';
-import { MetaService } from '@/core/MetaService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
-import type { MiMeta } from '@/models/Meta.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import { UtilityService } from '@/core/UtilityService.js';
@@ -22,10 +20,8 @@ class BubbleTimelineChannel extends Channel {
 	private withRenotes: boolean;
 	private withFiles: boolean;
 	private withBots: boolean;
-	private instance: MiMeta;
 
 	constructor(
-		private metaService: MetaService,
 		private roleService: RoleService,
 		private readonly utilityService: UtilityService,
 		noteEntityService: NoteEntityService,
@@ -44,7 +40,6 @@ class BubbleTimelineChannel extends Channel {
 		this.withRenotes = !!(params.withRenotes ?? true);
 		this.withFiles = !!(params.withFiles ?? false);
 		this.withBots = !!(params.withBots ?? true);
-		this.instance = await this.metaService.fetch();
 
 		// Subscribe events
 		this.subscriber.on('notesStream', this.onNote);
@@ -52,6 +47,8 @@ class BubbleTimelineChannel extends Channel {
 
 	@bindThis
 	private async onNote(note: Packed<'Note'>) {
+		const isMe = this.user?.id === note.userId;
+
 		if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
 		if (!this.withBots && note.user.isBot) return;
 
@@ -59,9 +56,28 @@ class BubbleTimelineChannel extends Channel {
 		if (note.channelId != null) return;
 		if (!this.utilityService.isBubbledHost(note.user.host)) return;
 
-		if (isRenotePacked(note) && !isQuotePacked(note) && !this.withRenotes) return;
 		if (this.isNoteMutedOrBlocked(note)) return;
 
+		if (note.reply) {
+			const reply = note.reply;
+			// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
+			if (!this.isNoteVisibleToMe(reply)) return;
+			if (!this.following[note.userId]?.withReplies) {
+				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
+				if (reply.userId !== this.user?.id && !isMe && reply.userId !== note.userId) return;
+			}
+		}
+
+		// 純粋なリノート（引用リノートでないリノート）の場合
+		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
+			if (!this.withRenotes) return;
+			if (note.renote.reply) {
+				const reply = note.renote.reply;
+				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
+				if (!this.isNoteVisibleToMe(reply)) return;
+			}
+		}
+
 		const clonedNote = await this.assignMyReaction(note);
 		await this.hideNote(clonedNote);
 
@@ -82,7 +98,6 @@ export class BubbleTimelineChannelService implements MiChannelService<false> {
 	public readonly kind = BubbleTimelineChannel.kind;
 
 	constructor(
-		private metaService: MetaService,
 		private roleService: RoleService,
 		private noteEntityService: NoteEntityService,
 		private readonly utilityService: UtilityService,
@@ -92,7 +107,6 @@ export class BubbleTimelineChannelService implements MiChannelService<false> {
 	@bindThis
 	public create(id: string, connection: Channel['connection']): BubbleTimelineChannel {
 		return new BubbleTimelineChannel(
-			this.metaService,
 			this.roleService,
 			this.utilityService,
 			this.noteEntityService,