diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2017-04-14 20:45:37 +0900 |
|---|---|---|
| committer | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2017-04-14 20:45:37 +0900 |
| commit | b095efaee59572800244b34564692fd999cc4ded (patch) | |
| tree | 89a2a1401b2af797bb687d0d79cfb5e9e52d987e /src/api/service | |
| parent | Fix tslint.json (diff) | |
| download | sharkey-b095efaee59572800244b34564692fd999cc4ded.tar.gz sharkey-b095efaee59572800244b34564692fd999cc4ded.tar.bz2 sharkey-b095efaee59572800244b34564692fd999cc4ded.zip | |
Migrate to tslint 5.1.0
Diffstat (limited to 'src/api/service')
| -rw-r--r-- | src/api/service/github.ts | 4 | ||||
| -rw-r--r-- | src/api/service/twitter.ts | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/api/service/github.ts b/src/api/service/github.ts index 68bc03bd5f..0d6e663419 100644 --- a/src/api/service/github.ts +++ b/src/api/service/github.ts @@ -22,7 +22,7 @@ module.exports = async (app: express.Application) => { const handler = new EventEmitter(); 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')))) { + 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 { @@ -40,7 +40,7 @@ module.exports = async (app: express.Application) => { // Fetch parent status request({ - url: parent.url + '/statuses', + url: `${parent.url}/statuses`, headers: { 'User-Agent': 'misskey' } diff --git a/src/api/service/twitter.ts b/src/api/service/twitter.ts index 160956cf92..9fb274aacb 100644 --- a/src/api/service/twitter.ts +++ b/src/api/service/twitter.ts @@ -1,6 +1,6 @@ import * as express from 'express'; -//import * as Twitter from 'twitter'; -//const Twitter = require('twitter'); +// import * as Twitter from 'twitter'; +// const Twitter = require('twitter'); import autwh from 'autwh'; import redis from '../../db/redis'; import User from '../models/user'; @@ -14,10 +14,10 @@ module.exports = (app: express.Application) => { const user = await User.findOneAndUpdate({ token: res.locals.user }, { - $set: { - twitter: null - } - }); + $set: { + twitter: null + } + }); res.send(`Twitterの連携を解除しました :v:`); @@ -38,7 +38,7 @@ module.exports = (app: express.Application) => { const twAuth = autwh({ consumerKey: config.twitter.consumer_key, consumerSecret: config.twitter.consumer_secret, - callbackUrl: config.api_url + '/tw/cb' + callbackUrl: `${config.api_url}/tw/cb` }); app.get('/connect/twitter', async (req, res): Promise<any> => { @@ -56,15 +56,15 @@ module.exports = (app: express.Application) => { const user = await User.findOneAndUpdate({ token: res.locals.user }, { - $set: { - twitter: { - access_token: result.accessToken, - access_token_secret: result.accessTokenSecret, - user_id: result.userId, - screen_name: result.screenName + $set: { + twitter: { + access_token: result.accessToken, + access_token_secret: result.accessTokenSecret, + user_id: result.userId, + screen_name: result.screenName + } } - } - }); + }); res.send(`Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました!`); |