From 1d30c51d77cfa177a670ea94d0d0c9085c105722 Mon Sep 17 00:00:00 2001 From: mattyatea Date: Fri, 3 Nov 2023 03:07:05 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20css=20modules=E3=82=92=E4=BD=BF=E3=81=86?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20=E3=81=9D=E3=81=AE=E4=BB=96?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: mattyatea --- misskey-assets | 2 +- .../src/components/MkCustomEmojiEditLocal.vue | 91 ++++--- .../components/MkCustomEmojiEditRemote.vue | 84 +++---- .../components/MkCustomEmojiEditRequest.vue | 229 ++++++++---------- .../src/components/MkEmojiEditDialog.vue | 20 +- packages/frontend/src/pages/about.emojis.vue | 2 +- packages/misskey-js/src/entities.ts | 1 - 7 files changed, 198 insertions(+), 231 deletions(-) diff --git a/misskey-assets b/misskey-assets index 0179793ec8..cf3ce27b2e 160000 --- a/misskey-assets +++ b/misskey-assets @@ -1 +1 @@ -Subproject commit 0179793ec891856d6f37a3be16ba4c22f67a81b5 +Subproject commit cf3ce27b2eb8417233072e3d6d2fb7c5356c2364 diff --git a/packages/frontend/src/components/MkCustomEmojiEditLocal.vue b/packages/frontend/src/components/MkCustomEmojiEditLocal.vue index 5e2d4438cf..93faae5e37 100644 --- a/packages/frontend/src/components/MkCustomEmojiEditLocal.vue +++ b/packages/frontend/src/components/MkCustomEmojiEditLocal.vue @@ -18,20 +18,20 @@ @@ -52,12 +50,10 @@ const paginationRequest = { })), }; -const editRequest = (emoji) => { - emoji.requestNow = true; +function editRequest(emoji) { os.popup(defineAsyncComponent(() => import('@/components/MkEmojiEditDialog.vue')), { emoji: emoji, - requestNow: false, - isRequestEdit: true, + isRequest: true, }, { done: result => { if (result.updated) { @@ -72,7 +68,7 @@ const editRequest = (emoji) => { } }, }, 'closed'); -}; +} async function unrequested(emoji) { const { canceled } = await os.confirm({ @@ -113,103 +109,90 @@ async function deleteRequest(emoji) { } - diff --git a/packages/frontend/src/components/MkEmojiEditDialog.vue b/packages/frontend/src/components/MkEmojiEditDialog.vue index 056230f096..3c3f127d11 100644 --- a/packages/frontend/src/components/MkEmojiEditDialog.vue +++ b/packages/frontend/src/components/MkEmojiEditDialog.vue @@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only @closed="$emit('closed')" > - +
@@ -46,7 +46,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -65,14 +65,11 @@ SPDX-License-Identifier: AGPL-3.0-only isSensitive {{ i18n.ts.localOnly }} - - {{ i18n.ts.requestPending }} -
- {{ i18n.ts.delete }} + {{ i18n.ts.delete }} {{ props.emoji ? i18n.ts.update : i18n.ts.create }} {{ props.emoji ? i18n.ts.update : i18n.ts.create }}
@@ -99,8 +96,7 @@ import MkRolePreview from '@/components/MkRolePreview.vue'; const props = defineProps<{ emoji?: any, - requestNow: boolean, - isRequestEdit?: boolean, + isRequest: boolean, }>(); let dialog = $ref(null); @@ -114,14 +110,12 @@ let roleIdsThatCanBeUsedThisEmojiAsReaction = $ref((props.emoji && props.emoji.r let rolesThatCanBeUsedThisEmojiAsReaction = $ref([]); let file = $ref(); let chooseFile: DriveFile|null = $ref(null); -let requestNow = $ref(props.requestNow); -let isRequestEdit = $ref(props.isRequestEdit ?? false); -let isRequest = $ref(!!(isRequestEdit || props.requestNow)); +let isRequest = $ref(props.isRequest ?? false); watch($$(roleIdsThatCanBeUsedThisEmojiAsReaction), async () => { rolesThatCanBeUsedThisEmojiAsReaction = (await Promise.all(roleIdsThatCanBeUsedThisEmojiAsReaction.map((id) => os.api('admin/roles/show', { roleId: id }).catch(() => null)))).filter(x => x != null); }, { immediate: true }); -const imgUrl = computed(() => file ? file.url : props.emoji && !isRequestEdit ? `/emoji/${props.emoji.name}.webp` : props.emoji && props.emoji.url ? props.emoji.url : null); +const imgUrl = computed(() => file ? file.url : props.emoji && !isRequest ? `/emoji/${props.emoji.name}.webp` : props.emoji && props.emoji.url ? props.emoji.url : null); const validation = computed(() => { return name.match(/^[a-zA-Z0-9_]+$/) && imgUrl.value != null; }); @@ -171,7 +165,7 @@ async function done() { } if (props.emoji) { - if (isRequestEdit) { + if (isRequest) { await os.apiWithDialog('admin/emoji/update-request', { id: props.emoji.id, ...params, diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue index e4cbc04709..e465cdc84c 100644 --- a/packages/frontend/src/pages/about.emojis.vue +++ b/packages/frontend/src/pages/about.emojis.vue @@ -98,7 +98,7 @@ function search() { const edit = () => { os.popup(defineAsyncComponent(() => import('@/components/MkEmojiEditDialog.vue')), { - requestNow: true, + isRequest: true, }, { done: result => { window.location.reload(); diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts index 4f0bd6cf68..38bac3b7c3 100644 --- a/packages/misskey-js/src/entities.ts +++ b/packages/misskey-js/src/entities.ts @@ -319,7 +319,6 @@ export type CustomEmoji = { url: string; category: string; aliases: string[]; - Request: boolean; }; export type LiteInstanceMetadata = {