Merge remote-tracking branch 'upstream/develop' into admin-create-users

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

diff --git a/lib/pleroma/uploaders/mdii.ex b/lib/pleroma/uploaders/mdii.ex
index c5deaf73f744638d2ddff71a50678a672f4f5790..23754433773fcc27b84759fea82b724c2794b066 100644 (file)
--- a/lib/pleroma/uploaders/mdii.ex
+++ b/lib/pleroma/uploaders/mdii.ex
@@ -1,23 +1,35 @@
-defmodule Pleroma.Uploaders.Mdii do
-  @behaviour Pleroma.Uploaders.Uploader
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Uploaders.MDII do
+  alias Pleroma.Config
+  alias Pleroma.HTTP
 
-  @httpoison Application.get_env(:pleroma, :httpoison)
+  @behaviour Pleroma.Uploaders.Uploader
 
-  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)
+  # MDII-hosted images are never passed through the MediaPlug; only local media.
+  # Delegate to Pleroma.Uploaders.Local
+  def get_file(file) do
+    Pleroma.Uploaders.Local.get_file(file)
+  end
 
-    {:ok, file_data} = File.read(path)
+  def put_file(upload) do
+    cgi = Config.get([Pleroma.Uploaders.MDII, :cgi])
+    files = Config.get([Pleroma.Uploaders.MDII, :files])
 
-    File.rm!(path)
+    {:ok, file_data} = File.read(upload.tempfile)
 
-    extension = Regex.replace(~r/^image\//, content_type, "")
-    query = "https://#{host_name}/mdii.cgi?#{extension}"
+    extension = String.split(upload.name, ".") |> List.last()
+    query = "#{cgi}?#{extension}"
 
-    with {:ok, %{status_code: 200, body: body}} <- @httpoison.post(query, file_data) do
-      remote_file_name = body
-      public_url = "https://#{host_name}/#{remote_file_name}.#{extension}"
-      {:ok, public_url}
+    with {:ok, %{status: 200, body: body}} <-
+           HTTP.post(query, file_data, [], adapter: [pool: :default]) do
+      remote_file_name = String.split(body) |> List.first()
+      public_url = "#{files}/#{remote_file_name}.#{extension}"
+      {:ok, {:url, public_url}}
+    else
+      _ -> Pleroma.Uploaders.Local.put_file(upload)
     end
   end
 end