oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
325 changed files with 1314 additions and 1494 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/backend/src/server/api/endpoints/users/show.ts
View file

@ -3,7 +3,7 @@ import define from '../../define.js';
import { apiLogger } from '../../logger.js';
import { ApiError } from '../../error.js';
import { Users } from '@/models/index.js';
import { In } from 'typeorm';
import { FindOptionsWhere, In, IsNull } from 'typeorm';
import { User } from '@/models/entities/user.js';
export const meta = {
@ -68,7 +68,7 @@ export default define(meta, paramDef, async (ps, me) => {
return [];
}
const users = await Users.find(isAdminOrModerator ? {
const users = await Users.findBy(isAdminOrModerator ? {
id: In(ps.userIds),
} : {
id: In(ps.userIds),
@ -92,11 +92,11 @@ export default define(meta, paramDef, async (ps, me) => {
throw new ApiError(meta.errors.failedToResolveRemoteUser);
});
} else {
const q: any = ps.userId != null
const q: FindOptionsWhere<User> = ps.userId != null
? { id: ps.userId }
: { usernameLower: ps.username!.toLowerCase(), host: null };
: { usernameLower: ps.username!.toLowerCase(), host: IsNull() };
user = await Users.findOne(q);
user = await Users.findOneBy(q);
}
if (user == null || (!isAdminOrModerator && user.isSuspended)) {