sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve error handling of packaging functions

Browse Source
This commit is contained in:
syuilo
2018-10-05 01:43:47 +09:00
parent 401d0b1298
commit baf9b65801
6 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/models/note.ts
View File

@ -7,7 +7,7 @@ import { IUser, pack as packUser } from './user';
import { pack as packApp } from './app';
import PollVote, { deletePollVote } from './poll-vote';
import Reaction, { deleteNoteReaction } from './note-reaction';
import { pack as packFile, IDriveFile } from './drive-file';
import { packMany as packFileMany, IDriveFile } from './drive-file';
import NoteWatching, { deleteNoteWatching } from './note-watching';
import NoteReaction from './note-reaction';
import Favorite, { deleteFavorite } from './favorite';
@ -309,9 +309,7 @@ export const pack = async (
}
// Populate files
_note.files = Promise.all((_note.fileIds || []).map((fileId: mongo.ObjectID) =>
packFile(fileId)
));
_note.files = packFileMany(_note.fileIds || []);
// 後方互換性のため
_note.mediaIds = _note.fileIds;
@ -380,6 +378,12 @@ export const pack = async (
// resolve promises in _note object
_note = await rap(_note);
// (データベースの欠損などで)ユーザーがデータベース上に見つからなかったとき
if (_note.user == null) {
console.warn(`in packaging note: note user not found on database: note(${_note.id})`);
return null;
}
if (_note.user.isCat && _note.text) {
_note.text = _note.text.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ');
}