From 416accbe789586ce3fabcca525a3e18658aeecaf Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 6 Feb 2020 09:09:24 +0900
Subject: [PATCH] =?UTF-8?q?Renote=E3=82=92=E8=A7=A3=E9=99=A4=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

Resolve #2231
---
 CHANGELOG.md                            |  1 +
 locales/ja-JP.yml                       |  1 +
 src/client/components/note.vue          | 32 +++++++++++++++++++++----
 src/client/components/renote-picker.vue |  2 +-
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2d1a245e..e404a8fb91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ v12ではいくつかインスタンスにとって破壊的な変更があり
 	* ユーザーの登録日を表示するように
 	* タイムラインウィジェットを追加
 	* 投稿フォームでメンションを追加するのが簡単に
+	* Renoteを解除できるように
 	* スマホ/タブレットでも絵文字ピッカーを使えるように
 	* ユーザーを選択する操作が便利に
 	* ユーザーページからユーザーにメッセージを送れるように
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5d7b971cdb..e0957befa5 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -93,6 +93,7 @@ unfollow: "フォロー解除"
 followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
 renote: "Renote"
+unrenote: "Renote解除"
 quote: "引用"
 pinnedNote: "ピン留めされた投稿"
 you: "あなた"
diff --git a/src/client/components/note.vue b/src/client/components/note.vue
index 8b3fa61a65..f143fe75ae 100644
--- a/src/client/components/note.vue
+++ b/src/client/components/note.vue
@@ -1,8 +1,8 @@
 <template>
 <div
 	class="note _panel"
-	v-show="appearNote.deletedAt == null && !hideThisNote"
-	:tabindex="appearNote.deletedAt == null ? '-1' : null"
+	v-show="!isDeleted && !hideThisNote"
+	:tabindex="!isDeleted ? '-1' : null"
 	:class="{ renote: isRenote }"
 	v-hotkey="keymap"
 	v-size="[{ max: 500 }, { max: 450 }, { max: 350 }, { max: 300 }]"
@@ -19,7 +19,7 @@
 			</router-link>
 		</i18n>
 		<div class="info">
-			<mk-time :time="note.createdAt"/>
+			<button class="_button time" @click="showRenoteMenu"><mk-time :time="note.createdAt"/></button>
 			<span class="visibility" v-if="note.visibility != 'public'">
 				<fa v-if="note.visibility == 'home'" :icon="faHome"/>
 				<fa v-if="note.visibility == 'followers'" :icon="faUnlock"/>
@@ -83,7 +83,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan } from '@fortawesome/free-solid-svg-icons';
+import { faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan, faTrashAlt } from '@fortawesome/free-solid-svg-icons';
 import { parse } from '../../mfm/parse';
 import { sum, unique } from '../../prelude/array';
 import i18n from '../i18n';
@@ -192,6 +192,10 @@ export default Vue.extend({
 			return this.isRenote ? this.note.renote : this.note;
 		},
 
+		isDeleted(): boolean {
+			return this.appearNote.deletedAt != null || this.note.deletedAt != null;
+		},
+
 		isMyNote(): boolean {
 			return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.appearNote.userId);
 		},
@@ -453,6 +457,23 @@ export default Vue.extend({
 			});
 		},
 
+		showRenoteMenu(ev) {
+			if (!this.isMyNote) return;
+			this.$root.menu({
+				items: [{
+					text: this.$t('unrenote'),
+					icon: faTrashAlt,
+					action: () => {
+						this.$root.api('notes/delete', {
+							noteId: this.note.id
+						});
+						Vue.set(this.note, 'deletedAt', new Date());
+					}
+				}],
+				source: ev.currentTarget || ev.target,
+			});
+		},
+
 		toggleShowContent() {
 			this.showContent = !this.showContent;
 		},
@@ -609,8 +630,9 @@ export default Vue.extend({
 			margin-left: auto;
 			font-size: 0.9em;
 
-			> .mk-time {
+			> .time {
 				flex-shrink: 0;
+				color: inherit;
 			}
 
 			> .visibility {
diff --git a/src/client/components/renote-picker.vue b/src/client/components/renote-picker.vue
index d8258d5f5d..ae30f65e1f 100644
--- a/src/client/components/renote-picker.vue
+++ b/src/client/components/renote-picker.vue
@@ -1,8 +1,8 @@
 <template>
 <x-popup :source="source" ref="popup" @closed="() => { $emit('closed'); destroyDom(); }" v-hotkey.global="keymap">
 	<div class="rdfaahpc">
-		<button class="_button" @click="renote()"><fa :icon="faRetweet"/></button>
 		<button class="_button" @click="quote()"><fa :icon="faQuoteRight"/></button>
+		<button class="_button" @click="renote()"><fa :icon="faRetweet"/></button>
 	</div>
 </x-popup>
 </template>