better config reading

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

diff --git a/lib/pleroma/uploaders/mdii.ex b/lib/pleroma/uploaders/mdii.ex
index 3cf71df432b9467ff6c1eace327668228b3f3c18..b0c7e19e798fa90f2bacaef4480baf4747caf407 100644 (file)
--- a/lib/pleroma/uploaders/mdii.ex
+++ b/lib/pleroma/uploaders/mdii.ex
@@ -1,19 +1,25 @@
-defmodule Pleroma.Uploaders.Mdii do
+defmodule Pleroma.Uploaders.MDII do
+  alias Pleroma.Config
+
   @behaviour Pleroma.Uploaders.Uploader
 
+  @httpoison Application.get_env(:pleroma, :httpoison)
+
   def put_file(name, uuid, path, content_type, _should_dedupe) do
-    settings = Application.get_env(:pleroma, Pleroma.Uploaders.Mdii)
-    host_name = Keyword.fetch!(settings, :host_name)
+    cgi = Pleroma.Config.get([Pleroma.Uploaders.MDII, :cgi])
+    files = Pleroma.Config.get([Pleroma.Uploaders.MDII, :files])
 
     {:ok, file_data} = File.read(path)
 
     File.rm!(path)
 
-    remote_file_name = "00000"
-    extension = "png"
-
-    public_url = "https://#{host_name}/#{remote_file_name}.#{extension}"
+    extension = String.split(name, ".") |> List.last()
+    query = "#{cgi}?#{extension}"
 
-    {:ok, public_url}
+    with {:ok, %{status_code: 200, body: body}} <- @httpoison.post(query, file_data) do
+      remote_file_name = String.split(body) |> List.first()
+      public_url = "#{files}/#{remote_file_name}.#{extension}"
+      {:ok, public_url}
+    end
   end
 end