From af6ad497441b3ae4332fd4f2610bbc805ab768c5 Mon Sep 17 00:00:00 2001
From: pen <121443048+penginn-net@users.noreply.github.com>
Date: Sat, 21 Dec 2024 19:44:20 +0900
Subject: [PATCH 1/4] =?UTF-8?q?Fix(frontend):=20=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E8=A9=B3=E7=B4=B0=E7=94=BB=E9=9D=A2=E3=81=A7=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=20(#584)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_YOJO.md                                | 16 ++++++++++++++++
 .../frontend/src/components/MkNoteDetailed.vue   |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
index ff6ab1c5a3..cc47dc04b9 100644
--- a/CHANGELOG_YOJO.md
+++ b/CHANGELOG_YOJO.md
@@ -1,3 +1,19 @@
+## 1.2.2
+Cherrypick 4.13.0  
+Misskey 2024.10.1
+
+### Release Date
+xxxx-xx-xx
+
+### General
+-
+
+### Client
+- Fix: ノート詳細画面でリアクション出来ない [#584](https://github.com/yojo-art/cherrypick/pull/584)
+
+### Server
+-
+
 ## 1.2.1
 Cherrypick 4.13.0  
 Misskey 2024.10.1
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 1a43490640..e6f4452afa 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -201,7 +201,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button v-if="appearNote.reactionAcceptance !== 'likeOnly' && appearNote.myReaction == null && defaultStore.state.showLikeButtonInNoteFooter" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.noteFooterButton" class="_button" @click="heartReact()">
 				<i class="ti ti-heart"></i>
 			</button>
-			<button v-if="defaultStore.state.showDoReactionButtonInNoteFooter" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null ? i18n.ts.unlike : appearNote.myReaction != null ? i18n.ts.editReaction : appearNote.reactionAcceptance === 'likeOnly' ? i18n.ts.like : i18n.ts.doReaction" :class="$style.noteFooterButton" class="_button" @click.stop="toggleReact()">
+			<button v-if="defaultStore.state.showDoReactionButtonInNoteFooter" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null ? i18n.ts.unlike : appearNote.myReaction != null ? i18n.ts.editReaction : appearNote.reactionAcceptance === 'likeOnly' ? i18n.ts.like : i18n.ts.doReaction" :class="$style.noteFooterButton" class="_button" @click.stop="react()">
 				<i v-if="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null" class="ti ti-heart-filled" style="color: var(--MI_THEME-love);"></i>
 				<i v-else-if="appearNote.myReaction != null" class="ti ti-mood-edit" style="color: var(--MI_THEME-accent);"></i>
 				<i v-else-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>

From 034a45e22e36630a01fcf9db07fb788e3d7aa7d0 Mon Sep 17 00:00:00 2001
From: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:16:31 +0900
Subject: [PATCH 2/4] =?UTF-8?q?MFM=E3=83=81=E3=83=BC=E3=83=88=E3=82=B7?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#592)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_YOJO.md                             |  1 +
 .../frontend/src/pages/mfc-cheat-sheet.vue    | 78 +++++++++----------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
index cc47dc04b9..53597eef90 100644
--- a/CHANGELOG_YOJO.md
+++ b/CHANGELOG_YOJO.md
@@ -10,6 +10,7 @@ xxxx-xx-xx
 
 ### Client
 - Fix: ノート詳細画面でリアクション出来ない [#584](https://github.com/yojo-art/cherrypick/pull/584)
+- Fix: MFMチートシートが表示できない不具合を修正 [#592](https://github.com/yojo-art/cherrypick/pull/592)
 
 ### Server
 -
diff --git a/packages/frontend/src/pages/mfc-cheat-sheet.vue b/packages/frontend/src/pages/mfc-cheat-sheet.vue
index 23bf1face2..f9edc90619 100644
--- a/packages/frontend/src/pages/mfc-cheat-sheet.vue
+++ b/packages/frontend/src/pages/mfc-cheat-sheet.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.mentionDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_mention"/>
-						<MkTextarea v-model="preview_mention" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_mention" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.hashtagDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_hashtag"/>
-						<MkTextarea v-model="preview_hashtag" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_hashtag" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -35,7 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.urlDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_url"/>
-						<MkTextarea v-model="preview_url" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_url" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.linkDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_link"/>
-						<MkTextarea v-model="preview_link" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_link" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -55,7 +55,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.emojiDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_emoji"/>
-						<MkTextarea v-model="preview_emoji" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_emoji" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -65,7 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.boldDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_bold"/>
-						<MkTextarea v-model="preview_bold" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_bold" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -75,7 +75,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.smallDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_small"/>
-						<MkTextarea v-model="preview_small" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_small" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -85,7 +85,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.quoteDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_quote"/>
-						<MkTextarea v-model="preview_quote" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_quote" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -95,7 +95,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.centerDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_center"/>
-						<MkTextarea v-model="preview_center" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_center" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -105,7 +105,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.inlineCodeDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_inlineCode"/>
-						<MkTextarea v-model="preview_inlineCode" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_inlineCode" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -115,7 +115,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.blockCodeDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_blockCode"/>
-						<MkTextarea v-model="preview_blockCode" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_blockCode" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -125,7 +125,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.inlineMathDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_inlineMath"/>
-						<MkTextarea v-model="preview_inlineMath" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_inlineMath" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -135,7 +135,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.blockMathDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_blockMath"/>
-						<MkTextarea v-model="preview_blockMath" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_blockMath" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -145,7 +145,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.searchDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_search"/>
-						<MkTextarea v-model="preview_search" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_search" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -155,7 +155,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.flipDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_flip"/>
-						<MkTextarea v-model="preview_flip" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_flip" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -165,7 +165,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.fontDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_font"/>
-						<MkTextarea v-model="preview_font" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_font" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -175,7 +175,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.x2Description }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_x2"/>
-						<MkTextarea v-model="preview_x2" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_x2" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -185,7 +185,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.x3Description }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_x3"/>
-						<MkTextarea v-model="preview_x3" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_x3" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -195,7 +195,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.x4Description }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_x4"/>
-						<MkTextarea v-model="preview_x4" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_x4" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -205,7 +205,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.blurDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_blur"/>
-						<MkTextarea v-model="preview_blur" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_blur" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -215,7 +215,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.jellyDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_jelly"/>
-						<MkTextarea v-model="preview_jelly" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_jelly" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -225,7 +225,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.tadaDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_tada"/>
-						<MkTextarea v-model="preview_tada" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_tada" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -235,7 +235,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.jumpDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_jump"/>
-						<MkTextarea v-model="preview_jump" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_jump" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -245,7 +245,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.bounceDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_bounce"/>
-						<MkTextarea v-model="preview_bounce" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_bounce" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -255,7 +255,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.spinDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_spin"/>
-						<MkTextarea v-model="preview_spin" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_spin" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -265,7 +265,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.shakeDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_shake"/>
-						<MkTextarea v-model="preview_shake" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_shake" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -275,7 +275,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.twitchDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_twitch"/>
-						<MkTextarea v-model="preview_twitch" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_twitch" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -285,7 +285,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.rainbowDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_rainbow"/>
-						<MkTextarea v-model="preview_rainbow" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_rainbow" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -295,7 +295,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.sparkleDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_sparkle"/>
-						<MkTextarea v-model="preview_sparkle" :class="$style.text"><span>MFC {{ i18n.ts.sample }}</span></MkTextarea>
+						<MkTextarea v-model="preview_sparkle" :class="$style.text"><span>MFM {{ i18n.ts.sample }}</span></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -305,7 +305,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.fadeDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_fade"/>
-						<MkTextarea v-model="preview_fade" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_fade" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -315,7 +315,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.rotateDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_rotate"/>
-						<MkTextarea v-model="preview_rotate" :class="$style.text"><span>MFC {{ i18n.ts.sample }}</span></MkTextarea>
+						<MkTextarea v-model="preview_rotate" :class="$style.text"><span>MFM {{ i18n.ts.sample }}</span></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -325,7 +325,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.positionDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_position"/>
-						<MkTextarea v-model="preview_position" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_position" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -335,7 +335,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.scaleDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_scale"/>
-						<MkTextarea v-model="preview_scale" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_scale" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -345,7 +345,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.fgDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_fg"/>
-						<MkTextarea v-model="preview_fg" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_fg" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -355,7 +355,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.bgDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_bg"/>
-						<MkTextarea v-model="preview_bg" :class="$style.text"><template #label>MFC {{ i18n.ts.sample }}</template></MkTextarea>
+						<MkTextarea v-model="preview_bg" :class="$style.text"><template #label>MFM {{ i18n.ts.sample }}</template></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -365,7 +365,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.plainDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_plain"/>
-						<MkTextarea v-model="preview_plain" :class="$style.text"><span>MFC {{ i18n.ts.sample }}</span></MkTextarea>
+						<MkTextarea v-model="preview_plain" :class="$style.text"><span>MFM {{ i18n.ts.sample }}</span></MkTextarea>
 					</div>
 				</div>
 			</div>
@@ -375,15 +375,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<p>{{ i18n.ts._mfc.rubyDescription }}</p>
 					<div :class="$style.preview">
 						<Mfm :text="preview_ruby"/>
-						<MkTextarea v-model="preview_ruby" :class="$style.text"><span>MFC {{ i18n.ts.sample }}</span></MkTextarea>
+						<MkTextarea v-model="preview_ruby" :class="$style.text"><span>MFM {{ i18n.ts.sample }}</span></MkTextarea>
 					</div>
 				</div>
 			</div>
 		</div>
 		<div :class="$style.section">
-			<div :class="$style.title">{{ i18n.ts._mfm.border }}</div>
+			<div :class="$style.title">{{ i18n.ts._mfc.border }}</div>
 			<div :class="$style.content">
-				<p>{{ i18n.ts._mfm.borderDescription }}</p>
+				<p>{{ i18n.ts._mfc.borderDescription }}</p>
 				<div :class="$style.preview">
 					<Mfm :text="preview_border"/>
 					<MkTextarea v-model="preview_border" :class="$style.text"><span>MFM {{ i18n.ts.sample }}</span></MkTextarea>

From 7f72cf91926fd9571275b6fecaf58bc153745d45 Mon Sep 17 00:00:00 2001
From: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:18:43 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=81=A7=E8=A1=A8=E7=A4=BA=E6=9C=89=E7=84=A1=E9=81=B8=E6=8A=9E?=
 =?UTF-8?q?=E3=81=AE=E9=81=B8=E6=8A=9E=E8=82=A2=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#590)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_YOJO.md                        |  1 +
 packages/frontend/src/pages/timeline.vue | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
index 53597eef90..c2450bbeb4 100644
--- a/CHANGELOG_YOJO.md
+++ b/CHANGELOG_YOJO.md
@@ -10,6 +10,7 @@ xxxx-xx-xx
 
 ### Client
 - Fix: ノート詳細画面でリアクション出来ない [#584](https://github.com/yojo-art/cherrypick/pull/584)
+- Fix: タイムラインオプションで表示有無選択の選択肢を修正 [#590](https://github.com/yojo-art/cherrypick/pull/590)
 - Fix: MFMチートシートが表示できない不具合を修正 [#592](https://github.com/yojo-art/cherrypick/pull/592)
 
 ### Server
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index bf6aed63e4..02a6aaf70b 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -176,7 +176,7 @@ const enableSocialTimeline = ref(defaultStore.state.enableSocialTimeline);
 const enableGlobalTimeline = ref(defaultStore.state.enableGlobalTimeline);
 const enableListTimeline = ref(defaultStore.state.enableListTimeline);
 const enableAntennaTimeline = ref(defaultStore.state.enableAntennaTimeline);
-const enableChannelTimeline = ref(defaultStore.state.enableChannelTimeline);
+const enableTagTimeline = ref(defaultStore.state.enableTagTimeline);
 
 const collapseRenotes = ref(defaultStore.state.collapseRenotes);
 const collapseReplies = ref(defaultStore.state.collapseReplies);
@@ -234,8 +234,8 @@ watch(enableAntennaTimeline, (x) => {
 	reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
 });
 
-watch(enableChannelTimeline, (x) => {
-	defaultStore.set('enableChannelTimeline', x);
+watch(enableTagTimeline, (x) => {
+	defaultStore.set('enableTagTimeline', x);
 	reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
 });
 
@@ -525,9 +525,9 @@ const headerActions = computed(() => {
 							ref: enableAntennaTimeline,
 						}, {
 							type: 'switch',
-							text: i18n.ts.channel,
-							icon: 'ti ti-device-tv',
-							ref: enableChannelTimeline,
+							text: i18n.ts.tags,
+							icon: 'ti ti-hash',
+							ref: enableTagTimeline,
 						});
 
 						return displayOfTimelineChildMenu;

From 0acc86ae19efb82366cb6d361efa3e0be3fea046 Mon Sep 17 00:00:00 2001
From: pen <121443048+penginn-net@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:58:03 +0900
Subject: [PATCH 4/4] Fix(backend): OutboxFetch (#588)

---
 CHANGELOG_YOJO.md                             |  2 +-
 .../models/ApOutboxFetchService.ts            | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
index c2450bbeb4..fb26fbe298 100644
--- a/CHANGELOG_YOJO.md
+++ b/CHANGELOG_YOJO.md
@@ -14,7 +14,7 @@ xxxx-xx-xx
 - Fix: MFMチートシートが表示できない不具合を修正 [#592](https://github.com/yojo-art/cherrypick/pull/592)
 
 ### Server
--
+- Fix:`api/ap/fetch-outbox`でリノートしか取得されないのを修正 [#588](https://github.com/yojo-art/cherrypick/pull/588)
 
 ## 1.2.1
 Cherrypick 4.13.0  
diff --git a/packages/backend/src/core/activitypub/models/ApOutboxFetchService.ts b/packages/backend/src/core/activitypub/models/ApOutboxFetchService.ts
index 8fc4dff1a7..e108da6011 100644
--- a/packages/backend/src/core/activitypub/models/ApOutboxFetchService.ts
+++ b/packages/backend/src/core/activitypub/models/ApOutboxFetchService.ts
@@ -66,7 +66,6 @@ export class ApOutboxFetchService implements OnModuleInit {
 		this.apLoggerService = this.moduleRef.get('ApLoggerService');
 		this.logger = this.apLoggerService.logger;
 	}
-
 	/**
 	 * outboxから投稿を取得します
 	 */
@@ -85,14 +84,19 @@ export class ApOutboxFetchService implements OnModuleInit {
 		const cache = await this.redisClient.get(`${outboxUrl}--next`);
 		let next: string | IOrderedCollectionPage;
 
-		if (!cache) {
+		if (cache) {
+			next = cache;
+		} else {
 			// Resolve to (Ordered)Collection Object
 			const outbox = await Resolver.resolveOrderedCollection(outboxUrl);
 			if (!outbox.first) throw new IdentifiableError('a723c2df-0250-4091-b5fc-e3a7b36c7b61', 'outbox first page not exist');
 			next = outbox.first;
-		} else next = cache;
+		}
 
-		let created = 0;
+		let current = {
+			created: 0,
+			breaked: false,
+		};
 
 		for (let page = 0; page < pagelimit; page++) {
 			const collection = (typeof(next) === 'string' ? await Resolver.resolveOrderedCollectionPage(next) : next);
@@ -101,10 +105,13 @@ export class ApOutboxFetchService implements OnModuleInit {
 			const activityes = (collection.orderedItems ?? collection.items);
 			if (!activityes) throw new IdentifiableError('2a05bb06-f38c-4854-af6f-7fd5e87c98ee', 'item is unavailable');
 
-			created = await this.fetchObjects(user, activityes, includeAnnounce, created);
-			if (createLimit <= created) break;//次ページ見て一件だけしか取れないのは微妙
-			if (!collection.next) break;
+			do {
+				current = await this.fetchObjects(user, activityes, includeAnnounce, current.created);
+				page++;
+			}
+			while (!current.breaked && page < pagelimit);
 
+			if (!collection.next) break;
 			next = collection.next;
 			await this.redisClient.set(`${outboxUrl}--next`, `${next}`, 'EX', 60 * 15);//15min
 		}
@@ -112,9 +119,12 @@ export class ApOutboxFetchService implements OnModuleInit {
 	}
 
 	@bindThis
-	private async fetchObjects(user: MiRemoteUser, activityes: any[], includeAnnounce:boolean, created: number): Promise<number> {
+	private async fetchObjects(user: MiRemoteUser, activityes: any[], includeAnnounce:boolean, created: number): Promise<{
+		created: number;
+		breaked: boolean;
+	}> {
 		for (const activity of activityes) {
-			if (createLimit < created) return created;
+			if (createLimit < created) return { created: created, breaked: true };
 			try {
 				if (activity.actor !== user.uri) throw new IdentifiableError('bde7c204-5441-4a87-9b7e-f81e8d05788a');
 				if (activity.type === 'Announce' && includeAnnounce) {
@@ -177,7 +187,7 @@ export class ApOutboxFetchService implements OnModuleInit {
 					}
 				} else if (isCreate(activity)) {
 					if (typeof(activity.object) !== 'string') {
-						if (!isNote(activity)) continue;
+						if (!isNote(activity.object)) continue;
 					}
 					const fetch = await this.apNoteService.fetchNote(activity.object);
 					if (fetch) continue;
@@ -190,11 +200,11 @@ export class ApOutboxFetchService implements OnModuleInit {
 				} else {
 					this.logger.error(`fetchError:${activity.id}`);
 					this.logger.error(`${err}`);
-					continue;
 				}
+				continue;
 			}
 			created ++;
 		}
-		return created;
+		return { created: created, breaked: false };
 	}
 }