sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: migrate to typeorm 3.0 (#8443)

Browse Source 
* wip

* wip

* wip

* Update following.ts

* wip

* wip

* wip

* Update resolve-user.ts

* maxQueryExecutionTime

* wip

* wip
This commit is contained in:
syuilo
2022-03-26 15:34:00 +09:00
committed by GitHub
parent 41c87074e6
commit 1c67c26bd8
325 changed files with 1314 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend/src/services/following/create.ts
View File

@ -45,7 +45,7 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
}
});
const req = await FollowRequests.findOne({
const req = await FollowRequests.findOneBy({
followeeId: followee.id,
followerId: follower.id,
});
@ -108,17 +108,17 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
export default async function(_follower: { id: User['id'] }, _followee: { id: User['id'] }, requestId?: string) {
const [follower, followee] = await Promise.all([
Users.findOneOrFail(_follower.id),
Users.findOneOrFail(_followee.id),
Users.findOneByOrFail({ id: _follower.id }),
Users.findOneByOrFail({ id: _followee.id }),
]);
// check blocking
const [blocking, blocked] = await Promise.all([
Blockings.findOne({
Blockings.findOneBy({
blockerId: follower.id,
blockeeId: followee.id,
}),
Blockings.findOne({
Blockings.findOneBy({
blockerId: followee.id,
blockeeId: follower.id,
}),
@ -138,7 +138,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
if (blocked != null) throw new IdentifiableError('3338392a-f764-498d-8855-db939dcf8c48', 'blocked');
}
const followeeProfile = await UserProfiles.findOneOrFail(followee.id);
const followeeProfile = await UserProfiles.findOneByOrFail({ userId: followee.id });
// フォロー対象が鍵アカウントである or
// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
@ -148,7 +148,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
let autoAccept = false;
// 鍵アカウントであっても、既にフォローされていた場合はスルー
const following = await Followings.findOne({
const following = await Followings.findOneBy({
followerId: follower.id,
followeeId: followee.id,
});
@ -158,7 +158,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
// フォローしているユーザーは自動承認オプション
if (!autoAccept && (Users.isLocalUser(followee) && followeeProfile.autoAcceptFollowed)) {
const followed = await Followings.findOne({
const followed = await Followings.findOneBy({
followerId: followee.id,
followeeId: follower.id,
});