summaryrefslogtreecommitdiff
path: root/src/remote
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-02-07 21:02:33 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-02-07 21:02:33 +0900
commit5448c22031d66cc020323bf4c4d1701889a46485 (patch)
treee14772d48d982c6a7d9cebeed497c16373e2e303 /src/remote
parentFix #4179 (diff)
downloadmisskey-5448c22031d66cc020323bf4c4d1701889a46485.tar.gz
misskey-5448c22031d66cc020323bf4c4d1701889a46485.tar.bz2
misskey-5448c22031d66cc020323bf4c4d1701889a46485.zip
Revert 96bc17aa1014983d5e6bf8b4c05d898156995a0d
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 cae37cacd4..049e645e47 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.getOrElse(null),
+ proxy: config.proxy,
timeout: this.timeout,
headers: {
'User-Agent': config.user_agent,