projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add finch outbound proxy support (#158)
[akkoma]
/
lib
/
pleroma
/
http
/
adapter_helper
/
default.ex
diff --git
a/lib/pleroma/http/adapter_helper/default.ex
b/lib/pleroma/http/adapter_helper/default.ex
index 8567a616b6e8f7852925bf39c39c3c1722f06514..6305368718a33b7f805a4cc5285f996ddc3cc246 100644
(file)
--- a/
lib/pleroma/http/adapter_helper/default.ex
+++ b/
lib/pleroma/http/adapter_helper/default.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP.AdapterHelper.Default do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP.AdapterHelper.Default do
@@
-9,7
+9,7
@@
defmodule Pleroma.HTTP.AdapterHelper.Default do
@spec options(keyword(), URI.t()) :: keyword()
def options(opts, _uri) do
@spec options(keyword(), URI.t()) :: keyword()
def options(opts, _uri) do
- proxy = Pleroma.Config.get([:http, :proxy_url]
, nil
)
+ proxy = Pleroma.Config.get([:http, :proxy_url])
AdapterHelper.maybe_add_proxy(opts, AdapterHelper.format_proxy(proxy))
end
AdapterHelper.maybe_add_proxy(opts, AdapterHelper.format_proxy(proxy))
end