From a4711ab4c11357c8ffa586dbec56043a0b0f33e0 Mon Sep 17 00:00:00 2001
From: 鴇峰 朔華 <160555157+sakuhanight@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:28:29 +0900
Subject: enhance(frontend):
 チャンネル投稿をユーザーページと前後ノートに表示する (#15532)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): ユーザーページで常にチャンネル投稿が含まれるように

* enhance(frontend): ノート詳細の前後の投稿にチャンネル投稿を含めるように

* ログイン有無の削除
---
 packages/frontend/src/pages/note.vue                | 3 +++
 packages/frontend/src/pages/user/index.timeline.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 0791c1343b..2613437d2b 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -87,6 +87,7 @@ const prevUserPagination: Paging = {
 	params: computed(() => note.value ? ({
 		userId: note.value.userId,
 		untilId: note.value.id,
+		withChannelNotes: true,
 	}) : undefined),
 };
 
@@ -97,6 +98,8 @@ const nextUserPagination: Paging = {
 	params: computed(() => note.value ? ({
 		userId: note.value.userId,
 		sinceId: note.value.id,
+		withChannelNotes: true,
+		includeSensitiveChannel: $i != null,
 	}) : undefined),
 };
 
diff --git a/packages/frontend/src/pages/user/index.timeline.vue b/packages/frontend/src/pages/user/index.timeline.vue
index 49d015a530..543dce8656 100644
--- a/packages/frontend/src/pages/user/index.timeline.vue
+++ b/packages/frontend/src/pages/user/index.timeline.vue
@@ -43,7 +43,7 @@ const pagination = computed(() => tab.value === 'featured' ? {
 		userId: props.user.id,
 		withRenotes: tab.value === 'all',
 		withReplies: tab.value === 'all',
-		withChannelNotes: tab.value === 'all',
+		withChannelNotes: true,
 		withFiles: tab.value === 'files',
 	},
 });
-- 
cgit v1.3.1-freya