oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

refactor: use ajv instead of cafy (#8324)

Browse source 
* wip

* wip

* Update abuse-user-reports.ts

* Update files.ts

* Update list-remote.ts

* Update list.ts

* Update show-users.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update update.ts

* Update search.ts

* Update reactions.ts

* Update search.ts

* wip

* wip

* wip

* wip

* Update update.ts

* Update relation.ts

* Update available.ts

* wip

* wip

* wip

* Update packages/backend/src/server/api/define.ts

Co-authored-by: Johann150 <johann.galle@protonmail.com>

* Update define.ts

* Update define.ts

* typo

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update update.ts

* wip

* Update signup.ts

* Update call.ts

* minimum for limit

* type

* remove needless annotation

* wip

* Update signup.ts

* wip

* wip

* fix

* Update create.ts

Co-authored-by: Johann150 <johann.galle@protonmail.com>
This commit is contained in:
syuilo 2022-02-19 14:05:32 +09:00 • committed by GitHub
parent 59785ea04c
commit 510de87607
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
320 changed files with 4395 additions and 5939 deletions
Download patch file Download diff file Expand all files Collapse all files

68
packages/backend/src/server/api/endpoints/federation/instances.ts
View file

@ -1,4 +1,3 @@
import $ from 'cafy';
import config from '@/config/index';
import define from '../../define';
import { Instances } from '@/models/index';
@ -9,50 +8,6 @@ export const meta = {
requireCredential: false,
params: {
host: {
validator: $.optional.nullable.str,
},
blocked: {
validator: $.optional.nullable.bool,
},
notResponding: {
validator: $.optional.nullable.bool,
},
suspended: {
validator: $.optional.nullable.bool,
},
federating: {
validator: $.optional.nullable.bool,
},
subscribing: {
validator: $.optional.nullable.bool,
},
publishing: {
validator: $.optional.nullable.bool,
},
limit: {
validator: $.optional.num.range(1, 100),
default: 30,
},
offset: {
validator: $.optional.num.min(0),
default: 0,
},
sort: {
validator: $.optional.str,
},
},
res: {
type: 'array',
optional: false, nullable: false,
@ -64,8 +19,25 @@ export const meta = {
},
} as const;
const paramDef = {
type: 'object',
properties: {
host: { type: 'string', nullable: true },
blocked: { type: 'boolean', nullable: true },
notResponding: { type: 'boolean', nullable: true },
suspended: { type: 'boolean', nullable: true },
federating: { type: 'boolean', nullable: true },
subscribing: { type: 'boolean', nullable: true },
publishing: { type: 'boolean', nullable: true },
limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
offset: { type: 'integer', default: 0 },
sort: { type: 'string' },
},
required: [],
} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
export default define(meta, paramDef, async (ps, me) => {
const query = Instances.createQueryBuilder('instance');
switch (ps.sort) {
@ -144,7 +116,7 @@ export default define(meta, async (ps, me) => {
query.andWhere('instance.host like :host', { host: '%' + ps.host.toLowerCase() + '%' });
}
const instances = await query.take(ps.limit!).skip(ps.offset).getMany();
const instances = await query.take(ps.limit).skip(ps.offset).getMany();
return instances;
return await Instances.packMany(instances);
});