diff options
| author | lain <lain@soykaf.club> | 2018-12-01 09:55:46 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-12-01 09:55:46 +0100 |
| commit | c443c9bd72b04b8a24d904bc20fde0d4ffca71d7 (patch) | |
| tree | 1044379e9e6867ded303f81a6ca49da83e01cfd2 /lib/pleroma/uploaders/swift/swift.ex | |
| parent | 1c67277c8031be2212d6faf84c143ac11462c87b (diff) | |
| parent | 8c3ff06e35e11a40cf4eb35a41a2019b7496e62c (diff) | |
| download | pleroma-c443c9bd72b04b8a24d904bc20fde0d4ffca71d7.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
Diffstat (limited to 'lib/pleroma/uploaders/swift/swift.ex')
| -rw-r--r-- | lib/pleroma/uploaders/swift/swift.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/uploaders/swift/swift.ex b/lib/pleroma/uploaders/swift/swift.ex index fa08ca966..1e865f101 100644 --- a/lib/pleroma/uploaders/swift/swift.ex +++ b/lib/pleroma/uploaders/swift/swift.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Uploaders.Swift.Client do case put("#{filename}", body, "X-Auth-Token": token, "Content-Type": content_type) do {:ok, %HTTPoison.Response{status_code: 201}} -> - {:ok, "#{object_url}/#{filename}"} + {:ok, {:file, filename}} {:ok, %HTTPoison.Response{status_code: 401}} -> {:error, "Unauthorized, Bad Token"} |