Merge branch 'develop' into feat-12997

2024-02-26 20:46:33 +09:00 · 2024-02-26 20:46:33 +09:00 · 08d8d9c358
commit 08d8d9c358
parent eb71b5cfc5 0fb7b98f96
6 changed files with 22 additions and 6 deletions
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@ -148,6 +148,9 @@ export const packedUserLiteSchema = {
 		emojis: {
 			type: 'object',
 			nullable: false, optional: false,
+			additionalProperties: {
+				type: 'string',
+			},
 		},
 		onlineStatus: {
 			type: 'string',
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@ -31,7 +31,10 @@ export const meta = {
 		},
 	},

-	ref: 'EmojiDetailed',
+	res: {
+		type: 'object',
+		ref: 'EmojiDetailed',
+	},
 } as const;

 export const paramDef = {