fix

yojo-art · Jan 10, 2025 · 1aa68af · 1aa68af
1 parent 49428f3
commit 1aa68af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
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
@@ -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
@@ -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
@@ -62,6 +62,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #key>{{ i18n.ts._emoji.author }}</template>
 					<template #value><Mfm :text="emoji.author ?? i18n.ts.none"/></template>
 				</MkKeyValue>
+				<MkKeyValue>
+					<template #key>{{ i18n.ts._emoji.isBasedOn }}</template>
+					<template #value><Mfm :text="emoji.isBasedOn ?? i18n.ts.none"/></template>
+				</MkKeyValue>
 				<MkKeyValue :copy="emoji.url">
 					<template #key>{{ i18n.ts.emojiUrl }}</template>
 					<template #value>