mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
Object.Fetcher: Fallback to OStatus only if AP actually fails
This commit is contained in:
parent
40d0a198e2
commit
e1c08a67d6
1 changed files with 36 additions and 26 deletions
|
@ -31,14 +31,15 @@ defmodule Pleroma.Object.Fetcher do
|
|||
{:ok, object}
|
||||
else
|
||||
Logger.info("Fetching #{id} via AP")
|
||||
{status, data} = fetch_and_contain_remote_object_from_id(id)
|
||||
object = Object.normalize(data, false)
|
||||
|
||||
with {:ok, data} <- fetch_and_contain_remote_object_from_id(id),
|
||||
nil <- Object.normalize(data, false),
|
||||
params <- %{
|
||||
if status == :ok and object == nil do
|
||||
with params <- %{
|
||||
"type" => "Create",
|
||||
"to" => data["to"],
|
||||
"cc" => data["cc"],
|
||||
# TODO: Should we seriously keep this attributedTo thing?
|
||||
# Should we seriously keep this attributedTo thing?
|
||||
"actor" => data["actor"] || data["attributedTo"],
|
||||
"object" => data
|
||||
},
|
||||
|
@ -60,9 +61,17 @@ defmodule Pleroma.Object.Fetcher do
|
|||
:error ->
|
||||
{:error, "Object containment failed."}
|
||||
|
||||
_e ->
|
||||
e ->
|
||||
e
|
||||
end
|
||||
else
|
||||
if status == :ok and object != nil do
|
||||
{:ok, object}
|
||||
else
|
||||
# Only fallback when receiving a fetch/normalization error with ActivityPub
|
||||
Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
|
||||
|
||||
# FIXME: OStatus Object Containment?
|
||||
case OStatus.fetch_activity_from_url(id) do
|
||||
{:ok, [activity | _]} -> {:ok, Object.normalize(activity, false)}
|
||||
e -> e
|
||||
|
@ -70,6 +79,7 @@ defmodule Pleroma.Object.Fetcher do
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def fetch_object_from_id!(id, options \\ []) do
|
||||
with {:ok, object} <- fetch_object_from_id(id, options) do
|
||||
|
|
Loading…
Reference in a new issue