Merge 763c708253 into b99e13e667

packages/frontend/src/components/global/MkCustomEmoji.vue

@@ -25,18 +25,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, inject, ref } from 'vue';
-import type { MenuItem } from '@/types/menu.js';
+import { computed, inject, ref } from 'vue';
 import { getProxiedImageUrl, getStaticImageUrl } from '@/scripts/media-proxy.js';
 import { defaultStore } from '@/store.js';
 import { customEmojisMap } from '@/custom-emojis.js';
 import * as os from '@/os.js';
-import { misskeyApi, misskeyApiGet } from '@/scripts/misskey-api.js';
+import { misskeyApiGet } from '@/scripts/misskey-api.js';
 import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import * as sound from '@/scripts/sound.js';
 import { i18n } from '@/i18n.js';
 import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialog.vue';
-import { $i } from '@/account.js';
+import type { MenuItem } from '@/types/menu.js';
 
 const props = defineProps<{
 	name: string;
@@ -126,31 +125,9 @@ function onClick(ev: MouseEvent) {
 			},
 		});
 
-		if ($i?.isModerator ?? $i?.isAdmin) {
-			menuItems.push({
-				text: i18n.ts.edit,
-				icon: 'ti ti-pencil',
-				action: async () => {
-					await edit(props.name);
-				},
-			});
-		}
-
 		os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
 	}
 }
-
-async function edit(name: string) {
-	const emoji = await misskeyApi('emoji', {
-		name: name,
-	});
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/pages/emoji-edit-dialog.vue')), {
-		emoji: emoji,
-	}, {
-		closed: () => dispose(),
-	});
-}
-
 </script>
 
 <style lang="scss" module>

packages/frontend/src/pages/emojis.emoji.vue

@@ -15,22 +15,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import * as Misskey from 'misskey-js';
-import { defineAsyncComponent } from 'vue';
-import type { MenuItem } from '@/types/menu.js';
 import * as os from '@/os.js';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';
 import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { i18n } from '@/i18n.js';
 import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialog.vue';
-import { $i } from '@/account.js';
 
 const props = defineProps<{
   emoji: Misskey.entities.EmojiSimple;
 }>();
 
 function menu(ev) {
-	const menuItems: MenuItem[] = [];
-	menuItems.push({
+	os.popupMenu([{
 		type: 'label',
 		text: ':' + props.emoji.name + ':',
 	}, {
@@ -52,28 +48,8 @@ function menu(ev) {
 				closed: () => dispose(),
 			});
 		},
-	});
-
-	if ($i?.isModerator ?? $i?.isAdmin) {
-		menuItems.push({
-			text: i18n.ts.edit,
-			icon: 'ti ti-pencil',
-			action: () => {
-				edit(props.emoji);
-			},
-		});
-	}
-
-	os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
+	}], ev.currentTarget ?? ev.target);
 }
-
-const edit = async (emoji) => {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/pages/emoji-edit-dialog.vue')), {
-		emoji: emoji,
-	}, {
-		closed: () => dispose(),
-	});
-};
 </script>
 
 <style lang="scss" module>