diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-07-14 12:02:16 +0200 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-07-14 14:58:47 +0200 |
| commit | 40d0a198e20d577b51339f4026d672b1aa968be1 (patch) | |
| tree | 2ac7f57804789aa4df62109d805ab8749be487e7 | |
| parent | f00562ed6bef980bc14038b15078d3427876f7db (diff) | |
| download | pleroma-40d0a198e20d577b51339f4026d672b1aa968be1.tar.gz | |
Object.Fetcher: Handle error on Containment.contain_origin/2
| -rw-r--r-- | lib/pleroma/object/fetcher.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index 101c21f96..82250ab8d 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -38,6 +38,7 @@ defmodule Pleroma.Object.Fetcher do "type" => "Create", "to" => data["to"], "cc" => data["cc"], + # TODO: Should we seriously keep this attributedTo thing? "actor" => data["actor"] || data["attributedTo"], "object" => data }, @@ -56,6 +57,9 @@ defmodule Pleroma.Object.Fetcher do object = %Object{} -> {:ok, object} + :error -> + {:error, "Object containment failed."} + _e -> Logger.info("Couldn't get object via AP, trying out OStatus fetching...") |