hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More logging.

Browse source
This commit is contained in:
lain 2018-02-23 15:00:19 +01:00
commit 2583a9f6e8
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -288,6 +288,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
}
{:ok, user_data}
else
e -> Logger.error("Could not user at fetch #{ap_id}, #{inspect(e)}")
end
end
@ -353,12 +355,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
{:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
else
object = %Object{} -> {:ok, object}
e ->
Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
case OStatus.fetch_activity_from_url(id) do
{:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
_ -> e
end
e ->
Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
case OStatus.fetch_activity_from_url(id) do
{:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
e -> e
end
end
end
end