diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 19:55:58 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 19:55:58 +0700 |
| commit | 8b4397c704147bcc5ca12ab60dde32f2b6e11a41 (patch) | |
| tree | f1d26585be6673b495d3f4b8bea4deb5f0283d42 /lib/pleroma/uploaders/swift/swift.ex | |
| parent | 04a48286e69704bf83429b85dbcdb70863bdcff1 (diff) | |
| parent | 52ce368562de919f1806dfd5235642caf0666e16 (diff) | |
| download | pleroma-8b4397c704147bcc5ca12ab60dde32f2b6e11a41.tar.gz | |
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
Diffstat (limited to 'lib/pleroma/uploaders/swift/swift.ex')
| -rw-r--r-- | lib/pleroma/uploaders/swift/swift.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/uploaders/swift/swift.ex b/lib/pleroma/uploaders/swift/swift.ex index 819dfebda..fa08ca966 100644 --- a/lib/pleroma/uploaders/swift/swift.ex +++ b/lib/pleroma/uploaders/swift/swift.ex @@ -1,17 +1,15 @@ defmodule Pleroma.Uploaders.Swift.Client do use HTTPoison.Base - @settings Application.get_env(:pleroma, Pleroma.Uploaders.Swift) - def process_url(url) do Enum.join( - [Keyword.fetch!(@settings, :storage_url), url], + [Pleroma.Config.get!([Pleroma.Uploaders.Swift, :storage_url]), url], "/" ) end def upload_file(filename, body, content_type) do - object_url = Keyword.fetch!(@settings, :object_url) + object_url = Pleroma.Config.get!([Pleroma.Uploaders.Swift, :object_url]) token = Pleroma.Uploaders.Swift.Keystone.get_token() case put("#{filename}", body, "X-Auth-Token": token, "Content-Type": content_type) do |