refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
This commit is contained in:
		| @@ -54,7 +54,7 @@ export const paramDef = { | ||||
|  | ||||
| // eslint-disable-next-line import/no-default-export | ||||
| export default define(meta, paramDef, async (ps, user) => { | ||||
| 	const blocker = await Users.findOneOrFail(user.id); | ||||
| 	const blocker = await Users.findOneByOrFail({ id: user.id }); | ||||
|  | ||||
| 	// 自分自身 | ||||
| 	if (user.id === ps.userId) { | ||||
| @@ -68,7 +68,7 @@ export default define(meta, paramDef, async (ps, user) => { | ||||
| 	}); | ||||
|  | ||||
| 	// Check if already blocking | ||||
| 	const exist = await Blockings.findOne({ | ||||
| 	const exist = await Blockings.findOneBy({ | ||||
| 		blockerId: blocker.id, | ||||
| 		blockeeId: blockee.id, | ||||
| 	}); | ||||
|   | ||||
| @@ -54,7 +54,7 @@ export const paramDef = { | ||||
|  | ||||
| // eslint-disable-next-line import/no-default-export | ||||
| export default define(meta, paramDef, async (ps, user) => { | ||||
| 	const blocker = await Users.findOneOrFail(user.id); | ||||
| 	const blocker = await Users.findOneByOrFail({ id: user.id }); | ||||
|  | ||||
| 	// Check if the blockee is yourself | ||||
| 	if (user.id === ps.userId) { | ||||
| @@ -68,7 +68,7 @@ export default define(meta, paramDef, async (ps, user) => { | ||||
| 	}); | ||||
|  | ||||
| 	// Check not blocking | ||||
| 	const exist = await Blockings.findOne({ | ||||
| 	const exist = await Blockings.findOneBy({ | ||||
| 		blockerId: blocker.id, | ||||
| 		blockeeId: blockee.id, | ||||
| 	}); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 syuilo
					syuilo