monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity

wip

Browse source
This commit is contained in:
tamaina 2023-06-04 17:22:53 +00:00
parent 1e2178b717
commit 64bbfc2107
3 changed files with 59 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/endpoints/auth/accept.ts
View file

@ -29,7 +29,7 @@ export default class extends Endpoint<'auth/accept'> {
.findOneBy({ token: ps.token });
if (session == null) {
throw new ApiError(meta.errors.noSuchSession);
throw new ApiError(this.meta.errors.noSuchSession);
}
const accessToken = secureRndstr(32, true);

58
packages/backend/src/server/api/endpoints/blocking/create.ts
View file

@ -8,56 +8,10 @@ import { DI } from '@/di-symbols.js';
import { GetterService } from '@/server/api/GetterService.js';
import { ApiError } from '../../error.js';
export const meta = {
tags: ['account'],
limit: {
duration: ms('1hour'),
max: 20,
},
requireCredential: true,
kind: 'write:blocks',
errors: {
noSuchUser: {
message: 'No such user.',
code: 'NO_SUCH_USER',
id: '7cc4f851-e2f1-4621-9633-ec9e1d00c01e',
},
blockeeIsYourself: {
message: 'Blockee is yourself.',
code: 'BLOCKEE_IS_YOURSELF',
id: '88b19138-f28d-42c0-8499-6a31bbd0fdc6',
},
alreadyBlocking: {
message: 'You are already blocking that user.',
code: 'ALREADY_BLOCKING',
id: '787fed64-acb9-464a-82eb-afbd745b9614',
},
},
res: {
type: 'object',
optional: false, nullable: false,
ref: 'UserDetailedNotMe',
},
} as const;
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
},
required: ['userId'],
} as const;
// eslint-disable-next-line import/no-default-export
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
export default class extends Endpoint<'blocking/create'> {
name = 'blocking/create' as const;
constructor(
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
@ -69,17 +23,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
private getterService: GetterService,
private userBlockingService: UserBlockingService,
) {
super(meta, paramDef, async (ps, me) => {
super(async (ps, me) => {
const blocker = await this.usersRepository.findOneByOrFail({ id: me.id });
// 自分自身
if (me.id === ps.userId) {
throw new ApiError(meta.errors.blockeeIsYourself);
throw new ApiError(this.meta.errors.blockeeIsYourself);
}
// Get blockee
const blockee = await this.getterService.getUser(ps.userId).catch(err => {
if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(this.meta.errors.noSuchUser);
throw err;
});
@ -90,7 +44,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
});
if (exist != null) {
throw new ApiError(meta.errors.alreadyBlocking);
throw new ApiError(this.meta.errors.alreadyBlocking);
}
await this.userBlockingService.block(blocker, blockee);

56
packages/misskey-js/src/endpoints.ts
View file

@ -2450,11 +2450,11 @@ export const endpoints = {
},
'auth/accept': {
tags: ['auth'],
requireCredential: true,
secure: true,
errors: {
noSuchSession: {
message: 'No such session.',
@ -2473,7 +2473,55 @@ export const endpoints = {
},
res: undefined,
}],
}
},
//#endregion
//#region blocking
'blocking/create': {
tags: ['account'],
limit: {
duration: ms('1hour'),
max: 20,
},
requireCredential: true,
kind: 'write:blocks',
errors: {
noSuchUser: {
message: 'No such user.',
code: 'NO_SUCH_USER',
id: '7cc4f851-e2f1-4621-9633-ec9e1d00c01e',
},
blockeeIsYourself: {
message: 'Blockee is yourself.',
code: 'BLOCKEE_IS_YOURSELF',
id: '88b19138-f28d-42c0-8499-6a31bbd0fdc6',
},
alreadyBlocking: {
message: 'You are already blocking that user.',
code: 'ALREADY_BLOCKING',
id: '787fed64-acb9-464a-82eb-afbd745b9614',
},
},
defines: [{
req: {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
},
required: ['userId'],
},
res: {
$ref: 'https://misskey-hub.net/api/schemas/UserDetailedNotMe',
},
}],
},
//#endregion
} as const satisfies { [x: string]: IEndpointMeta; };