summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/users/following.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-26 15:34:00 +0900
committerGitHub <noreply@github.com>2022-03-26 15:34:00 +0900
commit1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch)
tree633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/api/endpoints/users/following.ts
parent.js (diff)
downloadmisskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz
misskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2
misskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.zip
refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
Diffstat (limited to 'packages/backend/src/server/api/endpoints/users/following.ts')
-rw-r--r--packages/backend/src/server/api/endpoints/users/following.ts9
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index b0a1036c76..55460f7c67 100644
--- a/packages/backend/src/server/api/endpoints/users/following.ts
+++ b/packages/backend/src/server/api/endpoints/users/following.ts
@@ -3,6 +3,7 @@ import { ApiError } from '../../error.js';
import { Users, Followings, UserProfiles } from '@/models/index.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
import { toPunyNullable } from '@/misc/convert-host.js';
+import { IsNull } from 'typeorm';
export const meta = {
tags: ['users'],
@@ -49,15 +50,15 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
- const user = await Users.findOne(ps.userId != null
+ const user = await Users.findOneBy(ps.userId != null
? { id: ps.userId }
- : { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(ps.host) });
+ : { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(ps.host) ?? IsNull() });
if (user == null) {
throw new ApiError(meta.errors.noSuchUser);
}
- const profile = await UserProfiles.findOneOrFail(user.id);
+ const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
if (profile.ffVisibility === 'private') {
if (me == null || (me.id !== user.id)) {
@@ -67,7 +68,7 @@ export default define(meta, paramDef, async (ps, me) => {
if (me == null) {
throw new ApiError(meta.errors.forbidden);
} else if (me.id !== user.id) {
- const following = await Followings.findOne({
+ const following = await Followings.findOneBy({
followeeId: user.id,
followerId: me.id,
});