diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-30 18:15:44 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-30 18:15:44 +0000 |
| commit | ca24ad2a2babed0700a38effb74910008d58f6ea (patch) | |
| tree | 13430c7b870e3dcc7cb32c299cbde6ca8d6ef362 /lib/pleroma/uploaders/swift/swift.ex | |
| parent | e99bab8f279b419a6b54efa2f5397a78970c10ee (diff) | |
| parent | 8e0e20631c378a5008f0f0b4aba9deb994ea6c6c (diff) | |
| download | pleroma-ca24ad2a2babed0700a38effb74910008d58f6ea.tar.gz | |
Merge branch 'feature/reverse-proxy' into 'develop'
reverse proxy / uploads
See merge request pleroma/pleroma!470
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"} |