rsesot/misskey
1
0
Fork 0
forked from mirrors/misskey
Code Pull Requests Activity

なんかもうめっちゃ変えた

Browse Source
This commit is contained in:
syuilo
2022-09-18 03:27:08 +09:00
committed by GitHub
parent d9ab03f086
commit b75184ec8e
946 changed files with 41219 additions and 28839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/backend/src/server/api/endpoints/following/requests/accept.ts
View File

@@ -1,7 +1,8 @@
import acceptFollowRequest from '@/services/following/requests/accept.js';
import define from '../../../define.js';
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { GetterService } from '@/server/api/common/GetterService.js';
import { UserFollowingService } from '@/core/UserFollowingService.js';
import { ApiError } from '../../../error.js';
import { getUser } from '../../../common/getters.js';
export const meta = {
tags: ['following', 'account'],
@@ -33,17 +34,25 @@ export const paramDef = {
} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch follower
const follower = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
private getterService: GetterService,
private userFollowingService: UserFollowingService,
) {
super(meta, paramDef, async (ps, me) => {
// Fetch follower
const follower = await this.getterService.getUser(ps.userId).catch(err => {
if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw err;
});
await acceptFollowRequest(user, follower).catch(e => {
if (e.id === '8884c2dd-5795-4ac9-b27e-6a01d38190f9') throw new ApiError(meta.errors.noFollowRequest);
throw e;
});
await this.userFollowingService.acceptFollowRequest(me, follower).catch(err => {
if (err.id === '8884c2dd-5795-4ac9-b27e-6a01d38190f9') throw new ApiError(meta.errors.noFollowRequest);
throw err;
});
return;
});
return;
});
}
}

58
packages/backend/src/server/api/endpoints/following/requests/cancel.ts
View File

@@ -1,9 +1,13 @@
import cancelFollowRequest from '@/services/following/requests/cancel.js';
import define from '../../../define.js';
import { ApiError } from '../../../error.js';
import { getUser } from '../../../common/getters.js';
import { Users } from '@/models/index.js';
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { FollowingsRepository } from '@/models/index.js';
import type { UsersRepository } from '@/models/index.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { GetterService } from '@/server/api/common/GetterService.js';
import { UserFollowingService } from '@/core/UserFollowingService.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '../../../error.js';
export const meta = {
tags: ['following', 'account'],
@@ -42,21 +46,33 @@ export const paramDef = {
} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch followee
const followee = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
try {
await cancelFollowRequest(followee, user);
} catch (e) {
if (e instanceof IdentifiableError) {
if (e.id === '17447091-ce07-46dd-b331-c1fd4f15b1e7') throw new ApiError(meta.errors.followRequestNotFound);
}
throw e;
private userEntityService: UserEntityService,
private getterService: GetterService,
private userFollowingService: UserFollowingService,
) {
super(meta, paramDef, async (ps, me) => {
// Fetch followee
const followee = await this.getterService.getUser(ps.userId).catch(err => {
if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw err;
});
try {
await this.userFollowingService.cancelFollowRequest(followee, me);
} catch (err) {
if (err instanceof IdentifiableError) {
if (err.id === '17447091-ce07-46dd-b331-c1fd4f15b1e7') throw new ApiError(meta.errors.followRequestNotFound);
}
throw err;
}
return await this.userEntityService.pack(followee.id, me);
});
}
return await Users.pack(followee.id, user);
});
}

29
packages/backend/src/server/api/endpoints/following/requests/list.ts
View File

@@ -1,5 +1,8 @@
import define from '../../../define.js';
import { FollowRequests } from '@/models/index.js';
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { FollowRequestsRepository } from '@/models/index.js';
import { FollowRequestEntityService } from '@/core/entities/FollowRequestEntityService.js';
import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['following', 'account'],
@@ -42,10 +45,20 @@ export const paramDef = {
} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const reqs = await FollowRequests.findBy({
followeeId: user.id,
});
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
@Inject(DI.followRequestsRepository)
private followRequestsRepository: FollowRequestsRepository,
return await Promise.all(reqs.map(req => FollowRequests.pack(req)));
});
private followRequestEntityService: FollowRequestEntityService,
) {
super(meta, paramDef, async (ps, me) => {
const reqs = await this.followRequestsRepository.findBy({
followeeId: me.id,
});
return await Promise.all(reqs.map(req => this.followRequestEntityService.pack(req)));
});
}
}

33
packages/backend/src/server/api/endpoints/following/requests/reject.ts
View File

@@ -1,7 +1,8 @@
import { rejectFollowRequest } from '@/services/following/reject.js';
import define from '../../../define.js';
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { GetterService } from '@/server/api/common/GetterService.js';
import { UserFollowingService } from '@/core/UserFollowingService.js';
import { ApiError } from '../../../error.js';
import { getUser } from '../../../common/getters.js';
export const meta = {
tags: ['following', 'account'],
@@ -28,14 +29,22 @@ export const paramDef = {
} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch follower
const follower = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
private getterService: GetterService,
private userFollowingService: UserFollowingService,
) {
super(meta, paramDef, async (ps, me) => {
// Fetch follower
const follower = await this.getterService.getUser(ps.userId).catch(err => {
if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw err;
});
await rejectFollowRequest(user, follower);
await this.userFollowingService.rejectFollowRequest(me, follower);
return;
});
return;
});
}
}