diff options
| -rw-r--r-- | lib/pleroma/object.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index ff2af4a6f..1bcff5a7b 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -27,6 +27,10 @@ defmodule Pleroma.Object do Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id))) end + def normalize(obj) when is_map(obj), do: Object.get_by_ap_id(obj["id"]) + def normalize(ap_id) when is_binary(ap_id), do: Object.get_by_ap_id(ap_id) + def normalize(_), do: nil + def get_cached_by_ap_id(ap_id) do if Mix.env() == :test do get_by_ap_id(ap_id) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 856f27e10..d68aef52a 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -458,7 +458,7 @@ defmodule Pleroma.User do end def get_notified_from_activity(%Activity{recipients: to, data: %{"type" => "Announce"} = data}) do - object = Object.get_by_ap_id(data["object"]) + object = Object.normalize(data["object"]) # ensure that the actor who published the announced object appears only once to = |