refactor: resolve #7139
This commit is contained in:
parent
ebadd7fd3f
commit
91172654e4
76 changed files with 107 additions and 221 deletions
|
|
@ -6,7 +6,6 @@ import { MessagingMessage } from '../../models/entities/messaging-message';
|
|||
import { Notes, Users, UserPublickeys, MessagingMessages } from '../../models';
|
||||
import { IObject, getApId } from './type';
|
||||
import { resolvePerson } from './models/person';
|
||||
import { ensure } from '../../prelude/ensure';
|
||||
import escapeRegexp = require('escape-regexp');
|
||||
|
||||
export default class DbResolver {
|
||||
|
|
@ -99,7 +98,7 @@ export default class DbResolver {
|
|||
|
||||
if (user == null) return null;
|
||||
|
||||
const key = await UserPublickeys.findOne(user.id).then(ensure);
|
||||
const key = await UserPublickeys.findOneOrFail(user.id);
|
||||
|
||||
return {
|
||||
user,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue