Fix bugs

2 files changed, 7 insertions, 4 deletions

diff --git a/src/queue/processors/http/index.ts b/src/queue/processors/http/index.ts
index 3d7d941b1a..61d7f9ac94 100644
--- a/src/queue/processors/http/index.ts
+++ b/src/queue/processors/http/index.ts
@@ -12,8 +12,9 @@ export default (job, done) => {
 	const handler = handlers[job.data.type];
 
 	if (handler) {
-		handler(job).then(() => done(), done);
+		handler(job, done);
 	} else {
 		console.warn(`Unknown job: ${job.data.type}`);
+		done();
 	}
 };
diff --git a/src/services/post/create.ts b/src/services/post/create.ts
index 9723dbe452..405e4a2f7b 100644
--- a/src/services/post/create.ts
+++ b/src/services/post/create.ts
@@ -98,7 +98,7 @@ export default async (user: IUser, content: {
 	const postObj = await pack(post);
 
 	// タイムラインへの投稿
-	if (!post.channelId) {
+	if (post.channelId == null) {
 		// Publish event to myself's stream
 		if (isLocalUser(user)) {
 			stream(post.userId, 'post', postObj);
@@ -110,7 +110,7 @@ export default async (user: IUser, content: {
 				from: 'users',
 				localField: 'followerId',
 				foreignField: '_id',
-				as: 'follower'
+				as: 'user'
 			}
 		}, {
 			$match: {
@@ -125,7 +125,9 @@ export default async (user: IUser, content: {
 			const content = renderCreate(note);
 			content['@context'] = context;
 
-			Promise.all(followers.map(({ follower }) => {
+			Promise.all(followers.map(follower => {
+				follower = follower.user[0];
+
 				if (isLocalUser(follower)) {
 					// Publish event to followers stream
 					stream(follower._id, 'post', postObj);