diff --git a/src/models/blocking.ts b/src/models/blocking.ts index 3eace3989..02369e403 100644 --- a/src/models/blocking.ts +++ b/src/models/blocking.ts @@ -2,7 +2,7 @@ import * as mongo from 'mongodb'; import db from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; const deepcopy = require('deepcopy'); -import { pack as packUser } from './user'; +import { pack as packUser, IUser } from './user'; const Blocking = db.get('blocking'); Blocking.createIndex('blockerId'); @@ -21,7 +21,7 @@ export const packMany = async ( blockings: (string | mongo.ObjectID | IBlocking)[], me?: string | mongo.ObjectID | IUser ) => { - return (await Promise.all(blockings.map(x => pack(x, me)))).filter(x => x != null); + return (await Promise.all(blockings.map(x => pack(x, me)))); }; export const pack = ( diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts index ecbf279d0..8afd170ee 100644 --- a/src/models/drive-file.ts +++ b/src/models/drive-file.ts @@ -79,7 +79,7 @@ export const packMany = async ( detail: boolean } ) => { - return (await Promise.all(files.map(f => pack(f, options)))).filter(x => x != null); + return (await Promise.all(files.map(f => pack(f, options)))); }; /** diff --git a/src/models/favorite.ts b/src/models/favorite.ts index 5f3c328eb..909d4b932 100644 --- a/src/models/favorite.ts +++ b/src/models/favorite.ts @@ -20,7 +20,7 @@ export const packMany = async ( favorites: any[], me: any ) => { - return (await Promise.all(favorites.map(f => pack(f, me)))).filter(x => x != null); + return (await Promise.all(favorites.map(f => pack(f, me)))); }; /** diff --git a/src/models/mute.ts b/src/models/mute.ts index 58536d4b9..3d8feda39 100644 --- a/src/models/mute.ts +++ b/src/models/mute.ts @@ -2,7 +2,7 @@ import * as mongo from 'mongodb'; import db from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; const deepcopy = require('deepcopy'); -import { pack as packUser } from './user'; +import { pack as packUser, IUser } from './user'; const Mute = db.get('mute'); Mute.createIndex('muterId'); @@ -21,7 +21,7 @@ export const packMany = async ( mutes: (string | mongo.ObjectID | IMute)[], me?: string | mongo.ObjectID | IUser ) => { - return (await Promise.all(mutes.map(x => pack(x, me)))).filter(x => x != null); + return (await Promise.all(mutes.map(x => pack(x, me)))); }; export const pack = ( diff --git a/src/models/note.ts b/src/models/note.ts index bc1d6b0ec..18fc0874d 100644 --- a/src/models/note.ts +++ b/src/models/note.ts @@ -172,7 +172,7 @@ export const packMany = async ( skipHide?: boolean; } ) => { - return (await Promise.all(notes.map(n => pack(n, me, options)))).filter(x => x != null); + return (await Promise.all(notes.map(n => pack(n, me, options)))); }; /** diff --git a/src/models/notification.ts b/src/models/notification.ts index 34629ade0..3944395ba 100644 --- a/src/models/notification.ts +++ b/src/models/notification.ts @@ -54,7 +54,7 @@ export interface INotification { export const packMany = async ( notifications: any[] ) => { - return (await Promise.all(notifications.map(n => pack(n)))).filter(x => x != null); + return (await Promise.all(notifications.map(n => pack(n)))); }; /**