summaryrefslogtreecommitdiff
path: root/src/remote
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2019-02-06 22:44:55 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-06 22:44:55 +0900
commit96bc17aa1014983d5e6bf8b4c05d898156995a0d (patch)
treefdf7c68bdbf3784988351004127db988d7c40c29 /src/remote
parentFix bug (diff)
downloadmisskey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.gz
misskey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.bz2
misskey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.zip
Check config on load (#4170)
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Diffstat (limited to 'src/remote')
-rw-r--r--src/remote/activitypub/resolver.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/remote/activitypub/resolver.ts b/src/remote/activitypub/resolver.ts
index 049e645e47..cae37cacd4 100644
--- a/src/remote/activitypub/resolver.ts
+++ b/src/remote/activitypub/resolver.ts
@@ -57,7 +57,7 @@ export default class Resolver {
const object = await request({
url: value,
- proxy: config.proxy,
+ proxy: config.proxy.getOrElse(null),
timeout: this.timeout,
headers: {
'User-Agent': config.user_agent,