ドキュメントが見つからなくてもエラーにせずnullを返すように
This commit is contained in:
		
							parent
							
								
									7e50646ede
								
							
						
					
					
						commit
						baad11288a
					
				
					 15 changed files with 50 additions and 34 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../misc/cafy-id';
 | 
			
		||||
import Note, { pack } from '../../../models/note';
 | 
			
		||||
import Note, { packMany } from '../../../models/note';
 | 
			
		||||
import getParams from '../get-params';
 | 
			
		||||
 | 
			
		||||
export const meta = {
 | 
			
		||||
| 
						 | 
				
			
			@ -116,5 +116,5 @@ export default (params: any) => new Promise(async (res, rej) => {
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	res(await Promise.all(notes.map(note => pack(note))));
 | 
			
		||||
	res(await packMany(notes));
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import Note, { pack, INote } from '../../../../models/note';
 | 
			
		||||
import Note, { packMany, INote } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
| 
						 | 
				
			
			@ -52,5 +52,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	res(await Promise.all(conversation.map(note => pack(note, user))));
 | 
			
		||||
	res(await packMany(conversation, user));
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import Note from '../../../../models/note';
 | 
			
		||||
import Mute from '../../../../models/mute';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
import { countIf } from '../../../../prelude/array';
 | 
			
		||||
| 
						 | 
				
			
			@ -113,5 +113,5 @@ export default async (params: any, user: ILocalUser) => {
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	return await Promise.all(timeline.map(note => pack(note, user)));
 | 
			
		||||
	return await packMany(timeline, user);
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@ import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		|||
import Note from '../../../../models/note';
 | 
			
		||||
import Mute from '../../../../models/mute';
 | 
			
		||||
import { getFriends } from '../../common/get-friends';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
import { countIf } from '../../../../prelude/array';
 | 
			
		||||
| 
						 | 
				
			
			@ -240,5 +240,5 @@ export default async (params: any, user: ILocalUser) => {
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	return await Promise.all(timeline.map(note => pack(note, user)));
 | 
			
		||||
	return await packMany(timeline, user);
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import Note from '../../../../models/note';
 | 
			
		||||
import Mute from '../../../../models/mute';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
import { countIf } from '../../../../prelude/array';
 | 
			
		||||
| 
						 | 
				
			
			@ -141,5 +141,5 @@ export default async (params: any, user: ILocalUser) => {
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	return await Promise.all(timeline.map(note => pack(note, user)));
 | 
			
		||||
	return await packMany(timeline, user);
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import Note from '../../../../models/note';
 | 
			
		||||
import { getFriendIds } from '../../common/get-friends';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
import read from '../../../../services/note/read';
 | 
			
		||||
| 
						 | 
				
			
			@ -89,5 +89,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 | 
			
		|||
	mentions.forEach(note => read(user._id, note._id));
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	res(await Promise.all(mentions.map(mention => pack(mention, user))));
 | 
			
		||||
	res(await packMany(mentions, user));
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import Note, { pack } from '../../../../models/note';
 | 
			
		||||
import Note, { packMany } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
| 
						 | 
				
			
			@ -30,5 +30,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 | 
			
		|||
	const ids = (note._replyIds || []).slice(offset, offset + limit);
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	res(await Promise.all(ids.map(id => pack(id, user))));
 | 
			
		||||
	res(await packMany(ids, user));
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import Note, { pack } from '../../../../models/note';
 | 
			
		||||
import Note, { packMany } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
| 
						 | 
				
			
			@ -62,6 +62,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	res(await Promise.all(renotes.map(async note =>
 | 
			
		||||
		await pack(note, user))));
 | 
			
		||||
	res(await packMany(renotes, user));
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@ import $ from 'cafy';
 | 
			
		|||
import * as mongo from 'mongodb';
 | 
			
		||||
import Note from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import es from '../../../../db/elasticsearch';
 | 
			
		||||
 | 
			
		||||
export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
 | 
			
		||||
| 
						 | 
				
			
			@ -60,6 +60,6 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 | 
			
		|||
				}
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
		res(await Promise.all(notes.map(note => pack(note, me))));
 | 
			
		||||
		res(await packMany(notes, me));
 | 
			
		||||
	});
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,7 +3,7 @@ import Note from '../../../../models/note';
 | 
			
		|||
import User, { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import Mute from '../../../../models/mute';
 | 
			
		||||
import { getFriendIds } from '../../common/get-friends';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
import { erase } from '../../../../prelude/array';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -363,5 +363,5 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	res(await Promise.all(notes.map(note => pack(note, me))));
 | 
			
		||||
	res(await packMany(notes, me));
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@ import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		|||
import Note from '../../../../models/note';
 | 
			
		||||
import Mute from '../../../../models/mute';
 | 
			
		||||
import { getFriends } from '../../common/get-friends';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
import { countIf } from '../../../../prelude/array';
 | 
			
		||||
| 
						 | 
				
			
			@ -237,5 +237,5 @@ export default async (params: any, user: ILocalUser) => {
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	return await Promise.all(timeline.map(note => pack(note, user)));
 | 
			
		||||
	return await packMany(timeline, user);
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import Note from '../../../../models/note';
 | 
			
		||||
import Mute from '../../../../models/mute';
 | 
			
		||||
import { pack } from '../../../../models/note';
 | 
			
		||||
import { packMany } from '../../../../models/note';
 | 
			
		||||
import UserList from '../../../../models/user-list';
 | 
			
		||||
import { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
| 
						 | 
				
			
			@ -242,5 +242,5 @@ export default async (params: any, user: ILocalUser) => {
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	return await Promise.all(timeline.map(note => pack(note, user)));
 | 
			
		||||
	return await packMany(timeline, user);
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 | 
			
		||||
import getHostLower from '../../common/get-host-lower';
 | 
			
		||||
import Note, { pack } from '../../../../models/note';
 | 
			
		||||
import Note, { packMany } from '../../../../models/note';
 | 
			
		||||
import User, { ILocalUser } from '../../../../models/user';
 | 
			
		||||
import getParams from '../../get-params';
 | 
			
		||||
import { countIf } from '../../../../prelude/array';
 | 
			
		||||
| 
						 | 
				
			
			@ -181,5 +181,5 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 | 
			
		|||
		});
 | 
			
		||||
 | 
			
		||||
	// Serialize
 | 
			
		||||
	res(await Promise.all(notes.map(note => pack(note, me))));
 | 
			
		||||
	res(await packMany(notes, me));
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue