From 1aa68af271adc6043ccd90c6590471c591b16a44 Mon Sep 17 00:00:00 2001 From: penginn-net <121443048+penginn-net@users.noreply.github.com> Date: Fri, 10 Jan 2025 11:52:03 +0000 Subject: [PATCH] fix --- .../src/server/api/endpoints/admin/emoji/list-remote.ts | 1 + .../backend/src/server/api/endpoints/admin/emoji/list.ts | 7 +++++++ .../src/components/MkCustomEmojiDetailedDialog.vue | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts index 5904f69eb2..3873903102 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts @@ -62,6 +62,7 @@ export const meta = { usageInfo: { type: 'string', nullable: true, description: '使用する際の説明' }, author: { type: 'string', nullable: true, description: '作者情報' }, description: { type: 'string', nullable: true, description: '絵文字の説明' }, + isBasedOn: { type: 'string', nullable: true, description: 'もとになったもののURLなど' }, }, }, }, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts index ffb5dbf4b5..4afa63344d 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts @@ -10,6 +10,7 @@ import type { MiEmoji } from '@/models/Emoji.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; +import {emojiCopyPermissions} from "@/types.js"; //import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; export const meta = { @@ -56,6 +57,12 @@ export const meta = { type: 'string', optional: false, nullable: false, }, + + copyPermission: { type: 'string', enum: emojiCopyPermissions, nullable: true, description: 'この絵文字を外部サーバーへコピーすることの許可' }, + usageInfo: { type: 'string', nullable: true, description: '使用する際の説明' }, + author: { type: 'string', nullable: true, description: '作者情報' }, + description: { type: 'string', nullable: true, description: '絵文字の説明' }, + isBasedOn: { type: 'string', nullable: true, description: 'もとになったもののURLなど' }, }, }, }, diff --git a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue index 6eb8898f1d..66cdcc2dea 100644 --- a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue +++ b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue @@ -62,6 +62,10 @@ SPDX-License-Identifier: AGPL-3.0-only + + + +