Fix filters in streaming channels with hashtags option

yuriha-chan · Dec 4, 2023 · 64a8add · 64a8add
1 parent 4c7a235
commit 64a8add
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -63,7 +63,7 @@ class GlobalTimelineChannel extends Channel {
 
 		if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !this.withRenotes) return;
 
-		if (note.tags && !this.withHashtags) return;
+		if (note.tags.length > 0 && !this.withHashtags) return;
 
 		// Ignore notes from instances the user has muted
 		if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? []))) return;

diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -74,7 +74,7 @@ class HomeTimelineChannel extends Channel {
 
 		if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !this.withRenotes) return;
 
-		if (note.tags && !this.withHashtags) return;
+		if (note.tags.length > 0 && !this.withHashtags) return;
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.userIdsWhoMeMuting)) return;

diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -88,7 +88,7 @@ class HybridTimelineChannel extends Channel {
 
 		if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !this.withRenotes) return;
 
-		if (note.tags && !this.withHashtags) return;
+		if (note.tags.length > 0 && !this.withHashtags) return;
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.userIdsWhoMeMuting)) return;

diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -65,7 +65,7 @@ class LocalTimelineChannel extends Channel {
 
 		if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !this.withRenotes) return;
 
-		if (note.tags && !this.withHashtags) return;
+		if (note.tags.length > 0 && !this.withHashtags) return;
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.userIdsWhoMeMuting)) return;