From 868cd2860d81aed29568992eb55abad9a0ca4988 Mon Sep 17 00:00:00 2001
From: mattyatea <mattyacocacora0@gmail.com>
Date: Sat, 23 Dec 2023 23:14:51 +0900
Subject: [PATCH] bug fix

---
 .../src/components/MkCustomEmojiEditLocal.vue | 37 +++++++------------
 .../src/components/MkEmojiEditDialog.vue      |  2 +-
 packages/frontend/src/pages/emojis.emoji.vue  |  2 +-
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/packages/frontend/src/components/MkCustomEmojiEditLocal.vue b/packages/frontend/src/components/MkCustomEmojiEditLocal.vue
index e7d8e86ee5..9a29622827 100644
--- a/packages/frontend/src/components/MkCustomEmojiEditLocal.vue
+++ b/packages/frontend/src/components/MkCustomEmojiEditLocal.vue
@@ -13,7 +13,7 @@
 	<MkButton inline @click="addTagBulk">Add tag</MkButton>
 	<MkButton inline @click="removeTagBulk">Remove tag</MkButton>
 	<MkButton inline @click="setLisenceBulk">Set Lisence</MkButton>
-	<MkButton inline @click="setisSensitiveBulk">Set isSensitive</MkButton>
+	<MkButton inline @click="isSensitiveBulk">Set isSensitive</MkButton>
 	<MkButton inline @click="setlocalOnlyBulk">Set localOnly</MkButton>
 	<MkButton inline danger @click="delBulk">Delete</MkButton>
 </div>
@@ -22,14 +22,14 @@
 	<template #default="{items}">
 		<div :class="$style.root">
 			<div v-for="emoji in items" :key="emoji.id">
-				<button v-if="emoji.request" class="_panel _button" :class="[{ selected: selectedEmojis.includes(emoji.id) },$style.emoji,$style.emojirequest]" @click="selectMode ? toggleSelect(emoji) : edit(emoji)">
+				<button v-if="emoji.request" class="_panel _button" :class="[{ [$style.selected]: selectedEmojis.includes(emoji.id) },$style.emoji,$style.emojirequest]" @click="selectMode ? toggleSelect(emoji) : edit(emoji)">
 					<img :src="emoji.url" class="img" :alt="emoji.name"/>
 					<div class="body">
 						<div class="name _monospace">{{ emoji.name }}</div>
 						<div class="info">{{ emoji.category }}</div>
 					</div>
 				</button>
-				<button v-else class="_panel _button" :class="[{ selected: selectedEmojis.includes(emoji.id) },$style.emoji]" @click="selectMode ? toggleSelect(emoji) : edit(emoji)">
+				<button v-else class="_panel _button" :class="[{ [$style.selected]: selectedEmojis.includes(emoji.id) },$style.emoji]" @click="selectMode ? toggleSelect(emoji) : edit(emoji)">
 					<img :src="emoji.url" :class="$style.img" :alt="emoji.name"/>
 					<div :class="$style.body">
 						<div :class="$style.name" class="_monospace">{{ emoji.name }}</div>
@@ -66,11 +66,12 @@ const pagination = {
 };
 
 const selectAll = () => {
-	if (selectedEmojis.value.length > 0) {
-		selectedEmojis.value = [];
-	} else {
-		selectedEmojis.value = emojisPaginationComponent.value.items.map(item => item.id);
-	}
+
+    if (selectedEmojis.value.length > 0) {
+        selectedEmojis.value = [];
+    } else {
+        selectedEmojis.value = Array.from(emojisPaginationComponent.value.items.values(), item => item.id);
+    }
 };
 const setisSensitiveBulk = async () => {
 	const { canceled, result } = await os.switch1({
@@ -99,6 +100,7 @@ const setlocalOnlyBulk = async () => {
 
 
 const toggleSelect = (emoji) => {
+    console.log(selectedEmojis.value)
 	if (selectedEmojis.value.includes(emoji.id)) {
 		selectedEmojis.value = selectedEmojis.value.filter(x => x !== emoji.id);
 	} else {
@@ -149,18 +151,6 @@ const setLisenceBulk = async () => {
 	emojisPaginationComponent.value.reload();
 };
 
-const isLocalBulk = async () => {
-	const { canceled, result } = await os.inputText({
-		title: 'License',
-	});
-	if (canceled) return;
-	await os.apiWithDialog('admin/emoji/set-islocal-bulk', {
-		ids: selectedEmojis.value,
-		isLocal: result,
-	});
-	emojisPaginationComponent.value.reload();
-};
-
 const isSensitiveBulk = async () => {
 	const { canceled, result } = await os.inputText({
 		title: 'License',
@@ -240,9 +230,10 @@ const delBulk = async () => {
     border-color: var(--inputBorderHover);
   }
 
-  &.selected {
-    border-color: var(--accent);
-  }
+
+}
+.selected {
+  border-color: var(--accent);
 }
 .img {
   width: 42px;
diff --git a/packages/frontend/src/components/MkEmojiEditDialog.vue b/packages/frontend/src/components/MkEmojiEditDialog.vue
index 6fccc7c614..7419563311 100644
--- a/packages/frontend/src/components/MkEmojiEditDialog.vue
+++ b/packages/frontend/src/components/MkEmojiEditDialog.vue
@@ -189,7 +189,7 @@ async function done() {
 
 		dialog.value.close();
 	} else {
-		const created = isRequest
+		const created = isRequest.value
 			? await os.apiWithDialog('admin/emoji/add-request', params)
 			: await os.apiWithDialog('admin/emoji/add', params);
 
diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index 8a53f54e69..a71a372e41 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -50,7 +50,7 @@ function menu(ev) {
 		text: i18n.ts.info,
 		icon: 'ti ti-info-circle',
 		action: () => {
-			os.apiGet('emoji-requests', { name: props.emoji.name }).then(res => {
+			os.apiGet('emoji', { name: props.emoji.name }).then(res => {
 				os.alert({
 					type: 'info',
 					text: `License: ${res.license}`,