refactor

2 files changed, 13 insertions, 59 deletions

diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts
index 394c178f2a..8a3ba9e026 100644
--- a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts
+++ b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts
@@ -21,29 +21,7 @@ export const meta = {
 		type: 'array',
 		items: {
 			type: 'object',
-			properties: {
-				id: {
-					type: 'string',
-					format: 'misskey:id',
-				},
-				userId: {
-					type: 'string',
-					format: 'misskey:id',
-				},
-				name: { type: 'string' },
-				on: {
-					type: 'array',
-					items: {
-						type: 'string',
-						enum: webhookEventTypes,
-					},
-				},
-				url: { type: 'string' },
-				secret: { type: 'string' },
-				active: { type: 'boolean' },
-				latestSentAt: { type: 'string', format: 'date-time', nullable: true },
-				latestStatus: { type: 'integer', nullable: true },
-			},
+			ref: 'UserWebhook',
 		},
 	},
 } as const;
@@ -65,19 +43,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				userId: me.id,
 			});
 
-			return webhooks.map(webhook => (
-				{
-					id: webhook.id,
-					userId: webhook.userId,
-					name: webhook.name,
-					on: webhook.on,
-					url: webhook.url,
-					secret: webhook.secret,
-					active: webhook.active,
-					latestSentAt: webhook.latestSentAt ? webhook.latestSentAt.toISOString() : null,
-					latestStatus: webhook.latestStatus,
-				}
-			));
+			return webhooks.map(webhook => ({
+				id: webhook.id,
+				userId: webhook.userId,
+				name: webhook.name,
+				on: webhook.on,
+				url: webhook.url,
+				secret: webhook.secret,
+				active: webhook.active,
+				latestSentAt: webhook.latestSentAt ? webhook.latestSentAt.toISOString() : null,
+				latestStatus: webhook.latestStatus,
+			}));
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts
index 4a0c09ff0c..1c19081c98 100644
--- a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts
+++ b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts
@@ -28,29 +28,7 @@ export const meta = {
 
 	res: {
 		type: 'object',
-		properties: {
-			id: {
-				type: 'string',
-				format: 'misskey:id',
-			},
-			userId: {
-				type: 'string',
-				format: 'misskey:id',
-			},
-			name: { type: 'string' },
-			on: {
-				type: 'array',
-				items: {
-					type: 'string',
-					enum: webhookEventTypes,
-				},
-			},
-			url: { type: 'string' },
-			secret: { type: 'string' },
-			active: { type: 'boolean' },
-			latestSentAt: { type: 'string', format: 'date-time', nullable: true },
-			latestStatus: { type: 'integer', nullable: true },
-		},
+		ref: 'UserWebhook',
 	},
 } as const;