better config

diff --git a/config/config.exs b/config/config.exs
index f222c1aa4dd0093d8f536be1790199b85feaaef2..8ce443f9e1a919ab6366e4db21d494fce58292b1 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -23,7 +23,9 @@ config :pleroma, Pleroma.Uploaders.S3,
   public_endpoint: "https://s3.amazonaws.com",
   force_media_proxy: false
 
-config :pleroma, Pleroma.Uploaders.Mdii, host_name: "mdii.sakura.ne.jp"
+config :pleroma, Pleroma.Uploaders.Mdii,
+  cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
+  files: "https://mdii.sakura.ne.jp"
 
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 

diff --git a/lib/pleroma/uploaders/mdii.ex b/lib/pleroma/uploaders/mdii.ex
index 71f3d1be7a56ebb6850cec843cf8a8c1bbf301f3..c62bab07768493b1104b5141f32f231b6ce26248 100644 (file)
--- a/lib/pleroma/uploaders/mdii.ex
+++ b/lib/pleroma/uploaders/mdii.ex
@@ -5,18 +5,19 @@ defmodule Pleroma.Uploaders.Mdii do
 
   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 = Keyword.fetch!(settings, :cgi)
+    files = Keyword.fetch!(settings, :files)
 
     {:ok, file_data} = File.read(path)
 
     File.rm!(path)
 
     extension = String.split(name, ".") |> List.last()
-    query = "https://#{host_name}/mdii-post.cgi?#{extension}"
+    query = "#{cgi}?#{extension}"
 
     with {:ok, %{status_code: 200, body: body}} <- @httpoison.post(query, file_data) do
       remote_file_name = String.split(body) |> List.first()
-      public_url = "https://#{host_name}/#{remote_file_name}.#{extension}"
+      public_url = "#{files}/#{remote_file_name}.#{extension}"
       {:ok, public_url}
     end
   end