nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Object.Fetcher: Handle error on Containment.contain_origin/2

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2019-07-14 12:02:16 +02:00
parent f00562ed6b
commit 40d0a198e2
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/object/fetcher.ex
View file

@ -38,6 +38,7 @@ def fetch_object_from_id(id, options \\ []) do
"type" => "Create", "type" => "Create",
"to" => data["to"], "to" => data["to"],
"cc" => data["cc"], "cc" => data["cc"],
# TODO: Should we seriously keep this attributedTo thing?
"actor" => data["actor"] || data["attributedTo"], "actor" => data["actor"] || data["attributedTo"],
"object" => data "object" => data
}, },
@ -56,6 +57,9 @@ def fetch_object_from_id(id, options \\ []) do
object = %Object{} -> object = %Object{} ->
{:ok, object} {:ok, object}
:error ->
{:error, "Object containment failed."}
_e -> _e ->
Logger.info("Couldn't get object via AP, trying out OStatus fetching...") Logger.info("Couldn't get object via AP, trying out OStatus fetching...")