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/server/api/common/inject-featured.ts | 3 +-- src/server/api/common/inject-promo.ts | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/server/api/common') diff --git a/src/server/api/common/inject-featured.ts b/src/server/api/common/inject-featured.ts index 098d20e72d..3f47c13385 100644 --- a/src/server/api/common/inject-featured.ts +++ b/src/server/api/common/inject-featured.ts @@ -3,7 +3,6 @@ import { Note } from '../../../models/entities/note'; import { User } from '../../../models/entities/user'; import { Notes, UserProfiles, NoteReactions } from '../../../models'; import { generateMutedUserQuery } from './generate-muted-user-query'; -import { ensure } from '../../../prelude/ensure'; // TODO: リアクション、Renote、返信などをしたノートは除外する @@ -11,7 +10,7 @@ export async function injectFeatured(timeline: Note[], user?: User | null) { if (timeline.length < 5) return; if (user) { - const profile = await UserProfiles.findOne(user.id).then(ensure); + const profile = await UserProfiles.findOneOrFail(user.id); if (!profile.injectFeaturedNote) return; } diff --git a/src/server/api/common/inject-promo.ts b/src/server/api/common/inject-promo.ts index f694ce6ea0..2c16ca4cf7 100644 --- a/src/server/api/common/inject-promo.ts +++ b/src/server/api/common/inject-promo.ts @@ -2,7 +2,6 @@ import rndstr from 'rndstr'; import { Note } from '../../../models/entities/note'; import { User } from '../../../models/entities/user'; import { PromoReads, PromoNotes, Notes, Users } from '../../../models'; -import { ensure } from '../../../prelude/ensure'; export async function injectPromo(timeline: Note[], user?: User | null) { if (timeline.length < 5) return; @@ -23,10 +22,10 @@ export async function injectPromo(timeline: Note[], user?: User | null) { // Pick random promo const promo = promos[Math.floor(Math.random() * promos.length)]; - const note = await Notes.findOne(promo.noteId).then(ensure); + const note = await Notes.findOneOrFail(promo.noteId); // Join - note.user = await Users.findOne(note.userId).then(ensure); + note.user = await Users.findOneOrFail(note.userId); (note as any)._prId_ = rndstr('a-z0-9', 8); -- cgit v1.2.3-freya