diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-10-11 15:50:27 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-10-11 15:50:27 +0900 |
| commit | 1117ce4b5473f0c5b8470c5c35cf9154d9d2fe31 (patch) | |
| tree | dde7481838de6672981f44ce568919c3f37eee56 /src/server/api | |
| parent | fix(package): update @types/node to version 10.11.7 (#2885) (diff) | |
| download | sharkey-1117ce4b5473f0c5b8470c5c35cf9154d9d2fe31.tar.gz sharkey-1117ce4b5473f0c5b8470c5c35cf9154d9d2fe31.tar.bz2 sharkey-1117ce4b5473f0c5b8470c5c35cf9154d9d2fe31.zip | |
Redisをオプションにしたり
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/limitter.ts | 6 | ||||
| -rw-r--r-- | src/server/api/service/twitter.ts | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/server/api/limitter.ts b/src/server/api/limitter.ts index 20a18a7098..abf7627ab8 100644 --- a/src/server/api/limitter.ts +++ b/src/server/api/limitter.ts @@ -8,6 +8,12 @@ import { IUser } from '../../models/user'; const log = debug('misskey:limitter'); export default (endpoint: IEndpoint, user: IUser) => new Promise((ok, reject) => { + // Redisがインストールされてない場合は常に許可 + if (limiterDB == null) { + ok(); + return; + } + const limitation = endpoint.meta.limit; const key = limitation.hasOwnProperty('key') diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts index f71e588628..6c3cdaa138 100644 --- a/src/server/api/service/twitter.ts +++ b/src/server/api/service/twitter.ts @@ -55,7 +55,7 @@ router.get('/disconnect/twitter', async ctx => { })); }); -if (config.twitter == null) { +if (config.twitter == null || redis == null) { router.get('/connect/twitter', ctx => { ctx.body = '現在Twitterへ接続できません (このインスタンスではTwitterはサポートされていません)'; }); |