aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/uploaders
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-05-26 13:33:11 +0000
committerlambda <lain@soykaf.club>2019-05-26 13:33:11 +0000
commit5bb843ceece57cd88e8615b4a4519d2b40309295 (patch)
tree02518ca75e71aabf6eeb47f7ac59bdc10fb265ba /lib/pleroma/uploaders
parentd66cf4b2c4968c52aa1a9e5aa0abff571e336b96 (diff)
parent56fd7dbdd7e3f1a0bb05430ed4805d8715e54935 (diff)
downloadpleroma-5bb843ceece57cd88e8615b4a4519d2b40309295.tar.gz
Merge branch 'refactor/die-httpoison-die' into 'develop'
remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203
Diffstat (limited to 'lib/pleroma/uploaders')
-rw-r--r--lib/pleroma/uploaders/mdii.ex5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/uploaders/mdii.ex b/lib/pleroma/uploaders/mdii.ex
index 190ed9f3a..237544337 100644
--- a/lib/pleroma/uploaders/mdii.ex
+++ b/lib/pleroma/uploaders/mdii.ex
@@ -4,11 +4,10 @@
defmodule Pleroma.Uploaders.MDII do
alias Pleroma.Config
+ alias Pleroma.HTTP
@behaviour Pleroma.Uploaders.Uploader
- @httpoison Application.get_env(:pleroma, :httpoison)
-
# MDII-hosted images are never passed through the MediaPlug; only local media.
# Delegate to Pleroma.Uploaders.Local
def get_file(file) do
@@ -25,7 +24,7 @@ defmodule Pleroma.Uploaders.MDII do
query = "#{cgi}?#{extension}"
with {:ok, %{status: 200, body: body}} <-
- @httpoison.post(query, file_data, [], adapter: [pool: :default]) do
+ 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}}