Skip to content
Snippets Groups Projects
Unverified Commit fcfb5ef0 authored by tamaina's avatar tamaina Committed by GitHub
Browse files

Fix ajv (#8333)

* wip

* ✌️

* use ajv/dist/core

* revert try

* clean up
parent fd8f8162
No related branches found
No related tags found
Loading
Showing
with 22 additions and 22 deletions
......@@ -78,8 +78,8 @@ export default async (endpoint: string, user: User | null | undefined, token: Ac
}
// Cast non JSON input
if (ep.meta.requireFile) {
for (const k of Object.keys(ep.params)) {
if (ep.meta.requireFile && ep.params.properties) {
for (const k of Object.keys(ep.params.properties)) {
const param = ep.params.properties![k];
if (['boolean', 'number', 'integer'].includes(param.type ?? '') && typeof data[k] === 'string') {
try {
......
import * as fs from 'fs';
import * as Ajv from 'ajv';
import Ajv from 'ajv';
import { ILocalUser } from '@/models/entities/user';
import { IEndpointMeta } from './endpoints';
import { ApiError } from './error';
......@@ -65,6 +65,6 @@ export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, pa
return Promise.reject(err);
}
return cb(params, user, token, file, cleanup);
return cb(params as SchemaType<Ps>, user, token, file, cleanup);
};
}
......@@ -70,7 +70,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
......
......@@ -18,7 +18,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
username: Users.localUsernameSchema,
......
......@@ -11,7 +11,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
......
......@@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
url: { type: 'string', minLength: 1 },
......
......@@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },
......
......@@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
......
......@@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },
......
......@@ -44,7 +44,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
title: { type: 'string', minLength: 1 },
......
......@@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },
......
......@@ -52,7 +52,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
......
......@@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },
......
......@@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
......
......@@ -8,7 +8,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],
......
......@@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],
......
......@@ -19,7 +19,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
......
......@@ -149,7 +149,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
fileId: { type: 'string', format: 'misskey:id' },
......
......@@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
ids: { type: 'array', items: {
......
......@@ -22,7 +22,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
fileId: { type: 'string', format: 'misskey:id' },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment