Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

2023-10-22 13:02:27 +09:00
parent 4eaa02d25f 4b295088fd
commit ce09a35b03
1 changed files with 6 additions and 1 deletions
--- a/packages/backend/src/server/api/openapi/schemas.ts
+++ b/packages/backend/src/server/api/openapi/schemas.ts
@@ -26,7 +26,12 @@ export function convertSchemaToOpenApiSchema(schema: Schema) {
 	if (schema.allOf) res.allOf = schema.allOf.map(convertSchemaToOpenApiSchema);

 	if (schema.ref) {
-		res.$ref = `#/components/schemas/${schema.ref}`;
+		const $ref = `#/components/schemas/${schema.ref}`;
+		if (schema.nullable || schema.optional) {
+			res.allOf = [{ $ref }];
+		} else {
+			res.$ref = $ref;
+		}
 	}

 	return res;