From c8111659e16c26accc062643bebad72f21de48fb Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 25 Feb 2023 09:33:19 +0000
Subject: [PATCH] =?UTF-8?q?anyOf=E5=86=85=E3=81=AB=E3=83=90=E3=83=AA?=
 =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E6=9B=B8?=
 =?UTF-8?q?=E3=81=84=E3=81=A6=E3=82=82=E6=9C=80=E5=88=9D=E3=81=AE=E4=B8=80?=
 =?UTF-8?q?=E3=81=A4=E3=81=97=E3=81=8B=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/server/api/endpoints/notes/create.ts  | 83 ++++++++++---------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index fc2d3a0251..2eb498c716 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -103,63 +103,70 @@ export const paramDef = {
 		replyId: { type: 'string', format: 'misskey:id', nullable: true },
 		renoteId: { type: 'string', format: 'misskey:id', nullable: true },
 		channelId: { type: 'string', format: 'misskey:id', nullable: true },
+
+		// anyOf内にバリデーションを書いても最初の一つしかチェックされない
+		// See https://github.com/misskey-dev/misskey/pull/10082
+		text: {
+			type: 'string',
+			minLength: 1,
+			maxLength: MAX_NOTE_TEXT_LENGTH,
+			nullable: false
+		},
+		fileIds: {
+			type: 'array',
+			uniqueItems: true,
+			minItems: 1,
+			maxItems: 16,
+			items: { type: 'string', format: 'misskey:id' },
+		},
+		mediaIds: {
+			type: 'array',
+			uniqueItems: true,
+			minItems: 1,
+			maxItems: 16,
+			items: { type: 'string', format: 'misskey:id' },
+		},
+		poll: {
+			type: 'object',
+			nullable: true,
+			properties: {
+				choices: {
+					type: 'array',
+					uniqueItems: true,
+					minItems: 2,
+					maxItems: 10,
+					items: { type: 'string', minLength: 1, maxLength: 50 },
+				},
+				multiple: { type: 'boolean' },
+				expiresAt: { type: 'integer', nullable: true },
+				expiredAfter: { type: 'integer', nullable: true, minimum: 1 },
+			},
+			required: ['choices'],
+		},
 	},
+	// (re)note with text, files and poll are optional
 	anyOf: [
 		{
-			// (re)note with text, files and poll are optional
 			properties: {
-				text: { type: 'string', minLength: 1, maxLength: MAX_NOTE_TEXT_LENGTH, nullable: false },
+				text: { type: 'string' },
 			},
 			required: ['text'],
 		},
 		{
-			// (re)note with files, text and poll are optional
 			properties: {
-				fileIds: {
-					type: 'array',
-					uniqueItems: true,
-					minItems: 1,
-					maxItems: 16,
-					items: { type: 'string', format: 'misskey:id' },
-				},
+				fileIds: { type: 'array' },
 			},
 			required: ['fileIds'],
 		},
 		{
-			// (re)note with files, text and poll are optional
 			properties: {
-				mediaIds: {
-					deprecated: true,
-					description: 'Use `fileIds` instead. If both are specified, this property is discarded.',
-					type: 'array',
-					uniqueItems: true,
-					minItems: 1,
-					maxItems: 16,
-					items: { type: 'string', format: 'misskey:id' },
-				},
+				mediaIds: { type: 'array' },
 			},
 			required: ['mediaIds'],
 		},
 		{
-			// (re)note with poll, text and files are optional
 			properties: {
-				poll: {
-					type: 'object',
-					nullable: true,
-					properties: {
-						choices: {
-							type: 'array',
-							uniqueItems: true,
-							minItems: 2,
-							maxItems: 10,
-							items: { type: 'string', minLength: 1, maxLength: 50 },
-						},
-						multiple: { type: 'boolean' },
-						expiresAt: { type: 'integer', nullable: true },
-						expiredAfter: { type: 'integer', nullable: true, minimum: 1 },
-					},
-					required: ['choices'],
-				},
+				poll: { type: 'object' },
 			},
 			required: ['poll'],
 		},