From 2fc58a780e5a1f5e40b3d8d18ae6cc1d0dfd8bc1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 28 Nov 2021 20:29:37 +0900
Subject: [PATCH] =?UTF-8?q?feat(client):=20Renote=E3=81=AA=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E8=A9=B3=E7=B4=B0=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E5=85=83=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AB=E9=81=B7=E7=A7=BB=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                     | 1 +
 packages/client/src/components/note-detailed.vue | 6 +++++-
 packages/client/src/components/note-header.vue   | 2 +-
 packages/client/src/components/note.sub.vue      | 2 +-
 packages/client/src/components/notification.vue  | 2 +-
 packages/client/src/filters/note.ts              | 2 +-
 packages/client/src/pages/user/index.photos.vue  | 2 +-
 packages/client/src/ui/chat/note-header.vue      | 2 +-
 8 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba346f762..7c38d6027 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 ### Improvements
 - API: /antennas/notes API で日付による絞り込みができるように
 - クライアント: アンケートに投票する際に確認ダイアログを出すように
+- クライアント: Renoteなノート詳細ページから元のノートページに遷移できるように
 
 ### Bugfixes
 - クライアント: ログインにおいてパスワードが誤っている際のエラーメッセージが正しく表示されない問題を修正
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index 378dd6516..03f6a767f 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -84,7 +84,9 @@
 			</div>
 			<footer class="footer">
 				<div class="info">
-					<MkTime class="created-at" :time="appearNote.createdAt" mode="detail"/>
+					<MkA class="created-at" :to="notePage(appearNote)">
+						<MkTime :time="appearNote.createdAt" mode="detail"/>
+					</MkA>
 				</div>
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 				<button class="button _button" @click="reply()">
@@ -136,6 +138,7 @@ import { url } from '@/config';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { checkWordMute } from '@/scripts/check-word-mute';
 import { userPage } from '@/filters/user';
+import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import { noteActions, noteViewInterruptors } from '@/store';
 import { reactionPicker } from '@/scripts/reaction-picker';
@@ -181,6 +184,7 @@ export default defineComponent({
 			muted: false,
 			translation: null,
 			translating: false,
+			notePage,
 		};
 	},
 
diff --git a/packages/client/src/components/note-header.vue b/packages/client/src/components/note-header.vue
index 3bbeeece1..26e725c6b 100644
--- a/packages/client/src/components/note-header.vue
+++ b/packages/client/src/components/note-header.vue
@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';
 
diff --git a/packages/client/src/components/note.sub.vue b/packages/client/src/components/note.sub.vue
index 40e1f5c8c..de4218e53 100644
--- a/packages/client/src/components/note.sub.vue
+++ b/packages/client/src/components/note.sub.vue
@@ -26,7 +26,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import XNoteHeader from './note-header.vue';
 import XSubNoteContent from './sub-note-content.vue';
 import XCwButton from './cw-button.vue';
diff --git a/packages/client/src/components/notification.vue b/packages/client/src/components/notification.vue
index 5cf44f4c5..15d36f5a6 100644
--- a/packages/client/src/components/notification.vue
+++ b/packages/client/src/components/notification.vue
@@ -74,7 +74,7 @@ import { getNoteSummary } from '@/scripts/get-note-summary';
 import XReactionIcon from './reaction-icon.vue';
 import MkFollowButton from './follow-button.vue';
 import XReactionTooltip from './reaction-tooltip.vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
diff --git a/packages/client/src/filters/note.ts b/packages/client/src/filters/note.ts
index 5c000cf83..cd9b7d98d 100644
--- a/packages/client/src/filters/note.ts
+++ b/packages/client/src/filters/note.ts
@@ -1,3 +1,3 @@
-export default note => {
+export const notePage = note => {
 	return `/notes/${note.id}`;
 };
diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue
index 589a9465d..79dd1726e 100644
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@@ -20,7 +20,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
 import ImgWithBlurhash from '@/components/img-with-blurhash.vue';
diff --git a/packages/client/src/ui/chat/note-header.vue b/packages/client/src/ui/chat/note-header.vue
index 32b4573dc..5f87fdd14 100644
--- a/packages/client/src/ui/chat/note-header.vue
+++ b/packages/client/src/ui/chat/note-header.vue
@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import notePage from '@/filters/note';
+import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';