diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 2232e8e721..e90bf47670 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -828,7 +828,7 @@ list: "一覧" emailNotConfiguredWarning: "メールアドレスの設定がされていません。" ratio: "比率" newEmojis: "新しい絵文字" -draftEmojis: "ドラフトされてる絵文字" +draftEmojis: "申請されている絵文字" previewNoteText: "本文をプレビュー" customCss: "カスタムCSS" customCssWarn: "この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。" diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-draft.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-draft.ts index 40b7a12e87..0ed69d335a 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add-draft.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-draft.ts @@ -1,6 +1,5 @@ import { Inject, Injectable } from '@nestjs/common'; -import rndstr from 'rndstr'; -import { Endpoint } from '@/server/api/endpoint-base.js'; + import { Endpoint } from '@/server/api/endpoint-base.js'; import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; @@ -73,10 +72,6 @@ export default class extends Endpoint { roleIdsThatCanBeUsedThisEmojiAsReaction: [], }); - this.moderationLogService.insertModerationLog(me, 'addEmoji', { - emojiId: emoji.id, - }); - return { id: emoji.id, }; diff --git a/packages/frontend/src/components/MKCustomEmojiEditDraft.vue b/packages/frontend/src/components/MKCustomEmojiEditDraft.vue index 17576b7b06..34d033119d 100644 --- a/packages/frontend/src/components/MKCustomEmojiEditDraft.vue +++ b/packages/frontend/src/components/MKCustomEmojiEditDraft.vue @@ -10,21 +10,21 @@
-
{{ i18n.ts.name }}: {{ emoji.name }}
+
{{ i18n.ts.name }}: {{ emoji.name }}
{{ i18n.ts.category }}:{{ emoji.category }}
{{ i18n.ts.tags }}:{{ emoji.aliases.join(' ') }}
{{ i18n.ts.license }}:{{ emoji.license }}
- - - +
@@ -38,6 +38,7 @@ import { computed, defineAsyncComponent, ref, shallowRef } from 'vue'; import MkPagination from '@/components/MkPagination.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; +import MkButton from '@/components/MkButton.vue'; const emojisDraftPaginationComponent = shallowRef>(); @@ -87,7 +88,7 @@ async function undrafted(emoji) { license: emoji.license, draft: false, isSensitive: emoji.isSensitive, - localOnly: emoji.localOnly, + localOnly: emoji.localOnly, roleIdsThatCanBeUsedThisEmojiAsReaction: emoji.roleIdsThatCanBeUsedThisEmojiAsReaction, }); @@ -118,14 +119,10 @@ async function deleteDraft(emoji) { .ldhfsamy { > .emoji { - display: grid; - grid-template-rows: 40px 1fr; - grid-template-columns: 1fr 150px; align-items: center; padding: 11px; text-align: left; border: solid 1px var(--panel); - width: 100%; margin: 10px; > .img { @@ -140,9 +137,9 @@ async function deleteDraft(emoji) { display: grid; grid-column: 1; background-color: #fff; - + margin-bottom: 12px; > img { - max-height: 30px; + max-height: 64px; max-width: 100%; } } @@ -151,9 +148,9 @@ async function deleteDraft(emoji) { display: grid; grid-column: 2; background-color: #000; - + margin-bottom: 12px; > img { - max-height: 30px; + max-height: 64px; max-width: 100%; } } @@ -191,37 +188,25 @@ async function deleteDraft(emoji) { > .edit-button { display: grid; - grid-row: 2; - grid-template-rows: 30px 30px 30px; + grid-template-rows: 42px; + margin-top: 6px; > .edit { grid-row: 1; - background-color: var(--buttonBg); - margin: 2px; - - &:hover { - color: var(--accent); - } + width: 100%; + margin: 6px 0; } > .draft { grid-row: 2; - background-color: var(--buttonBg); - margin: 2px; - - &:hover { - color: var(--accent); - } + width: 100%; + margin: 6px 0; } > .delete { - background-color: var(--buttonBg); grid-row: 3; - margin: 2px; - - &:hover { - color: var(--accent); - } + width: 100%; + margin: 6px 0; } } } diff --git a/packages/frontend/src/components/MkEmojiEditDialog.vue b/packages/frontend/src/components/MkEmojiEditDialog.vue index 15a287b4fd..5a337249dd 100644 --- a/packages/frontend/src/components/MkEmojiEditDialog.vue +++ b/packages/frontend/src/components/MkEmojiEditDialog.vue @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -51,7 +51,7 @@ SPDX-License-Identifier: AGPL-3.0-only -
+
{{ i18n.ts.add }}
@@ -69,7 +69,6 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.draft }} - {{ i18n.ts.delete }}
@@ -227,7 +226,7 @@ async function done() { if (file) { params.fileId = file.id; } - + console.log(props.emoji) if (props.emoji) { await os.apiWithDialog('admin/emoji/update', { id: props.emoji.id, diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue index a49a70c88a..84469e102c 100644 --- a/packages/frontend/src/pages/about.emojis.vue +++ b/packages/frontend/src/pages/about.emojis.vue @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.manageCustomEmojis }} - {{ i18n.ts.requestCustomEmojis }} + {{ i18n.ts.requestCustomEmojis }}
@@ -36,11 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- -
- -
- +
@@ -68,9 +64,6 @@ const headerActions = $computed(() => []); const headerTabs = $computed(() => [{ key: 'emojis', title: i18n.ts.list, -}, { - key: 'new', - title: i18n.ts.newEmojis, }, { key: 'draft', title: i18n.ts.draftEmojis, @@ -89,7 +82,7 @@ const pagination = { let q = $ref(''); let searchEmojis = $ref(null); let selectedTags = $ref(new Set()); - +const draftEmojis = customEmojis.value.filter(emoji => emoji.draft); function search() { if ((q === '' || q == null) && selectedTags.size === 0) { searchEmojis = null; @@ -136,6 +129,11 @@ watch($$(q), () => { watch($$(selectedTags), () => { search(); }, { deep: true }); + +definePageMetadata({ + title: i18n.ts.customEmojis, + icon: null, +});