From 5dd1fd7c5f1331cfe9f4dc60f4a388f96c63e296 Mon Sep 17 00:00:00 2001
From: samunohito <46447427+samunohito@users.noreply.github.com>
Date: Mon, 12 Feb 2024 12:04:27 +0900
Subject: [PATCH] add columns

---
 .../src/core/entities/EmojiEntityService.ts   |  1 +
 .../backend/src/models/json-schema/emoji.ts   |  4 ++++
 .../api/endpoints/admin/emoji/v2/list.ts      |  1 +
 .../admin/custom-emojis-grid.local.list.vue   | 19 ++++++++++++++++---
 packages/misskey-js/src/autogen/types.ts      |  2 ++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts
index d545326516..4848b74528 100644
--- a/packages/backend/src/core/entities/EmojiEntityService.ts
+++ b/packages/backend/src/core/entities/EmojiEntityService.ts
@@ -88,6 +88,7 @@ export class EmojiEntityService {
 			aliases: emoji.aliases,
 			category: emoji.category,
 			publicUrl: emoji.publicUrl,
+			originalUrl: emoji.originalUrl,
 			license: emoji.license,
 			localOnly: emoji.localOnly,
 			isSensitive: emoji.isSensitive,
diff --git a/packages/backend/src/models/json-schema/emoji.ts b/packages/backend/src/models/json-schema/emoji.ts
index 995287709f..175d34a0a7 100644
--- a/packages/backend/src/models/json-schema/emoji.ts
+++ b/packages/backend/src/models/json-schema/emoji.ts
@@ -131,6 +131,10 @@ export const packedEmojiDetailedAdminSchema = {
 			type: 'string',
 			optional: false, nullable: false,
 		},
+		originalUrl: {
+			type: 'string',
+			optional: false, nullable: false,
+		},
 		uri: {
 			type: 'string',
 			optional: false, nullable: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/v2/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/v2/list.ts
index 4fc707f1b2..d7c3dc0057 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/v2/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/v2/list.ts
@@ -45,6 +45,7 @@ export const paramDef = {
 				host: { type: 'string' },
 				uri: { type: 'string' },
 				publicUrl: { type: 'string' },
+				originalUrl: { type: 'string' },
 				type: { type: 'string' },
 				aliases: { type: 'string' },
 				category: { type: 'string' },
diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue b/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue
index 3c7d77e89a..a725b5708d 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue
@@ -57,6 +57,9 @@
 						<template #label>updatedAt(to)</template>
 					</MkInput>
 				</div>
+
+				<div role="separator" :class="$style.divider"></div>
+
 				<div :class="[[spMode ? $style.searchButtonsSp : $style.searchButtons]]">
 					<MkButton primary @click="onSearchButtonClicked">
 						{{ i18n.ts.search }}
@@ -146,6 +149,8 @@ type GridItem = {
 	roleIdsThatCanBeUsedThisEmojiAsReaction: string;
 	fileId?: string;
 	updatedAt: string | null;
+	publicUrl?: string | null;
+	originalUrl?: string | null;
 }
 
 function setupGrid(): GridSetting {
@@ -177,7 +182,9 @@ function setupGrid(): GridSetting {
 			{ bindTo: 'isSensitive', title: 'sensitive', type: 'boolean', editable: true, width: 90 },
 			{ bindTo: 'localOnly', title: 'localOnly', type: 'boolean', editable: true, width: 90 },
 			{ bindTo: 'roleIdsThatCanBeUsedThisEmojiAsReaction', title: 'role', type: 'text', editable: true, width: 140 },
-			{ bindTo: 'updatedAt', type: 'hidden', editable: false, width: 'auto' },
+			{ bindTo: 'updatedAt', type: 'text', editable: false, width: 'auto' },
+			{ bindTo: 'publicUrl', type: 'text', editable: false, width: 180 },
+			{ bindTo: 'originalUrl', type: 'text', editable: false, width: 180 },
 		],
 	};
 }
@@ -512,12 +519,14 @@ function refreshGridItems() {
 		name: it.name,
 		host: it.host ?? '',
 		category: it.category ?? '',
-		aliases: it.aliases.join(', '),
+		aliases: it.aliases.join(','),
 		license: it.license ?? '',
 		isSensitive: it.isSensitive,
 		localOnly: it.localOnly,
-		roleIdsThatCanBeUsedThisEmojiAsReaction: it.roleIdsThatCanBeUsedThisEmojiAsReaction.join(', '),
+		roleIdsThatCanBeUsedThisEmojiAsReaction: it.roleIdsThatCanBeUsedThisEmojiAsReaction.join(','),
 		updatedAt: it.updatedAt,
+		publicUrl: it.publicUrl,
+		originalUrl: it.originalUrl,
 	}));
 	originGridItems.value = JSON.parse(JSON.stringify(gridItems.value));
 }
@@ -614,4 +623,8 @@ onMounted(async () => {
 	flex-wrap: wrap;
 }
 
+.divider {
+	margin: 8px 0;
+	border-top: solid 0.5px var(--divider);
+}
 </style>
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index a3e9e92e0b..f0ce974443 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4454,6 +4454,7 @@ export type components = {
       /** @description The local host is represented with `null`. */
       host: string | null;
       publicUrl: string;
+      originalUrl: string;
       uri: string | null;
       type: string | null;
       aliases: string[];
@@ -6950,6 +6951,7 @@ export type operations = {
             host?: string;
             uri?: string;
             publicUrl?: string;
+            originalUrl?: string;
             type?: string;
             aliases?: string;
             category?: string;