From f3bdce06368afe68a6043a1e93045d5c4d2a6891 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 17:02:58 -0400
Subject: [PATCH] Fix #10236

---
 packages/client/src/components/MkNote.vue           |  1 +
 packages/client/src/components/MkNoteSub.vue        |  1 +
 packages/client/src/components/MkSubNoteContent.vue | 10 ++++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index af3e1c4eea..589b83a513 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -9,6 +9,7 @@
 		class="tkcbzcuz note-container"
 		:tabindex="!isDeleted ? '-1' : null"
 		:class="{ renote: isRenote }"
+		:id="appearNote.id"
 	>
 		<MkNoteSub
 			v-if="appearNote.reply && !detailedView"
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index f4637948d1..dd69145a03 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -30,6 +30,7 @@
 						:note="note"
 						:parentId="parentId"
 						:conversation="conversation"
+						:detailedView="detailedView"
 						@focusfooter="footerEl.focus()"
 					/>
 					<div v-if="translating || translation" class="translation">
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index d6263cfd2b..e651b3923c 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -2,7 +2,7 @@
 	<p v-if="note.cw != null" class="cw">
 		<MkA
 			v-if="conversation && note.renoteId == parentId"
-			:to="`#${parentId}`"
+			:to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
 			behavior="browser"
 			class="reply-icon"
 			@click.stop
@@ -11,7 +11,7 @@
 		</MkA>
 		<MkA
 			v-else-if="!detailed && note.replyId"
-			:to="`#${note.replyId}`"
+			:to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
 			behavior="browser"
 			v-tooltip="i18n.ts.jumpToPrevious"
 			class="reply-icon"
@@ -66,7 +66,7 @@
 				<template v-if="!note.cw">
 					<MkA
 						v-if="conversation && note.renoteId == parentId"
-						:to="`#${parentId}`"
+						:to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
 						behavior="browser"
 						class="reply-icon"
 						@click.stop
@@ -75,7 +75,7 @@
 					</MkA>
 					<MkA
 						v-else-if="!detailed && note.replyId"
-						:to="`#${note.replyId}`"
+						:to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
 						behavior="browser"
 						v-tooltip="i18n.ts.jumpToPrevious"
 						class="reply-icon"
@@ -173,11 +173,13 @@ import MkUrlPreview from "@/components/MkUrlPreview.vue";
 import XShowMoreButton from "@/components/MkShowMoreButton.vue";
 import XCwButton from "@/components/MkCwButton.vue";
 import MkButton from "@/components/MkButton.vue";
+import { notePage } from "@/filters/note";
 import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { extractMfmWithAnimation } from "@/scripts/extract-mfm";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
 
+
 const props = defineProps<{
 	note: misskey.entities.Note;
 	parentId?;