summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-04-03 11:32:55 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-04-03 11:32:55 +0900
commit455be80b4f7ff04a71d1773b2ec058adb3af3e69 (patch)
tree8bfbfd5c37aeb79950c0f2a0044a6f1f60716dd6
parentfix(backend/chat): 自分が作ったチャットルームに他人がメッ... (diff)
downloadsharkey-455be80b4f7ff04a71d1773b2ec058adb3af3e69.tar.gz
sharkey-455be80b4f7ff04a71d1773b2ec058adb3af3e69.tar.bz2
sharkey-455be80b4f7ff04a71d1773b2ec058adb3af3e69.zip
fix(backend): 非ログインでタイムラインのストリームに接続した際、表示にログイン必須のノートが流れる場合がある問題を修正
-rw-r--r--CHANGELOG.md1
-rw-r--r--packages/backend/src/server/api/stream/channels/global-timeline.ts1
-rw-r--r--packages/backend/src/server/api/stream/channels/local-timeline.ts1
3 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f54948619..9da5e9bb2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@
- Fix: ActivityPubリクエストURLチェック実装は仕様に従っていないのを修正
- Fix: 連合無しモードでも外部から照会可能だった問題を修正
- Fix: テスト用WebHookのペイロードの`emojis`パラメータが実際のものと異なる問題を修正
+- Fix: 非ログインでタイムラインのストリームに接続した際、表示にログイン必須のノートが流れる場合がある問題を修正
## 2025.3.1
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 ed56fe0d40..4f64ce6866 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -50,6 +50,7 @@ class GlobalTimelineChannel extends Channel {
if (note.visibility !== 'public') return;
if (note.channelId != null) return;
+ if (note.user.requireSigninToViewContents && this.user == null) return;
if (isRenotePacked(note) && !isQuotePacked(note) && !this.withRenotes) 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
index 491029f5de..c3cf78a24a 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -53,6 +53,7 @@ class LocalTimelineChannel extends Channel {
if (note.user.host !== null) return;
if (note.visibility !== 'public') return;
if (note.channelId != null) return;
+ if (note.user.requireSigninToViewContents && this.user == null) return;
// 関係ない返信は除外
if (note.reply && this.user && !this.following[note.userId]?.withReplies && !this.withReplies) {