summaryrefslogtreecommitdiff
path: root/src/api/server.ts
diff options
context:
space:
mode:
authorこぴなたみぽ <Syuilotan@yahoo.co.jp>2017-11-06 19:08:29 +0900
committerGitHub <noreply@github.com>2017-11-06 19:08:29 +0900
commit734e73ddb67a7af37900e20d51729a80b34d4aa0 (patch)
tree0f6db1884ee9461b5769c26274a3fee513d06654 /src/api/server.ts
parentchore(package): update @types/bcryptjs to version 2.4.1 (diff)
parentMerge pull request #852 from syuilo/greenkeeper/@types/mocha-2.2.44 (diff)
downloadmisskey-734e73ddb67a7af37900e20d51729a80b34d4aa0.tar.gz
misskey-734e73ddb67a7af37900e20d51729a80b34d4aa0.tar.bz2
misskey-734e73ddb67a7af37900e20d51729a80b34d4aa0.zip
Merge branch 'master' into greenkeeper/@types/bcryptjs-2.4.1
Diffstat (limited to 'src/api/server.ts')
-rw-r--r--src/api/server.ts9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/api/server.ts b/src/api/server.ts
index c98167eb3e..3de32d9eab 100644
--- a/src/api/server.ts
+++ b/src/api/server.ts
@@ -19,7 +19,12 @@ app.disable('x-powered-by');
app.set('etag', false);
app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json({
- type: ['application/json', 'text/plain']
+ type: ['application/json', 'text/plain'],
+ verify: (req, res, buf, encoding) => {
+ if (buf && buf.length) {
+ (req as any).rawBody = buf.toString(encoding || 'utf8');
+ }
+ }
}));
app.use(cors({
origin: true
@@ -54,4 +59,6 @@ app.use((req, res, next) => {
require('./service/github')(app);
require('./service/twitter')(app);
+require('./bot/interfaces/line')(app);
+
module.exports = app;