Merge branch 'develop'

CHANGELOG.md

@@ -10,6 +10,11 @@
 You should also include the user name that made the change.
 -->
 
+## 12.109.1 (2022/04/02)
+
+### Bugfixes
+- API: Renoteが行えない問題を修正
+
 ## 12.109.0 (2022/04/02)
 
 ### Improvements

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.109.0",
+	"version": "12.109.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/backend/src/models/schema/emoji.ts

@@ -27,7 +27,6 @@ export const packedEmojiSchema = {
 		host: {
 			type: 'string',
 			optional: false, nullable: true,
-			description: 'The local host is represented with `null`.',
 		},
 		url: {
 			type: 'string',

packages/backend/src/models/schema/user.ts

@@ -21,7 +21,6 @@ export const packedUserLiteSchema = {
 			type: 'string',
 			nullable: true, optional: false,
 			example: 'misskey.example.com',
-			description: 'The local host is represented with `null`.',
 		},
 		avatarUrl: {
 			type: 'string',

packages/backend/src/server/api/endpoints/admin/drive/files.ts

@@ -27,12 +27,7 @@ export const paramDef = {
 		untilId: { type: 'string', format: 'misskey:id' },
 		type: { type: 'string', nullable: true, pattern: /^[a-zA-Z0-9\/\-*]+$/.toString().slice(1, -1) },
 		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "local" },
-		hostname: {
-			type: 'string',
-			nullable: true,
-			default: null,
-			description: 'The local host is represented with `null`.',
-		},
+		hostname: { type: 'string', nullable: true, default: null },
 	},
 	required: [],
 } as const;

packages/backend/src/server/api/endpoints/admin/drive/show-file.ts

@@ -40,7 +40,6 @@ export const meta = {
 			userHost: {
 				type: 'string',
 				optional: false, nullable: true,
-				description: 'The local host is represented with `null`.',
 			},
 			md5: {
 				type: 'string',
@@ -152,20 +151,11 @@ export const meta = {
 
 export const paramDef = {
 	type: 'object',
-	anyOf: [
-		{
 	properties: {
 		fileId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['fileId'],
-		},
-		{
-			properties: {
 		url: { type: 'string' },
 	},
-			required: ['url'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts

@@ -40,7 +40,6 @@ export const meta = {
 				host: {
 					type: 'string',
 					optional: false, nullable: true,
-					description: 'The local host is represented with `null`.',
 				},
 				url: {
 					type: 'string',
@@ -55,12 +54,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		query: { type: 'string', nullable: true, default: null },
-		host: {
-			type: 'string',
-			nullable: true,
-			default: null,
-			description: 'Use `null` to represent the local host.',
-		},
+		host: { type: 'string', nullable: true, default: null },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },

packages/backend/src/server/api/endpoints/admin/emoji/list.ts

@@ -38,9 +38,8 @@ export const meta = {
 					optional: false, nullable: true,
 				},
 				host: {
-					type: 'null',
-					optional: false,
-					description: 'The local host is represented with `null`. The field exists for compatibility with other API endpoints that return files.',
+					type: 'string',
+					optional: false, nullable: true,
 				},
 				url: {
 					type: 'string',

packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts

@@ -17,11 +17,7 @@ export const paramDef = {
 		ids: { type: 'array', items: {
 			type: 'string', format: 'misskey:id',
 		} },
-		category: {
-			type: 'string',
-			nullable: true,
-			description: 'Use `null` to reset the category.',
-		},
+		category: { type: 'string', nullable: true },
 	},
 	required: ['ids'],
 } as const;

packages/backend/src/server/api/endpoints/admin/emoji/update.ts

@@ -23,11 +23,7 @@ export const paramDef = {
 	properties: {
 		id: { type: 'string', format: 'misskey:id' },
 		name: { type: 'string' },
-		category: {
-			type: 'string',
-			nullable: true,
-			description: 'Use `null` to reset the category.',
-		},
+		category: { type: 'string', nullable: true },
 		aliases: { type: 'array', items: {
 			type: 'string',
 		} },

packages/backend/src/server/api/endpoints/admin/show-users.ts

@@ -26,13 +26,8 @@ export const paramDef = {
 		sort: { type: 'string', enum: ['+follower', '-follower', '+createdAt', '-createdAt', '+updatedAt', '-updatedAt'] },
 		state: { type: 'string', enum: ['all', 'available', 'admin', 'moderator', 'adminOrModerator', 'silenced', 'suspended'], default: "all" },
 		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "local" },
-		username: { type: 'string', nullable: true, default: null },
-		hostname: {
-			type: 'string',
-			nullable: true,
-			default: null,
-			description: 'The local host is represented with `null`.',
-		},
+		username: { type: 'string', default: null },
+		hostname: { type: 'string', default: null },
 	},
 	required: [],
 } as const;

packages/backend/src/server/api/endpoints/clips/create.ts

@@ -20,7 +20,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		name: { type: 'string', minLength: 1, maxLength: 100 },
-		isPublic: { type: 'boolean', default: false },
+		isPublic: { type: 'boolean' },
 		description: { type: 'string', nullable: true, minLength: 1, maxLength: 2048 },
 	},
 	required: ['name'],

packages/backend/src/server/api/endpoints/drive/files/show.ts

@@ -28,25 +28,22 @@ export const meta = {
 			code: 'ACCESS_DENIED',
 			id: '25b73c73-68b1-41d0-bad1-381cfdf6579f',
 		},
+
+		fileIdOrUrlRequired: {
+			message: 'fileId or url required.',
+			code: 'INVALID_PARAM',
+			id: '89674805-722c-440c-8d88-5641830dc3e4',
+		},
 	},
 } as const;
 
 export const paramDef = {
 	type: 'object',
-	anyOf: [
-		{
 	properties: {
 		fileId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['fileId'],
-		},
-		{
-			properties: {
 		url: { type: 'string' },
 	},
-			required: ['url'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -65,6 +62,8 @@ export default define(meta, paramDef, async (ps, user) => {
 				thumbnailUrl: ps.url,
 			}],
 		});
+	} else {
+		throw new ApiError(meta.errors.fileIdOrUrlRequired);
 	}
 
 	if (file == null) {

packages/backend/src/server/api/endpoints/federation/instances.ts

@@ -22,7 +22,7 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
-		host: { type: 'string', nullable: true, description: 'Omit or use `null` to not filter by host.' },
+		host: { type: 'string', nullable: true },
 		blocked: { type: 'boolean', nullable: true },
 		notResponding: { type: 'boolean', nullable: true },
 		suspended: { type: 'boolean', nullable: true },

packages/backend/src/server/api/endpoints/messaging/messages.ts

@@ -47,25 +47,14 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+		groupId: { type: 'string', format: 'misskey:id' },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
 		markAsRead: { type: 'boolean', default: true },
 	},
-	anyOf: [
-		{
-			properties: {
-				userId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['userId'],
-		},
-		{
-			properties: {
-				groupId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['groupId'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -137,5 +126,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, {
 			populateGroup: false,
 		})));
+	} else {
+		throw new Error();
 	}
 });

packages/backend/src/server/api/endpoints/messaging/messages/create.ts

@@ -67,23 +67,12 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+		groupId: { type: 'string', format: 'misskey:id' },
 		text: { type: 'string', nullable: true, maxLength: 3000 },
 		fileId: { type: 'string', format: 'misskey:id' },
 	},
-	anyOf: [
-		{
-			properties: {
-				userId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['userId'],
-		},
-		{
-			properties: {
-				groupId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['groupId'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/meta.ts

@@ -169,7 +169,6 @@ export const meta = {
 						host: {
 							type: 'string',
 							optional: false, nullable: true,
-							description: 'The local host is represented with `null`.',
 						},
 						url: {
 							type: 'string',

packages/backend/src/server/api/endpoints/mute/create.ts

@@ -38,11 +38,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		userId: { type: 'string', format: 'misskey:id' },
-		expiresAt: {
-			type: 'integer',
-			nullable: true,
-			description: 'A Unix Epoch timestamp that must lie in the future. `null` means an indefinite mute.',
-		},
+		expiresAt: { type: 'integer', nullable: true },
 	},
 	required: ['userId'],
 } as const;

packages/backend/src/server/api/endpoints/notes.ts

@@ -19,7 +19,7 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
-		local: { type: 'boolean', default: false },
+		local: { type: 'boolean' },
 		reply: { type: 'boolean' },
 		renote: { type: 'boolean' },
 		withFiles: { type: 'boolean' },

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -59,6 +59,12 @@ export const meta = {
 			id: '3ac74a84-8fd5-4bb0-870f-01804f82ce15',
 		},
 
+		contentRequired: {
+			message: 'Content required. You need to set text, fileIds, renoteId or poll.',
+			code: 'CONTENT_REQUIRED',
+			id: '6f57e42b-c348-439b-bc45-993995cc515a',
+		},
+
 		cannotCreateAlreadyExpiredPoll: {
 			message: 'Poll is already expired.',
 			code: 'CANNOT_CREATE_ALREADY_EXPIRED_POLL',
@@ -86,41 +92,29 @@ export const paramDef = {
 		visibleUserIds: { type: 'array', uniqueItems: true, items: {
 			type: 'string', format: 'misskey:id',
 		} },
-		text: { type: 'string', maxLength: MAX_NOTE_TEXT_LENGTH, nullable: true },
+		text: { type: 'string', nullable: true, maxLength: MAX_NOTE_TEXT_LENGTH, default: null },
 		cw: { type: 'string', nullable: true, maxLength: 100 },
 		localOnly: { type: 'boolean', default: false },
 		noExtractMentions: { type: 'boolean', default: false },
 		noExtractHashtags: { type: 'boolean', default: false },
 		noExtractEmojis: { type: 'boolean', default: false },
-		fileIds: {
-			type: 'array',
-			uniqueItems: true,
-			minItems: 1,
-			maxItems: 16,
-			items: { type: 'string', format: 'misskey:id' },
-		},
-		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' },
-		},
+		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',
+		} },
 		replyId: { type: 'string', format: 'misskey:id', nullable: true },
 		renoteId: { type: 'string', format: 'misskey:id', nullable: true },
 		channelId: { type: 'string', format: 'misskey:id', nullable: true },
 		poll: {
-			type: 'object',
-			nullable: true,
+			type: 'object', nullable: true,
 			properties: {
 				choices: {
-					type: 'array',
-					uniqueItems: true,
-					minItems: 2,
-					maxItems: 10,
-					items: { type: 'string', minLength: 1, maxLength: 50 },
+					type: 'array', uniqueItems: true, minItems: 2, maxItems: 10, 
+					items: {
+						type: 'string', minLength: 1, maxLength: 50,
+					},
 				},
 				multiple: { type: 'boolean', default: false },
 				expiresAt: { type: 'integer', nullable: true },
@@ -129,30 +123,7 @@ export const paramDef = {
 			required: ['choices'],
 		},
 	},
-	anyOf: [
-		{
-			// (re)note with text, files and poll are optional
-			properties: {
-				text: { type: 'string', maxLength: MAX_NOTE_TEXT_LENGTH, nullable: false },
-			},
-			required: ['text'],
-		},
-		{
-			// (re)note with files, text and poll are optional
-			required: ['fileIds'],
-		},
-		{
-			// (re)note with files, text and poll are optional
-			required: ['mediaIds'],
-		},
-		{
-			// (re)note with poll, text and files are optional
-			properties: {
-				poll: { type: 'object', nullable: false, },
-			},
-			required: ['poll'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -233,6 +204,11 @@ export default define(meta, paramDef, async (ps, user) => {
 		}
 	}
 
+	// テキストが無いかつ添付ファイルが無いかつRenoteも無いかつ投票も無かったらエラー
+	if (!(ps.text || files.length || renote || ps.poll)) {
+		throw new ApiError(meta.errors.contentRequired);
+	}
+
 	let channel: Channel | undefined;
 	if (ps.channelId != null) {
 		channel = await Channels.findOneBy({ id: ps.channelId });

packages/backend/src/server/api/endpoints/notes/global-timeline.ts

@@ -35,11 +35,7 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
-		withFiles: {
-			type: 'boolean',
-			default: false,
-			description: 'Only show notes that have attached files.',
-		},
+		withFiles: { type: 'boolean' },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -48,11 +48,7 @@ export const paramDef = {
 		includeMyRenotes: { type: 'boolean', default: true },
 		includeRenotedMyNotes: { type: 'boolean', default: true },
 		includeLocalRenotes: { type: 'boolean', default: true },
-		withFiles: {
-			type: 'boolean',
-			default: false,
-			description: 'Only show notes that have attached files.',
-		},
+		withFiles: { type: 'boolean' },
 	},
 	required: [],
 } as const;

packages/backend/src/server/api/endpoints/notes/local-timeline.ts

@@ -37,11 +37,7 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
-		withFiles: {
-			type: 'boolean',
-			default: false,
-			description: 'Only show notes that have attached files.',
-		},
+		withFiles: { type: 'boolean' },
 		fileType: { type: 'array', items: {
 			type: 'string',
 		} },

packages/backend/src/server/api/endpoints/notes/search-by-tag.ts

@@ -25,44 +25,21 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
+		tag: { type: 'string' },
+		query: { type: 'array', items: {
+			type: 'array', items: {
+				type: 'string',
+			},
+		} },
 		reply: { type: 'boolean', nullable: true, default: null },
 		renote: { type: 'boolean', nullable: true, default: null },
-		withFiles: {
-			type: 'boolean',
-			default: false,
-			description: 'Only show notes that have attached files.',
-		},
+		withFiles: { type: 'boolean' },
 		poll: { type: 'boolean', nullable: true, default: null },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 	},
-	anyOf: [
-		{
-			properties: {
-				tag: { type: 'string', minLength: 1 },
-			},
-			required: ['tag'],
-		},
-		{
-			properties: {
-				query: {
-					type: 'array',
-					description: 'The outer arrays are chained with OR, the inner arrays are chained with AND.',
-					items: {
-						type: 'array',
-						items: {
-							type: 'string',
-							minLength: 1,
-						},
-						minItems: 1,
-					},
-					minItems: 1,
-				},
-			},
-			required: ['query'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/notes/search.ts

@@ -35,11 +35,7 @@ export const paramDef = {
 		untilId: { type: 'string', format: 'misskey:id' },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		offset: { type: 'integer', default: 0 },
-		host: {
-			type: 'string',
-			nullable: true,
-			description: 'The local host is represented with `null`.',
-		},
+		host: { type: 'string', nullable: true },
 		userId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
 		channelId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
 	},

packages/backend/src/server/api/endpoints/notes/timeline.ts

@@ -38,11 +38,7 @@ export const paramDef = {
 		includeMyRenotes: { type: 'boolean', default: true },
 		includeRenotedMyNotes: { type: 'boolean', default: true },
 		includeLocalRenotes: { type: 'boolean', default: true },
-		withFiles: {
-			type: 'boolean',
-			default: false,
-			description: 'Only show notes that have attached files.',
-		},
+		withFiles: { type: 'boolean' },
 	},
 	required: [],
 } as const;

packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts

@@ -42,11 +42,7 @@ export const paramDef = {
 		includeMyRenotes: { type: 'boolean', default: true },
 		includeRenotedMyNotes: { type: 'boolean', default: true },
 		includeLocalRenotes: { type: 'boolean', default: true },
-		withFiles: {
-			type: 'boolean',
-			default: false,
-			description: 'Only show notes that have attached files.',
-		},
+		withFiles: { type: 'boolean' },
 	},
 	required: ['listId'],
 } as const;

packages/backend/src/server/api/endpoints/pages/show.ts

@@ -26,21 +26,12 @@ export const meta = {
 
 export const paramDef = {
 	type: 'object',
-	anyOf: [
-		{
 	properties: {
 		pageId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['pageId'],
-		},
-		{
-			properties: {
 		name: { type: 'string' },
 		username: { type: 'string' },
 	},
-			required: ['name', 'username'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/users/followers.ts

@@ -38,29 +38,14 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+		username: { type: 'string' },
+		host: { type: 'string', nullable: true },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 	},
-	anyOf: [
-		{
-			properties: {
-				userId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['userId'],
-		},
-		{
-			properties: {
-				username: { type: 'string' },
-				host: {
-					type: 'string',
-					nullable: true,
-					description: 'The local host is represented with `null`.',
-				},
-			},
-			required: ['username', 'host'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/users/following.ts

@@ -38,29 +38,14 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
+		userId: { type: 'string', format: 'misskey:id' },
+		username: { type: 'string' },
+		host: { type: 'string', nullable: true },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 	},
-	anyOf: [
-		{
-			properties: {
-				userId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['userId'],
-		},
-		{
-			properties: {
-				username: { type: 'string' },
-				host: {
-					type: 'string',
-					nullable: true,
-					description: 'The local host is represented with `null`.',
-				},
-			},
-			required: ['username', 'host'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts

@@ -28,10 +28,7 @@ export const paramDef = {
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		detail: { type: 'boolean', default: true },
 	},
-	anyOf: [
-		{ required: ['username'] },
-		{ required: ['host'] },
-	],
+	required: [],
 } as const;
 
 // TODO: avatar,bannerをJOINしたいけどエラーになる

packages/backend/src/server/api/endpoints/users/show.ts

@@ -46,33 +46,15 @@ export const meta = {
 
 export const paramDef = {
 	type: 'object',
-	anyOf: [
-		{
 	properties: {
 		userId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['userId'],
-		},
-		{
-			properties: {
 		userIds: { type: 'array', uniqueItems: true, items: {
 			type: 'string', format: 'misskey:id',
 		} },
-			},
-			required: ['userIds'],
-		},
-		{
-			properties: {
 		username: { type: 'string' },
-				host: {
-					type: 'string',
-					nullable: true,
-					description: 'The local host is represented with `null`.',
+		host: { type: 'string', nullable: true },
 	},
-			},
-			required: ['username', 'host'],
-		},
-	],
+	required: [],
 } as const;
 
 // eslint-disable-next-line import/no-default-export