From d54e28d2860c98570b4facd7e92ddfbd302474c0 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Wed, 21 Jun 2023 02:30:57 +0900
Subject: [PATCH] =?UTF-8?q?enhance(client):=20Renote=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E5=89=8D=E3=81=AB=E7=A2=BA=E8=AA=8D=E3=83=9D=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                             | 1 +
 locales/en-US.yml                                   | 1 +
 locales/index.d.ts                                  | 1 +
 locales/ja-JP.yml                                   | 1 +
 locales/ko-KR.yml                                   | 1 +
 packages/frontend/src/components/MkNote.vue         | 8 +++++++-
 packages/frontend/src/components/MkNoteDetailed.vue | 8 +++++++-
 7 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 9fcb76380d..59739ad816 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -27,6 +27,7 @@
 전체 변경 사항을 확인하려면, [CHANGELOG.md#13xx](CHANGELOG.md#13xx) 문서를 참고하십시오.
 
 ### Client
+- 리노트 전 확인 팝업을 띄움
 - Fix: 그룹 초대 알림 아이콘이 잘못 표시되는 문제
 - Fix: 노트 디자인이 올바르지 않게 표시되는 문제
 - Fix: 프로필 아이콘이 투명일 때 노트 답글선이 비치는 문제
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 87fd214229..ffea596a32 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1,5 +1,6 @@
 ---
 _lang_: "English"
+renoteConfirm: "Do you want to Renote?"
 posted: "Note are now published."
 translateNote: "Translate Note"
 showTranslateButtonInNote: "Display translate button in note body"
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 14ba6e9741..37edf8b53d 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -3,6 +3,7 @@
 // Do not edit this file directly.
 export interface Locale {
     "_lang_": string;
+    "renoteConfirm": string;
     "posted": string;
     "translateNote": string;
     "showTranslateButtonInNote": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 519c20de0b..dd8f2eefe0 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,5 +1,6 @@
 _lang_: "日本語"
 
+renoteConfirm: "Renoteしますか？"
 posted: "ノートを公開しました。"
 translateNote: "ノートを翻訳する"
 showTranslateButtonInNote: "ノート本文に翻訳ボタンを表示"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index ed2c11a6cd..8c4b2d9992 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1,5 +1,6 @@
 ---
 _lang_: "한국어"
+renoteConfirm: "리노트 할까요?"
 posted: "노트를 게시했어요!"
 translateNote: "노트 번역하기"
 showTranslateButtonInNote: "노트 본문에 번역 버튼 표시"
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 6488b5b01f..9e53d7998a 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -302,10 +302,16 @@ useTooltip(renoteButton, async (showing) => {
 	}, {}, 'closed');
 });
 
-function renote() {
+async function renote() {
 	pleaseLogin();
 	showMovedDialog();
 
+	const { canceled } = await os.confirm({
+		type: 'info',
+		text: i18n.ts.renoteConfirm,
+	});
+	if (canceled) return;
+
 	if (appearNote.channel) {
 		const el = renoteButton.value as HTMLElement | null | undefined;
 		if (el) {
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 7107848d0a..5de69a7168 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -284,10 +284,16 @@ useTooltip(renoteButton, async (showing) => {
 	}, {}, 'closed');
 });
 
-function renote() {
+async function renote() {
 	pleaseLogin();
 	showMovedDialog();
 
+	const { canceled } = await os.confirm({
+		type: 'info',
+		text: i18n.ts.renoteConfirm,
+	});
+	if (canceled) return;
+
 	if (appearNote.channel) {
 		const el = renoteButton.value as HTMLElement | null | undefined;
 		if (el) {