From 91172654e4b715198099146d4c442e0787df0785 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 13 Feb 2021 15:33:38 +0900 Subject: refactor: resolve #7139 --- src/misc/check-hit-antenna.ts | 3 +-- src/misc/fetch-proxy-account.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/misc') diff --git a/src/misc/check-hit-antenna.ts b/src/misc/check-hit-antenna.ts index 562d054563..0464f14131 100644 --- a/src/misc/check-hit-antenna.ts +++ b/src/misc/check-hit-antenna.ts @@ -4,7 +4,6 @@ import { User } from '../models/entities/user'; import { UserListJoinings, UserGroupJoinings } from '../models'; import parseAcct from './acct/parse'; import { getFullApAccount } from './convert-host'; -import { ensure } from '../prelude/ensure'; export async function checkHitAntenna(antenna: Antenna, note: Note, noteUser: User, followers: User['id'][]): Promise { if (note.visibility === 'specified') return false; @@ -24,7 +23,7 @@ export async function checkHitAntenna(antenna: Antenna, note: Note, noteUser: Us if (!listUsers.includes(note.userId)) return false; } else if (antenna.src === 'group') { - const joining = await UserGroupJoinings.findOne(antenna.userGroupJoiningId!).then(ensure); + const joining = await UserGroupJoinings.findOneOrFail(antenna.userGroupJoiningId!); const groupUsers = (await UserGroupJoinings.find({ userGroupId: joining.userGroupId diff --git a/src/misc/fetch-proxy-account.ts b/src/misc/fetch-proxy-account.ts index 0094ab8a56..537edf2891 100644 --- a/src/misc/fetch-proxy-account.ts +++ b/src/misc/fetch-proxy-account.ts @@ -1,10 +1,9 @@ import { fetchMeta } from './fetch-meta'; import { ILocalUser } from '../models/entities/user'; import { Users } from '../models'; -import { ensure } from '../prelude/ensure'; export async function fetchProxyAccount(): Promise { const meta = await fetchMeta(); if (meta.proxyAccountId == null) return null; - return await Users.findOne(meta.proxyAccountId).then(ensure) as ILocalUser; + return await Users.findOneOrFail(meta.proxyAccountId) as ILocalUser; } -- cgit v1.2.3-freya