diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-02-17 05:49:40 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-02-17 05:49:40 +0900 |
| commit | 397d16ecbb6df2517524ca247e354e18cd1c03f0 (patch) | |
| tree | 1ca01a905d4aac8464c65cb7086e2e1bd163832a | |
| parent | [Client:Mobile] Implement file rename (diff) | |
| parent | [Server] Fix bug (diff) | |
| download | misskey-397d16ecbb6df2517524ca247e354e18cd1c03f0.tar.gz misskey-397d16ecbb6df2517524ca247e354e18cd1c03f0.tar.bz2 misskey-397d16ecbb6df2517524ca247e354e18cd1c03f0.zip | |
Merge branch 'master' of https://github.com/syuilo/misskey
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/api/service/github.ts | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json index 9d1e977238..630c000cbc 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "gulp-replace": "0.5.4", "gulp-stylus": "2.6.0", "gulp-tslint": "7.1.0", - "gulp-typescript": "3.1.4", + "gulp-typescript": "3.1.5", "gulp-uglify": "2.0.1", "gulp-util": "3.0.8", "inquirer": "3.0.1", diff --git a/src/api/service/github.ts b/src/api/service/github.ts index 1f3d5671a0..13ceb87bf2 100644 --- a/src/api/service/github.ts +++ b/src/api/service/github.ts @@ -23,6 +23,7 @@ module.exports = async (app: express.Application) => { app.post('/hooks/github', (req, res, next) => { if ((new Buffer(req.headers['x-hub-signature'])).equals(new Buffer('sha1=' + crypto.createHmac('sha1', config.github_bot.hook_secret).update(JSON.stringify(req.body)).digest('hex')))) { handler.emit(req.headers['x-github-event'], req.body); + res.sendStatus(200); } else { res.sendStatus(400); } |