merge: fix: populate myreaction on replies for streams. (!839)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/839

Closes #340

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>

6 files changed, 64 insertions, 17 deletions

diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index ae9c7e3e99..93d5046902 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -10,6 +10,7 @@ import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
 import type { Packed } from '@/misc/json-schema.js';
 import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import type Connection from './Connection.js';
+import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 
 /**
  * Stream channel
@@ -101,6 +102,13 @@ export default abstract class Channel {
 	public dispose?(): void;
 
 	public onMessage?(type: string, body: JsonValue): void;
+
+	public async assignMyReaction(note: Packed<'Note'>, noteEntityService: NoteEntityService) {
+		if (this.user && Object.keys(note.reactions).length > 0) {
+			const myReaction = await noteEntityService.populateMyReaction(note, this.user.id);
+			note.myReaction = myReaction;
+		}
+	}
 }
 
 export type MiChannelService<T extends boolean> = {
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 8693f0c6ac..b2745db92d 100644
--- a/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
@@ -65,12 +65,20 @@ class BubbleTimelineChannel extends Channel {
 
 		if (this.isNoteMutedOrBlocked(note)) return;
 
+		const reactionsToFetch = [];
 		if (this.user && isRenotePacked(note) && !isQuotePacked(note)) {
-			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
-				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+			if (note.renote) {
+				reactionsToFetch.push(this.assignMyReaction(note.renote, this.noteEntityService));
+				if (note.renote.reply) {
+					reactionsToFetch.push(this.assignMyReaction(note.renote.reply, this.noteEntityService));
+				}
 			}
 		}
+		if (this.user && note.reply) {
+			reactionsToFetch.push(this.assignMyReaction(note.reply, this.noteEntityService));
+		}
+
+		await Promise.all(reactionsToFetch);
 
 		this.connection.cacheNote(note);
 
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index 6fe76747ee..8df59d906d 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -60,12 +60,20 @@ class GlobalTimelineChannel extends Channel {
 
 		if (this.isNoteMutedOrBlocked(note)) return;
 
+		const reactionsToFetch = [];
 		if (this.user && isRenotePacked(note) && !isQuotePacked(note)) {
-			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
-				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+			if (note.renote) {
+				reactionsToFetch.push(this.assignMyReaction(note.renote, this.noteEntityService));
+				if (note.renote.reply) {
+					reactionsToFetch.push(this.assignMyReaction(note.renote.reply, this.noteEntityService));
+				}
 			}
 		}
+		if (this.user && note.reply) {
+			reactionsToFetch.push(this.assignMyReaction(note.reply, this.noteEntityService));
+		}
+
+		await Promise.all(reactionsToFetch);
 
 		this.connection.cacheNote(note);
 
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index 359ab3e223..f48eff85c9 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -81,12 +81,20 @@ class HomeTimelineChannel extends Channel {
 
 		if (this.isNoteMutedOrBlocked(note)) return;
 
+		const reactionsToFetch = [];
 		if (this.user && isRenotePacked(note) && !isQuotePacked(note)) {
-			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
-				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+			if (note.renote) {
+				reactionsToFetch.push(this.assignMyReaction(note.renote, this.noteEntityService));
+				if (note.renote.reply) {
+					reactionsToFetch.push(this.assignMyReaction(note.renote.reply, this.noteEntityService));
+				}
 			}
 		}
+		if (this.user && note.reply) {
+			reactionsToFetch.push(this.assignMyReaction(note.reply, this.noteEntityService));
+		}
+
+		await Promise.all(reactionsToFetch);
 
 		this.connection.cacheNote(note);
 
diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
index 01645fe657..8c58b2518e 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -98,13 +98,20 @@ class HybridTimelineChannel extends Channel {
 			}
 		}
 
-		if (this.user && note.renoteId && !note.text) {
-			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
-				console.log(note.renote.reactionAndUserPairCache);
-				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+		const reactionsToFetch = [];
+		if (this.user && isRenotePacked(note) && !isQuotePacked(note)) {
+			if (note.renote) {
+				reactionsToFetch.push(this.assignMyReaction(note.renote, this.noteEntityService));
+				if (note.renote.reply) {
+					reactionsToFetch.push(this.assignMyReaction(note.renote.reply, this.noteEntityService));
+				}
 			}
 		}
+		if (this.user && note.reply) {
+			reactionsToFetch.push(this.assignMyReaction(note.reply, this.noteEntityService));
+		}
+
+		await Promise.all(reactionsToFetch);
 
 		this.connection.cacheNote(note);
 
diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts
index 1f9d25b44d..cb832bd3c2 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -70,12 +70,20 @@ class LocalTimelineChannel extends Channel {
 
 		if (this.isNoteMutedOrBlocked(note)) return;
 
+		const reactionsToFetch = [];
 		if (this.user && isRenotePacked(note) && !isQuotePacked(note)) {
-			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
-				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+			if (note.renote) {
+				reactionsToFetch.push(this.assignMyReaction(note.renote, this.noteEntityService));
+				if (note.renote.reply) {
+					reactionsToFetch.push(this.assignMyReaction(note.renote.reply, this.noteEntityService));
+				}
 			}
 		}
+		if (this.user && note.reply) {
+			reactionsToFetch.push(this.assignMyReaction(note.reply, this.noteEntityService));
+		}
+
+		await Promise.all(reactionsToFetch);
 
 		this.connection.cacheNote(note);