Merge branch 'master' into greenkeeper/webpack-cli-2.0.14

1 files changed, 17 insertions, 24 deletions

diff --git a/src/queue/processors/http/report-github-failure.ts b/src/queue/processors/http/report-github-failure.ts
index af9659bdac..1e0b51f89f 100644
--- a/src/queue/processors/http/report-github-failure.ts
+++ b/src/queue/processors/http/report-github-failure.ts
@@ -1,31 +1,24 @@
 import * as request from 'request-promise-native';
 import User from '../../../models/user';
-const createPost = require('../../../server/api/endpoints/posts/create');
+import createPost from '../../../services/post/create';
 
-export default async ({ data }, done) => {
-	try {
-		const asyncBot = User.findOne({ _id: data.userId });
+export default async ({ data }) => {
+	const asyncBot = User.findOne({ _id: data.userId });
 
-		// Fetch parent status
-		const parentStatuses = await request({
-			url: `${data.parentUrl}/statuses`,
-			headers: {
-				'User-Agent': 'misskey'
-			},
-			json: true
-		});
+	// Fetch parent status
+	const parentStatuses = await request({
+		url: `${data.parentUrl}/statuses`,
+		headers: {
+			'User-Agent': 'misskey'
+		},
+		json: true
+	});
 
-		const parentState = parentStatuses[0].state;
-		const stillFailed = parentState == 'failure' || parentState == 'error';
-		const text = stillFailed ?
-			`**⚠️BUILD STILL FAILED⚠️**: ?[${data.message}](${data.htmlUrl})` :
-			`**🚨BUILD FAILED🚨**: →→→?[${data.message}](${data.htmlUrl})←←←`;
+	const parentState = parentStatuses[0].state;
+	const stillFailed = parentState == 'failure' || parentState == 'error';
+	const text = stillFailed ?
+		`**⚠️BUILD STILL FAILED⚠️**: ?[${data.message}](${data.htmlUrl})` :
+		`**🚨BUILD FAILED🚨**: →→→?[${data.message}](${data.htmlUrl})←←←`;
 
-		createPost({ text }, await asyncBot);
-	} catch (error) {
-		done(error);
-		return;
-	}
-
-	done();
+	createPost(await asyncBot, { text });
 };