Merge branch 'develop'

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.119.0-simkey-v10111",
+	"version": "12.119.0-simkey-v8",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/client/src/scripts/reactionImportMenu.ts

@@ -1,19 +1,15 @@
-import { defineAsyncComponent } from 'vue';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
+import { defineAsyncComponent } from 'vue';
+import { entities } from 'misskey-js';
 import { MenuItem } from '@/types/menu';
+import { CustomEmoji } from 'misskey-js/built/entities';
 
-export async function openReactionImportMenu(ev: MouseEvent, reaction: string): Promise<void> {
+export async function openReactionImportMenu(ev: MouseEvent, reaction: string) {
-	if (!reaction) return;
 
-	const host = reaction.match(/(?<=@).*\.*(?=:)/g)?.[0];
+	const getEmojiObject = emojiId => new Promise<Record<string, any> | null>(async resolve => {
-	const name = reaction.match(/(?<=:).*(?=@.*\.*(?=:))/g)?.[0];
-	const isLocal = (host === null || host === '.');
-	const isCustom = reaction.startsWith(':');
-
-	const getEmojiObject = (emojiId): Promise<Record<string, any> | null> => new Promise<Record<string, any> | null>(async resolve => {
 		const sinceId = await os.api('admin/emoji/list', {
 			limit: 1,
 			untilId: emojiId.id,
@@ -37,9 +33,14 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string):
 		resolve(id[0]);
 	});
 
-	const getEmojiId = async (): Promise<string | null> => {
+	const getEmojiId = async (emojiName: string) => {
+
+		const isLocal = (emojiName.match(/(?<=@).*\.*(?=:)/g) == null || emojiName.match(/(?<=@).*\.*(?=:)/g)[0] == '.');
 		if (isLocal) return null;
-		if (!host || !name) return null;
+		const host = emojiName.match(/(?<=@).*\.*(?=:)/g)[0];
+		const name = emojiName.match(/(?<=:).*(?=@.*\.*(?=:))/g)[0];
+		if (!host || !name) return;
+
 
 		const resList: Record<string, any>[] = await os.api('admin/emoji/list-remote', {
 			host,
@@ -47,13 +48,13 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string):
 			limit: 100,
 		});
 
-		const emojiId = await resList.find(emoji => emoji.name === name && emoji.host === host)?.id;
+		const emojiId = await resList.find(emoji => emoji.name == name && emoji.host == host)?.id;
 
 		return emojiId;
-	};
+	}
 
-	const importEmoji = async (): Promise<void> => {
+	const importEmoji = async (emojiName: string) => {
-		const emojiId = await getEmojiId();
+		const emojiId = await getEmojiId(emojiName);
 		if (!await emojiId) return;
 		os.api('admin/emoji/copy', {
 			emojiId: emojiId,
@@ -62,6 +63,9 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string):
 		}));
 	};
 
+	if (!($i?.isAdmin || $i?.isModerator)) return;
+	if (!reaction) return;
+
 	const menuItems: MenuItem[] = [{
 		type: 'label',
 		text: reaction,
@@ -69,19 +73,18 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string):
 		type: 'button',
 		icon: 'fas fa-copy',
 		text: i18n.ts.copy,
-		action: (): void => {
+		action: () => {
-			copyToClipboard(isCustom ? `:${name}:` : reaction);
+			copyToClipboard(reaction => {
+				if (reaction.startsWith(':')) {
+					return `:${reaction.match(/(?<=:).*(?=@.*\.*(?=:))/g)[0]}:` || reaction;
+				} else {
+					return reaction;
+				}
+			});
 		},
-	}];
+		}];
-
+	const emojiId = await getEmojiId(reaction) ? await getEmojiId(reaction) : reaction;
-	const emojiId = await getEmojiId() ? await getEmojiId() : reaction;
+	if (reaction.startsWith(':') && emojiId) {
-
-	if (
-		isCustom &&
-		emojiId &&
-		($i?.isAdmin || $i?.isModerator) &&
-		!isLocal
-	) {
 		menuItems.push({
 			type: 'button',
 			icon: 'fas fa-download',
@@ -90,7 +93,7 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string):
 				const duplication: boolean = await os.api('meta').then(meta => {
 					const emojis = meta.emojis;
 					return emojis.some((emoji) => {
-						return (emoji.name === name);
+						return (emoji.name === reaction.match(/(?<=:).*(?=@.*\.*(?=:))/g)[0]);
 					});
 				});
 
@@ -100,15 +103,17 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string):
 						text: i18n.ts.duplicateEmoji,
 					}).then(res => {
 						if (res.canceled) return;
-						importEmoji();
+						importEmoji(reaction);
 					});
 				} else {
-					importEmoji();
+					importEmoji(reaction);
 				}
 			},
 		});
 	}
 
 	os.contextMenu(menuItems, ev);
+
+
 }