Merge branch 'release/2.2.1' into 'stable'v2.2.1

Release/2.2.1

See merge request pleroma/pleroma!3214

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 17af04257..1dc777e3b 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -343,4 +343,15 @@ defmodule Pleroma.Activity do
     actor = user_actor(activity)
     activity.id in actor.pinned_activities
   end
+
+  @spec get_by_object_ap_id_with_object(String.t()) :: t() | nil
+  def get_by_object_ap_id_with_object(ap_id) when is_binary(ap_id) do
+    ap_id
+    |> Queries.by_object_id()
+    |> with_preloaded_object()
+    |> first()
+    |> Repo.one()
+  end
+
+  def get_by_object_ap_id_with_object(_), do: nil
 end