|
|
@ -297,7 +297,8 @@ defmodule Pleroma.Web.OStatus do
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def fetch_activity_from_atom_url(url) do
|
|
|
|
def fetch_activity_from_atom_url(url) do
|
|
|
|
with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(url, [Accept: "application/atom+xml"], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
|
|
|
|
with true <- String.starts_with?(url, "http"),
|
|
|
|
|
|
|
|
{:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(url, [Accept: "application/atom+xml"], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
|
|
|
|
Logger.debug("Got document from #{url}, handling...")
|
|
|
|
Logger.debug("Got document from #{url}, handling...")
|
|
|
|
handle_incoming(body)
|
|
|
|
handle_incoming(body)
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -309,7 +310,8 @@ defmodule Pleroma.Web.OStatus do
|
|
|
|
|
|
|
|
|
|
|
|
def fetch_activity_from_html_url(url) do
|
|
|
|
def fetch_activity_from_html_url(url) do
|
|
|
|
Logger.debug("Trying to fetch #{url}")
|
|
|
|
Logger.debug("Trying to fetch #{url}")
|
|
|
|
with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
|
|
|
|
with true <- String.starts_with?(url, "http"),
|
|
|
|
|
|
|
|
{:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
|
|
|
|
{:ok, atom_url} <- get_atom_url(body) do
|
|
|
|
{:ok, atom_url} <- get_atom_url(body) do
|
|
|
|
fetch_activity_from_atom_url(atom_url)
|
|
|
|
fetch_activity_from_atom_url(atom_url)
|
|
|
|
else
|
|
|
|
else
|
|
|
|