wip

packages/misskey-js/src/api.ts

@@ -1,4 +1,5 @@
 import type { Endpoints, SchemaOrUndefined, IEndpointMeta, ResponseOf } from './endpoints.types.js';
+import type { Serialized, WeakSerialized } from 'schema-type';
 
 const MK_API_ERROR = Symbol();
 
@@ -42,9 +43,10 @@ export class APIClient {
 		this.fetch = opts.fetch ?? ((...args) => fetch(...args));
 	}
 
+	// WeakSerialized<P>で推論が効くかは知らない
 	public request<E extends keyof Endpoints, P extends SchemaOrUndefined<M['defines'][number]['req']>, M extends IEndpointMeta = Endpoints[E], R = ResponseOf<M, P>>(
-		endpoint: E, params: P, credential?: string | null | undefined,
-	): Promise<R>
+		endpoint: E, params: WeakSerialized<P>, credential?: string | null | undefined,
+	): Promise<Serialized<R>>
 	{
 		const promise = new Promise((resolve, reject) => {
 			this.fetch(`${this.origin}/api/${endpoint}`, {

packages/misskey-js/src/endpoints.ts

@@ -269,7 +269,7 @@ export const endpoints = {
 			res: undefined,
 		}],
 	},
-	"admin/drive/clenaup": {
+	"admin/drive/cleanup": {
 		tags: ['admin'],
 
 		requireCredential: true,
@@ -354,24 +354,94 @@ export const endpoints = {
 				],
 			},
 			res: {
-				allOf: [{
-					$ref: 'https://misskey-hub.net/api/schemas/DriveFile',
-				}, {
-					type: 'object',
-					properties: {
-						requestIp: {
-							type: ['string', 'null'],
-						},
-						requestHeaders: {
-							oneOf: [{
-								type: 'object',
-							}, {
-								type: 'null',
-							}],
-						}
+				type: 'object',
+				properties: {
+					id: { $ref: 'https://misskey-hub.net/api/schemas/Id' },
+					createdAt: { type: 'string', format: 'date-time' },
+					userId: { 
+						oneOf: [
+							{ $ref: 'https://misskey-hub.net/api/schemas/Id' },
+							{ type: 'null' },
+						]
 					},
-					required: ['requestIp', 'requestHeaders'],
-				}],
+					userHost: { type: ['string', 'null'] },
+					md5: { type: 'string', format: 'md5', examples: '1bc29b36f623ba82aaf6724fd3b16718' },
+					name: { type: 'string', examples: 'lenna.jpg' },
+					type: { type: 'string', examples: 'image/jpeg' },
+					size: { type: 'number', examples: 51469 },
+					comment: { type: ['string', 'null'] },
+					blurhash: { type: ['string', 'null'] },
+					properties: { type: 'object' },
+					storedInternal: { type: ['boolean', 'null'], examples: true },
+					url: {
+						oneOf: [
+							{ type: 'string', format: 'url' },
+							{ type: 'null' },
+						],
+					},
+					thumbnailUrl: {
+						oneOf: [
+							{ type: 'string', format: 'url' },
+							{ type: 'null' },
+						],
+					},
+					webpublicUrl: {
+						oneOf: [
+							{ type: 'string', format: 'url' },
+							{ type: 'null' },
+						],
+					},
+					accessKey: { type: ['string', 'null'] },
+					thumbnailAccessKey: { type: ['string', 'null'] },
+					webpublicAccessKey: { type: ['string', 'null'] },
+					uri: { type: ['string', 'null'] },
+					src: { type: ['string', 'null'] },
+					folderId: {
+						oneOf: [
+							{ $ref: 'https://misskey-hub.net/api/schemas/Id' },
+							{ type: 'null' },
+						]
+					},
+					isSensitive: { type: 'boolean' },
+					isLink: { type: 'boolean' },
+					requestIp: {
+						type: ['string', 'null'],
+					},
+					requestHeaders: {
+						oneOf: [{
+							type: 'object',
+						}, {
+							type: 'null',
+						}],
+					}
+				},
+				required: [
+					'id',
+					'createdAt',
+					'userId',
+					'userHost',
+					'md5',
+					'name',
+					'type',
+					'size',
+					'comment',
+					'blurhash',
+					'properties',
+					'storedInternal',
+					'url',
+					'thumbnailUrl',
+					'webpublicUrl',
+					'accessKey',
+					'thumbnailAccessKey',
+					'webpublicAccessKey',
+					'uri',
+					'src',
+					'folderId',
+					'isSensitive',
+					'isLink',
+					'requestIp',
+					'requestHeaders',
+				],
 			},
 		}],
 	},

packages/misskey-js/src/schemas/ad.ts

@@ -40,7 +40,6 @@ export const packedAdSchema = {
         'expiresAt',
         'startsAt',
         'place',
-        'property',
         'ratio',
         'imageUrl',
         'memo',