summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
index 97ea67002..a458bed31 100644
--- a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
+++ b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
@@ -41,13 +41,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent do
mention_users =
to
- |> Enum.map(fn ap_id_or_uri ->
- case User.get_or_fetch_by_ap_id(ap_id_or_uri) do
- {:ok, user} -> {ap_id_or_uri, user}
- _ -> {ap_id_or_uri, User.get_by_uri(ap_id_or_uri)}
- end
- end)
- |> Enum.reject(fn {_, user} -> user == nil end)
+ |> Enum.map(& {&1, User.get_cached_by_ap_id(&1)})
+ |> Enum.reject(fn {_, user} -> is_nil(user) end)
|> Enum.into(%{})
explicitly_mentioned_uris = extract_mention_uris_from_content(content)