From 698cb3587cf66f4946c2baab69ecd45f339e1392 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Thu, 15 Nov 2018 14:38:45 +0900 Subject: [PATCH] omplement mdii uploader --- lib/pleroma/uploaders/mdii.ex | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/pleroma/uploaders/mdii.ex b/lib/pleroma/uploaders/mdii.ex index 3cf71df43..f21a7e1e2 100644 --- a/lib/pleroma/uploaders/mdii.ex +++ b/lib/pleroma/uploaders/mdii.ex @@ -1,6 +1,8 @@ defmodule Pleroma.Uploaders.Mdii do @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) @@ -8,12 +10,15 @@ defmodule Pleroma.Uploaders.Mdii do {:ok, file_data} = File.read(path) File.rm!(path) + + extension = Regex.replace(~r/^image\//, content_type, "") + query = "https://#{host_name}/mdii.cgi?#{extension}" - remote_file_name = "00000" - extension = "png" - - public_url = "https://#{host_name}/#{remote_file_name}.#{extension}" - - {:ok, public_url} + with {:ok, %{status_code: 200, body: body}} <- + @httpoison.get(url, file_data) do + remote_file_name = body + public_url = "https://#{host_name}/#{remote_file_name}.#{extension}" + {:ok, public_url} + end end end -- 2.45.2