projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill @httpoison
[akkoma]
/
lib
/
pleroma
/
object
/
fetcher.ex
diff --git
a/lib/pleroma/object/fetcher.ex
b/lib/pleroma/object/fetcher.ex
index bb9388d4f905e802605da7d58e5bec28b8d008ad..ca980c62939f0ff25a4d1c5eea745fe2b86501bd 100644
(file)
--- a/
lib/pleroma/object/fetcher.ex
+++ b/
lib/pleroma/object/fetcher.ex
@@
-1,4
+1,5
@@
defmodule Pleroma.Object.Fetcher do
defmodule Pleroma.Object.Fetcher do
+ alias Pleroma.HTTP
alias Pleroma.Object
alias Pleroma.Object.Containment
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Object
alias Pleroma.Object.Containment
alias Pleroma.Web.ActivityPub.Transmogrifier
@@
-6,8
+7,6
@@
defmodule Pleroma.Object.Fetcher do
require Logger
require Logger
- @httpoison Application.get_env(:pleroma, :httpoison)
-
defp reinject_object(data) do
Logger.debug("Reinjecting object #{data["id"]}")
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 <-
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"}]
),
id,
[{:Accept, "application/activity+json"}]
),