Resolve merge conflict

[akkoma] / lib / pleroma / uploaders / swift / swift.ex

diff --git a/lib/pleroma/uploaders/swift/swift.ex b/lib/pleroma/uploaders/swift/swift.ex
index 4f45255f127145a4c0de6ae03c7d20db45849844..2b0f2ad0408f4edb39fba2cd2cc94d180a1bdf37 100644 (file)
--- a/lib/pleroma/uploaders/swift/swift.ex
+++ b/lib/pleroma/uploaders/swift/swift.ex
@@ -1,11 +1,13 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 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
@@ -14,17 +16,14 @@ defmodule Pleroma.Uploaders.Swift.Client do
     token = Pleroma.Uploaders.Swift.Keystone.get_token()
 
     case put("#{filename}", body, "X-Auth-Token": token, "Content-Type": content_type) do
-      {:ok, %HTTPoison.Response{status_code: 201}} ->
-        # lgtm
-        ""
+      {:ok, %Tesla.Env{status: 201}} ->
+        {:ok, {:file, filename}}
 
-      {:ok, %HTTPoison.Response{status_code: 401}} ->
-        # bad token
-        ""
+      {:ok, %Tesla.Env{status: 401}} ->
+        {:error, "Unauthorized, Bad Token"}
 
       {:error, _} ->
-        # bad news
-        ""
+        {:error, "Swift Upload Error"}
     end
   end
 end