ドキュメントが見つからなくてもエラーにせずnullを返すように
This commit is contained in:
parent
7e50646ede
commit
baad11288a
15 changed files with 50 additions and 34 deletions
|
@ -3,7 +3,7 @@ const deepcopy = require('deepcopy');
|
|||
const sequential = require('promise-sequential');
|
||||
import rap from '@prezzemolo/rap';
|
||||
import db from '../db/mongodb';
|
||||
import Note, { pack as packNote, deleteNote } from './note';
|
||||
import Note, { packMany as packNoteMany, deleteNote } from './note';
|
||||
import Following, { deleteFollowing } from './following';
|
||||
import Mute, { deleteMute } from './mute';
|
||||
import { getFriendIds } from '../server/api/common/get-friends';
|
||||
|
@ -361,9 +361,11 @@ export const pack = (
|
|||
_user = deepcopy(user);
|
||||
}
|
||||
|
||||
// TODO: ここでエラーにするのではなくダミーのユーザーデータを返す
|
||||
// SEE: https://github.com/syuilo/misskey/issues/1432
|
||||
if (!_user) return reject('invalid user arg.');
|
||||
// ユーザーがデータベース上に見つからなかったとき
|
||||
if (_user == null) {
|
||||
console.warn(`user not found on database: ${user}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
// Me
|
||||
const meId: mongo.ObjectID = me
|
||||
|
@ -468,9 +470,9 @@ export const pack = (
|
|||
if (opts.detail) {
|
||||
if (_user.pinnedNoteIds) {
|
||||
// Populate pinned notes
|
||||
_user.pinnedNotes = Promise.all(_user.pinnedNoteIds.map((id: mongo.ObjectId) => packNote(id, meId, {
|
||||
_user.pinnedNotes = packNoteMany(_user.pinnedNoteIds, meId, {
|
||||
detail: true
|
||||
})));
|
||||
});
|
||||
}
|
||||
|
||||
if (meId && !meId.equals(_user.id)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue