From adf22143aa249cb52b72dca3ce0547c6b969d0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 3 Mar 2025 21:05:50 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"enhance(frontend):=20=E3=83=81?=
 =?UTF-8?q?=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E6=8A=95=E7=A8=BF=E3=82=92?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=81=A8=E5=89=8D=E5=BE=8C=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AB?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B"=20(#15589)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert "enhance(frontend): チャンネル投稿をユーザーページと前後ノートに表示する (#15532)"

This reverts commit a4711ab4c11357c8ffa586dbec56043a0b0f33e0.

* Update CHANGELOG.md
---
 CHANGELOG.md                                        | 1 -
 packages/frontend/src/pages/note.vue                | 3 ---
 packages/frontend/src/pages/user/index.timeline.vue | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b733e46f..e1a8ba6ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,6 @@
 
 ### Client
 - Enhance: モデレーターがセンシティブ設定を変更する際に確認ダイアログを出すように
-- Enhance: ユーザーページのノート一覧と前後のノート表示でチャンネルのノートを含めるように
 - Enhance: 「UIのアニメーションを減らす」で画面上のエフェクトも減らせるように
 - Fix: 削除して編集の削除タイミングを投稿後になるように `#14498`
 - Fix: フォローされたときのメッセージがちらつくことがある問題を修正
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 2613437d2..0791c1343 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -87,7 +87,6 @@ const prevUserPagination: Paging = {
 	params: computed(() => note.value ? ({
 		userId: note.value.userId,
 		untilId: note.value.id,
-		withChannelNotes: true,
 	}) : undefined),
 };
 
@@ -98,8 +97,6 @@ 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 543dce865..49d015a53 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: true,
+		withChannelNotes: tab.value === 'all',
 		withFiles: tab.value === 'files',
 	},
 });