diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-07-02 10:17:51 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-07-02 10:17:51 +0000 |
| commit | 4c044f62258b33a95b8281e1eb42a5e0ce47d42d (patch) | |
| tree | b8bc7c42d007ff563793bb61189e2bb796f946a9 /lib/pleroma/web/activity_pub | |
| parent | b0439df1b529301c8f07097bedb1cba2602a4143 (diff) | |
| parent | ce92e6e5ce24a68bedd744c01cc1a99f01c4fa91 (diff) | |
| download | pleroma-4c044f62258b33a95b8281e1eb42a5e0ce47d42d.tar.gz | |
Merge branch 'fetcher-fixes' into 'develop'
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
Diffstat (limited to 'lib/pleroma/web/activity_pub')
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 278fbbeab..bc6fc4bd8 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -446,12 +446,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do when objtype in ["Article", "Event", "Note", "Video", "Page", "Question", "Answer", "Audio"] do actor = Containment.get_actor(data) - data = - Map.put(data, "actor", actor) - |> fix_addressing - with nil <- Activity.get_create_by_object_ap_id(object["id"]), - {:ok, %User{} = user} <- User.get_or_fetch_by_ap_id(data["actor"]) do + {:ok, %User{} = user} <- User.get_or_fetch_by_ap_id(actor), + data <- Map.put(data, "actor", actor) |> fix_addressing() do object = fix_object(object, options) params = %{ |