summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
author鴇峰 朔華 <160555157+sakuhanight@users.noreply.github.com>2024-11-20 20:08:26 +0900
committerGitHub <noreply@github.com>2024-11-20 20:08:26 +0900
commit4603ab67bb96da39f6c4186ab655e8011fdcb740 (patch)
tree3c1cdd9d810f46432f32a6cea21d4d25befc383d /packages/frontend/src
parentFix(backend): アカウント削除のモデレーションログが動作し... (diff)
downloadmisskey-4603ab67bb96da39f6c4186ab655e8011fdcb740.tar.gz
misskey-4603ab67bb96da39f6c4186ab655e8011fdcb740.tar.bz2
misskey-4603ab67bb96da39f6c4186ab655e8011fdcb740.zip
feat: 絵文字のポップアップメニューに編集を追加 (#15004)
* Mod: 絵文字のポップアップメニューに編集を追加 * fix: code styleの修正 * fix: code styleの修正 * fix
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/global/MkCustomEmoji.vue29
-rw-r--r--packages/frontend/src/pages/emojis.emoji.vue28
2 files changed, 52 insertions, 5 deletions
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 66f82a7898..ec1d859080 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -25,17 +25,18 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
-import { computed, inject, ref } from 'vue';
+import { computed, defineAsyncComponent, inject, ref } from 'vue';
+import type { MenuItem } from '@/types/menu.js';
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 { misskeyApiGet } from '@/scripts/misskey-api.js';
+import { misskeyApi, 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 type { MenuItem } from '@/types/menu.js';
+import { $i } from '@/account.js';
const props = defineProps<{
name: string;
@@ -125,9 +126,31 @@ 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>
diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index fcd22155b7..979d50966e 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -15,18 +15,22 @@ 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) {
- os.popupMenu([{
+ const menuItems: MenuItem[] = [];
+ menuItems.push({
type: 'label',
text: ':' + props.emoji.name + ':',
}, {
@@ -48,8 +52,28 @@ function menu(ev) {
closed: () => dispose(),
});
},
- }], ev.currentTarget ?? ev.target);
+ });
+
+ 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);
}
+
+const edit = async (emoji) => {
+ const { dispose } = os.popup(defineAsyncComponent(() => import('@/pages/emoji-edit-dialog.vue')), {
+ emoji: emoji,
+ }, {
+ closed: () => dispose(),
+ });
+};
</script>
<style lang="scss" module>