* wip

* ✌️

* use ajv/dist/core

* revert try

* clean up
This commit is contained in:
tamaina 2022-02-20 13:15:40 +09:00 committed by GitHub
parent fd8f8162e1
commit fcfb5ef0a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
304 changed files with 307 additions and 306 deletions

View File

@ -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 {

View File

@ -1,5 +1,5 @@
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);
};
}

View File

@ -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 },

View File

@ -18,7 +18,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
username: Users.localUsernameSchema,

View File

@ -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' },

View File

@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
url: { type: 'string', minLength: 1 },

View File

@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },

View File

@ -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 },

View File

@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },

View File

@ -44,7 +44,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
title: { type: 'string', minLength: 1 },

View File

@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },

View File

@ -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 },

View File

@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },

View File

@ -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' },

View File

@ -8,7 +8,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -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 },

View File

@ -149,7 +149,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
fileId: { type: 'string', format: 'misskey:id' },

View File

@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
ids: { type: 'array', items: {

View File

@ -22,7 +22,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
fileId: { type: 'string', format: 'misskey:id' },

View File

@ -34,7 +34,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
emojiId: { type: 'string', format: 'misskey:id' },

View File

@ -11,7 +11,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
ids: { type: 'array', items: {

View File

@ -19,7 +19,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },

View File

@ -8,7 +8,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
fileId: { type: 'string', format: 'misskey:id' },

View File

@ -50,7 +50,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
query: { type: 'string', nullable: true, default: null },

View File

@ -50,7 +50,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
query: { type: 'string', nullable: true, default: null },

View File

@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
ids: { type: 'array', items: {

View File

@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
ids: { type: 'array', items: {

View File

@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
ids: { type: 'array', items: {

View File

@ -18,7 +18,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
id: { type: 'string', format: 'misskey:id' },

View File

@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
host: { type: 'string' },

View File

@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
host: { type: 'string' },

View File

@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
host: { type: 'string' },

View File

@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
host: { type: 'string' },

View File

@ -8,7 +8,7 @@ export const meta = {
tags: ['admin'],
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -19,7 +19,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -24,7 +24,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -8,7 +8,7 @@ export const meta = {
requireAdmin: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -8,7 +8,7 @@ export const meta = {
requireAdmin: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -24,7 +24,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
noteId: { type: 'string', format: 'misskey:id' },

View File

@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -32,7 +32,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -32,7 +32,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -31,7 +31,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -45,7 +45,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
inbox: { type: 'string' },

View File

@ -39,7 +39,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -8,7 +8,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
inbox: { type: 'string' },

View File

@ -23,7 +23,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -12,7 +12,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
reportId: { type: 'string', format: 'misskey:id' },

View File

@ -8,7 +8,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
to: { type: 'string' },

View File

@ -87,7 +87,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -48,7 +48,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },

View File

@ -13,7 +13,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -18,7 +18,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },

View File

@ -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' },

View File

@ -13,7 +13,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -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' },

View File

@ -10,7 +10,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -11,7 +11,7 @@ export const meta = {
requireAdmin: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
disableRegistration: { type: 'boolean', nullable: true },

View File

@ -9,7 +9,7 @@ export const meta = {
requireModerator: true,
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
full: { type: 'boolean' },

View File

@ -51,7 +51,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },

View File

@ -32,7 +32,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
name: { type: 'string', minLength: 1, maxLength: 100 },

View File

@ -19,7 +19,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
antennaId: { type: 'string', format: 'misskey:id' },

View File

@ -19,7 +19,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -33,7 +33,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
antennaId: { type: 'string', format: 'misskey:id' },

View File

@ -24,7 +24,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
antennaId: { type: 'string', format: 'misskey:id' },

View File

@ -37,7 +37,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
antennaId: { type: 'string', format: 'misskey:id' },

View File

@ -22,7 +22,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
uri: { type: 'string' },

View File

@ -68,7 +68,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
uri: { type: 'string' },

View File

@ -16,7 +16,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
name: { type: 'string' },

View File

@ -20,7 +20,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
appId: { type: 'string', format: 'misskey:id' },

View File

@ -21,7 +21,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
token: { type: 'string' },

View File

@ -35,7 +35,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
appSecret: { type: 'string' },

View File

@ -37,7 +37,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
token: { type: 'string' },

View File

@ -45,7 +45,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
appSecret: { type: 'string' },

View File

@ -44,7 +44,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -44,7 +44,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },

View File

@ -20,7 +20,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },

View File

@ -26,7 +26,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
name: { type: 'string', minLength: 1, maxLength: 128 },

View File

@ -17,7 +17,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {},
required: [],

View File

@ -20,7 +20,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
channelId: { type: 'string', format: 'misskey:id' },

View File

@ -20,7 +20,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
sinceId: { type: 'string', format: 'misskey:id' },

View File

@ -20,7 +20,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
sinceId: { type: 'string', format: 'misskey:id' },

View File

@ -22,7 +22,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
channelId: { type: 'string', format: 'misskey:id' },

View File

@ -28,7 +28,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
channelId: { type: 'string', format: 'misskey:id' },

View File

@ -19,7 +19,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
channelId: { type: 'string', format: 'misskey:id' },

View File

@ -36,7 +36,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
channelId: { type: 'string', format: 'misskey:id' },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(activeUsersChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(apRequestChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(driveChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(federationChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(hashtagChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(instanceChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(notesChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(perUserDriveChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(perUserFollowingChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(perUserNotesChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(perUserReactionsChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -8,7 +8,7 @@ export const meta = {
res: getJsonSchema(usersChart.schema),
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
span: { type: 'string', enum: ['day', 'hour'] },

View File

@ -32,7 +32,7 @@ export const meta = {
},
} as const;
const paramDef = {
export const paramDef = {
type: 'object',
properties: {
clipId: { type: 'string', format: 'misskey:id' },

Some files were not shown because too many files have changed in this diff Show More