aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/object
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-05-25 04:24:21 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-05-25 04:24:21 +0000
commit9bec891eb4d5d06e6bd84dd2c95259d2c1a4f563 (patch)
tree30812644e54583532e71dd69bd1d5eb2478713a9 /lib/pleroma/object
parent9f44fa068648929aff639ecd5fd74e9c643803b5 (diff)
downloadpleroma-9bec891eb4d5d06e6bd84dd2c95259d2c1a4f563.tar.gz
kill @httpoison
Diffstat (limited to 'lib/pleroma/object')
-rw-r--r--lib/pleroma/object/fetcher.ex5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index bb9388d4f..ca980c629 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -1,4 +1,5 @@
defmodule Pleroma.Object.Fetcher do
+ alias Pleroma.HTTP
alias Pleroma.Object
alias Pleroma.Object.Containment
alias Pleroma.Web.ActivityPub.Transmogrifier
@@ -6,8 +7,6 @@ defmodule Pleroma.Object.Fetcher do
require Logger
- @httpoison Application.get_env(:pleroma, :httpoison)
-
defp reinject_object(data) do
Logger.debug("Reinjecting object #{data["id"]}")
@@ -78,7 +77,7 @@ defmodule Pleroma.Object.Fetcher do
with true <- String.starts_with?(id, "http"),
{:ok, %{body: body, status: code}} when code in 200..299 <-
- @httpoison.get(
+ HTTP.get(
id,
[{:Accept, "application/activity+json"}]
),