From c6a009dbaed5362c67259a0003945af966f3ce58 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 8 Nov 2020 13:58:16 +0900
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E8=BF=91=E4=BD=BF=E7=94=A8=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8B=E3=82=89=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=94=E3=83=83?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=82=E3=82=8B=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AF=E9=99=A4?=
 =?UTF-8?q?=E5=A4=96=E3=81=99=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

---
 src/client/components/emoji-picker.vue | 15 +++++++++------
 src/client/pages/settings/reaction.vue |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue
index e36161d3d..270951962 100644
--- a/src/client/components/emoji-picker.vue
+++ b/src/client/components/emoji-picker.vue
@@ -32,7 +32,7 @@
 			<div class="index">
 				<section>
 					<div>
-						<button v-for="emoji in reactions || $store.state.settings.reactions"
+						<button v-for="emoji in pinned"
 							class="_button"
 							@click="chosen(emoji, $event)"
 							tabindex="0"
@@ -109,7 +109,7 @@ export default defineComponent({
 		src: {
 			required: false
 		},
-		reactions: {
+		overridePinned: {
 			required: false
 		},
 	},
@@ -120,6 +120,7 @@ export default defineComponent({
 		return {
 			emojilist: markRaw(emojilist),
 			getStaticImageUrl,
+			pinned: this.overridePinned || this.$store.state.settings.reactions,
 			customEmojiCategories: this.$store.getters['instance/emojiCategories'],
 			customEmojis: this.$store.state.instance.meta.emojis,
 			visibleCategories: {},
@@ -334,10 +335,12 @@ export default defineComponent({
 			this.$refs.modal.close();
 
 			// 最近使った絵文字更新
-			let recents = this.$store.state.device.recentlyUsedEmojis;
-			recents = recents.filter((e: any) => e !== key);
-			recents.unshift(key);
-			this.$store.commit('device/set', { key: 'recentlyUsedEmojis', value: recents.splice(0, 16) });
+			if (!this.pinned.includes(key)) {
+				let recents = this.$store.state.device.recentlyUsedEmojis;
+				recents = recents.filter((e: any) => e !== key);
+				recents.unshift(key);
+				this.$store.commit('device/set', { key: 'recentlyUsedEmojis', value: recents.splice(0, 16) });
+			}
 		},
 
 		paste(event) {
diff --git a/src/client/pages/settings/reaction.vue b/src/client/pages/settings/reaction.vue
index 81bb02499..8033b7e11 100644
--- a/src/client/pages/settings/reaction.vue
+++ b/src/client/pages/settings/reaction.vue
@@ -82,7 +82,7 @@ export default defineComponent({
 		preview(ev) {
 			if (this.$store.state.device.useFullReactionPicker) {
 				os.popup(import('@/components/emoji-picker.vue'), {
-					reactions: this.splited,
+					overridePinned: this.splited,
 					src: ev.currentTarget || ev.target,
 				}, {}, 'closed');
 			} else {