From 9f6e6ac3c8cfcafe8c614ae6376b4243af4bbf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Mon, 12 Sep 2022 01:23:10 +0900
Subject: [PATCH 01/11] fix: remove comment

---
 packages/client/src/pages/admin/emojigen.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue
index 9464b09b2..b3c63406f 100644
--- a/packages/client/src/pages/admin/emojigen.vue
+++ b/packages/client/src/pages/admin/emojigen.vue
@@ -6,7 +6,6 @@
 			<p><img :src="previewUrl" class="img" :alt="emojiName" /></p>
 		</FormSection>
 		<FormButton primary class="_formBlock" @click="uploadEmoji">{{ $ts.emojiApproval }}</FormButton>
-		<!-- <FormButton primary class="_formBlock" @click="preview">{{ $ts.emojiGenerate }}</FormButton> -->
 		<FormSection>
 			<template #label>{{ $ts.settings }}</template>
 			<FormInput v-model="emojiName" class="_formBlock">

From c56f8fd953ae74fbdbfe7af252e7f1599bc9d9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Mon, 12 Sep 2022 01:23:19 +0900
Subject: [PATCH 02/11] feat: pakuru

---
 locales/ja-NY.yml                            |  2 ++
 packages/client/src/scripts/get-note-menu.ts | 21 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/locales/ja-NY.yml b/locales/ja-NY.yml
index a1e789a2f..856f77158 100644
--- a/locales/ja-NY.yml
+++ b/locales/ja-NY.yml
@@ -837,6 +837,8 @@ emojiColor: "カラーコード"
 colorPicker: "カラーピッカー"
 emojiApproval: "絵文字を登録"
 deckOld: "旧デッキ"
+pakuruConfirm: "パクりますか？"
+pakuru: "パクる"
 
 
 _emailUnavailable:
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index a5cf98206..ff53f2dfe 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -26,6 +26,22 @@ export function getNoteMenu(props: {
 
 	const appearNote = isRenote ? props.note.renote as misskey.entities.Note : props.note;
 
+	function pakuru(): void {
+		os.confirm({
+			type: 'question',
+			text: i18n.ts.pakuruConfirm,
+		}).then(({ canceled }) => {
+			if (canceled) return;
+			const postData = {
+				text: appearNote.text,
+				cw: appearNote.cw ? appearNote.cw || '' : undefined,
+				localOnly: appearNote.localOnly,
+				visibility: appearNote.visibility,
+			}
+			os.api('notes/create', postData, undefined);
+		});
+	}
+
 	function del(): void {
 		os.confirm({
 			type: 'warning',
@@ -205,6 +221,11 @@ export function getNoteMenu(props: {
 					action: unclip,
 				}, null] : []
 			),
+			{
+				icon: 'fas fa-copy',
+				text: i18n.ts.pakuru,
+				action: pakuru,
+			},
 			{
 				icon: 'fas fa-copy',
 				text: i18n.ts.copyContent,

From 3a7fbf9406e0ecd0f0cf06d3531885defa55dd47 Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Mon, 12 Sep 2022 00:02:31 +0900
Subject: [PATCH 03/11] =?UTF-8?q?=E3=81=86=E3=81=94=E3=81=84=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/components/MkEmojiPicker.vue     | 12 ++++++++++--
 .../client/src/components/MkEmojiPickerDialog.vue    |  4 ++--
 packages/client/src/components/MkNote.vue            | 11 +++++++++--
 packages/client/src/scripts/reaction-picker.ts       |  6 +++---
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 3de0afbf5..36b02771d 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,6 +1,8 @@
 <template>
 <div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
 	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
+	<MkSwitch class="_formBlock" v-model="withRenote">renote
+	</MkSwitch>
 	<div ref="emojis" class="emojis">
 		<section class="result">
 			<div v-if="searchResultCustom.length > 0" class="body">
@@ -90,6 +92,7 @@ import { deviceKind } from '@/scripts/device-kind';
 import { emojiCategories, instance } from '@/instance';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
+import MkSwitch from '@/components/form/switch.vue';
 
 const props = withDefaults(defineProps<{
 	showPinned?: boolean;
@@ -101,10 +104,11 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'chosen', v: string): void;
+	(ev: 'chosen', v: { reaction: string, withRenote: boolean }): void;
 }>();
 
 const search = ref<HTMLInputElement>();
+const withRenote = ref<boolean>(true);
 const emojis = ref<HTMLDivElement>();
 
 const {
@@ -294,7 +298,7 @@ function chosen(emoji: any, ev?: MouseEvent) {
 	}
 
 	const key = getKey(emoji);
-	emit('chosen', key);
+	emit('chosen', { reaction: key, withRenote: withRenote.value });
 
 	// 最近使った絵文字更新
 	if (!pinned.value.includes(key)) {
@@ -452,6 +456,10 @@ defineExpose({
 		}
 	}
 
+	> .renote {
+		width: 100%;
+	}
+
 	> .tabs {
 		display: flex;
 		display: none;
diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue
index 3b41f9d75..918ee4a0d 100644
--- a/packages/client/src/components/MkEmojiPickerDialog.vue
+++ b/packages/client/src/components/MkEmojiPickerDialog.vue
@@ -51,8 +51,8 @@ const emit = defineEmits<{
 const modal = ref<InstanceType<typeof MkModal>>();
 const picker = ref<InstanceType<typeof MkEmojiPicker>>();
 
-function chosen(emoji: any) {
-	emit('done', emoji);
+function chosen(emoji: any, withRenote: boolean) {
+	emit('done', { reaction: emoji, withRenote: withRenote });
 	modal.value?.close();
 }
 
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index efe786ba4..e0aa49a70 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -207,11 +207,18 @@ function reply(viaKeyboard = false): void {
 function react(viaKeyboard = false): void {
 	pleaseLogin();
 	blur();
-	reactionPicker.show(reactButton.value, reaction => {
+	reactionPicker.show(reactButton.value, results => {
 		os.api('notes/reactions/create', {
 			noteId: appearNote.id,
-			reaction: reaction,
+			reaction: results.reaction,
 		});
+		console.log(results)
+		if (results.withRenote) {
+			os.api('notes/create', {
+				renoteId: appearNote.id,
+				isRenote: true,
+			});
+		}
 	}, () => {
 		focus();
 	});
diff --git a/packages/client/src/scripts/reaction-picker.ts b/packages/client/src/scripts/reaction-picker.ts
index a6d0940a4..048aab8ee 100644
--- a/packages/client/src/scripts/reaction-picker.ts
+++ b/packages/client/src/scripts/reaction-picker.ts
@@ -4,7 +4,7 @@ import { popup } from '@/os';
 class ReactionPicker {
 	private src: Ref<HTMLElement | null> = ref(null);
 	private manualShowing = ref(false);
-	private onChosen?: (reaction: string) => void;
+	private onChosen?: ({ reaction: string, withRenote: boolean }) => void;
 	private onClosed?: () => void;
 
 	constructor() {
@@ -17,8 +17,8 @@ class ReactionPicker {
 			asReactionPicker: true,
 			manualShowing: this.manualShowing
 		}, {
-			done: reaction => {
-				this.onChosen!(reaction);
+			done: results => {
+				this.onChosen!(results.reaction, results.withRenote);
 			},
 			close: () => {
 				this.manualShowing.value = false;

From 9c48c970471ca6c27355abfa64b113c87c010f72 Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Mon, 12 Sep 2022 00:25:22 +0900
Subject: [PATCH 04/11] fix

---
 packages/client/src/components/MkEmojiPicker.vue | 3 +--
 packages/client/src/scripts/reaction-picker.ts   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 36b02771d..b63d70bc2 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,8 +1,7 @@
 <template>
 <div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
 	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
-	<MkSwitch class="_formBlock" v-model="withRenote">renote
-	</MkSwitch>
+	<MkSwitch v-model="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
 	<div ref="emojis" class="emojis">
 		<section class="result">
 			<div v-if="searchResultCustom.length > 0" class="body">
diff --git a/packages/client/src/scripts/reaction-picker.ts b/packages/client/src/scripts/reaction-picker.ts
index 048aab8ee..cf492e2cc 100644
--- a/packages/client/src/scripts/reaction-picker.ts
+++ b/packages/client/src/scripts/reaction-picker.ts
@@ -4,7 +4,7 @@ import { popup } from '@/os';
 class ReactionPicker {
 	private src: Ref<HTMLElement | null> = ref(null);
 	private manualShowing = ref(false);
-	private onChosen?: ({ reaction: string, withRenote: boolean }) => void;
+	private onChosen?: (reaction: string, withRenote: boolean) => void;
 	private onClosed?: () => void;
 
 	constructor() {

From 18f778a335eee3ac294e01142bfbc879b93a048b Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Mon, 12 Sep 2022 00:44:50 +0900
Subject: [PATCH 05/11] =?UTF-8?q?=E6=AF=8E=E5=9B=9EwithRenote=E3=82=92fals?=
 =?UTF-8?q?e=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/components/MkEmojiPicker.vue | 7 ++++---
 packages/client/src/components/MkNote.vue        | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index b63d70bc2..53daab26a 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
 	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
-	<MkSwitch v-model="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
+	<MkSwitch v-if="props.asReactionPicker" v-model="withRenote" class="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
 	<div ref="emojis" class="emojis">
 		<section class="result">
 			<div v-if="searchResultCustom.length > 0" class="body">
@@ -281,6 +281,7 @@ function focus() {
 function reset() {
 	if (emojis.value) emojis.value.scrollTop = 0;
 	q.value = '';
+	withRenote.value = false; // 毎回Renoteをfalseに戻す
 }
 
 function getKey(emoji: string | Misskey.entities.CustomEmoji | UnicodeEmojiDef): string {
@@ -455,8 +456,8 @@ defineExpose({
 		}
 	}
 
-	> .renote {
-		width: 100%;
+	> .withRenote {
+		order: 1;
 	}
 
 	> .tabs {
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index e0aa49a70..0f6909fe5 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -212,7 +212,6 @@ function react(viaKeyboard = false): void {
 			noteId: appearNote.id,
 			reaction: results.reaction,
 		});
-		console.log(results)
 		if (results.withRenote) {
 			os.api('notes/create', {
 				renoteId: appearNote.id,

From 070d91e16ec87d0a04f79e9cff8d3af89729e73b Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Mon, 12 Sep 2022 01:07:22 +0900
Subject: [PATCH 06/11] fix type

---
 packages/client/src/components/MkEmojiPickerDialog.vue | 4 ++--
 packages/client/src/scripts/reaction-picker.ts         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue
index 918ee4a0d..fdec2b169 100644
--- a/packages/client/src/components/MkEmojiPickerDialog.vue
+++ b/packages/client/src/components/MkEmojiPickerDialog.vue
@@ -51,8 +51,8 @@ const emit = defineEmits<{
 const modal = ref<InstanceType<typeof MkModal>>();
 const picker = ref<InstanceType<typeof MkEmojiPicker>>();
 
-function chosen(emoji: any, withRenote: boolean) {
-	emit('done', { reaction: emoji, withRenote: withRenote });
+function chosen(results: { reaction: string, withRenote: boolean }) {
+	emit('done', results);
 	modal.value?.close();
 }
 
diff --git a/packages/client/src/scripts/reaction-picker.ts b/packages/client/src/scripts/reaction-picker.ts
index cf492e2cc..82adb0bed 100644
--- a/packages/client/src/scripts/reaction-picker.ts
+++ b/packages/client/src/scripts/reaction-picker.ts
@@ -4,7 +4,7 @@ import { popup } from '@/os';
 class ReactionPicker {
 	private src: Ref<HTMLElement | null> = ref(null);
 	private manualShowing = ref(false);
-	private onChosen?: (reaction: string, withRenote: boolean) => void;
+	private onChosen?: ({ reaction: string, withRenote: boolean }) => void;
 	private onClosed?: () => void;
 
 	constructor() {
@@ -18,7 +18,7 @@ class ReactionPicker {
 			manualShowing: this.manualShowing
 		}, {
 			done: results => {
-				this.onChosen!(results.reaction, results.withRenote);
+				this.onChosen!({ reaction: results.reaction, withRenote: results.withRenote });
 			},
 			close: () => {
 				this.manualShowing.value = false;

From d8a4837df664913bb6290451dd4764fd9dca9931 Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Mon, 12 Sep 2022 01:14:34 +0900
Subject: [PATCH 07/11] fix emojiPicker

---
 packages/client/src/components/MkEmojiPicker.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 53daab26a..9ce3e6a38 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -103,7 +103,7 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'chosen', v: { reaction: string, withRenote: boolean }): void;
+	(ev: 'chosen', v: { reaction: string, withRenote: boolean } | string): void;
 }>();
 
 const search = ref<HTMLInputElement>();
@@ -298,7 +298,7 @@ function chosen(emoji: any, ev?: MouseEvent) {
 	}
 
 	const key = getKey(emoji);
-	emit('chosen', { reaction: key, withRenote: withRenote.value });
+	emit('chosen', (props.asReactionPicker) ? { reaction: key, withRenote: withRenote.value } : key);
 
 	// 最近使った絵文字更新
 	if (!pinned.value.includes(key)) {

From 8f00846e4496dee219596277165df33c7745ff13 Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Mon, 12 Sep 2022 01:15:16 +0900
Subject: [PATCH 08/11] style

---
 packages/client/src/components/MkEmojiPicker.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 9ce3e6a38..5b744a233 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -458,6 +458,7 @@ defineExpose({
 
 	> .withRenote {
 		order: 1;
+		padding: 12px;
 	}
 
 	> .tabs {

From 99a028facf439da5819d4f29339194571ce10953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Mon, 12 Sep 2022 01:38:39 +0900
Subject: [PATCH 09/11] fix: i18n

---
 locales/ja-JP.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 53f4f7e28..e01fc6de6 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -107,6 +107,7 @@ clickToShow: "クリックして表示"
 sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
+reactWithRenote: "ついでにRenoteする"
 reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"

From a6287d44368c44742e828118c73a7e62d284f0ce Mon Sep 17 00:00:00 2001
From: ThinaticSystem <git@thinaticsystem.com>
Date: Mon, 12 Sep 2022 01:31:26 +0900
Subject: [PATCH 10/11] fix tab index

---
 packages/client/src/components/MkEmojiPicker.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index 5b744a233..cade60566 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,7 +1,6 @@
 <template>
 <div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
 	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
-	<MkSwitch v-if="props.asReactionPicker" v-model="withRenote" class="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
 	<div ref="emojis" class="emojis">
 		<section class="result">
 			<div v-if="searchResultCustom.length > 0" class="body">
@@ -75,6 +74,7 @@
 		<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="fas fa-leaf fa-fw"></i></button>
 		<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="fas fa-hashtag fa-fw"></i></button>
 	</div>
+	<MkSwitch v-if="props.asReactionPicker" v-model="withRenote" class="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
 </div>
 </template>
 
@@ -457,7 +457,6 @@ defineExpose({
 	}
 
 	> .withRenote {
-		order: 1;
 		padding: 12px;
 	}
 

From c366a9aa482deafa5c4f2db294728331f6df7da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Mon, 12 Sep 2022 01:39:20 +0900
Subject: [PATCH 11/11] bump version to 12.119.0-simkey-v3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4c1981549..f63706962 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.119.0-simkey-v2",
+	"version": "12.119.0-simkey-v3",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",