From: hakabahitoyo Date: Fri, 16 Nov 2018 11:41:12 +0000 (+0900) Subject: better config X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=55abd8482ed604587ffa9f5f3f64d36d4d5aa296;p=akkoma better config --- diff --git a/config/config.exs b/config/config.exs index f222c1aa4..8ce443f9e 100644 --- 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 71f3d1be7..c62bab077 100644 --- 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