summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/limitter.ts6
-rw-r--r--src/server/api/service/twitter.ts2
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はサポートされていません)';
});