Merge branch 'develop' into feature/compat/push-subscriptions

[akkoma] / lib / pleroma / activity.ex

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index dd680512548f622bea2dd58f816df0c856405206..c065f3b6ce690a688ead5a087135f46e44f13ba8 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -78,4 +78,14 @@ defmodule Pleroma.Activity do
   end
 
   def get_create_activity_by_object_ap_id(_), do: nil
+
+  def normalize(obj) when is_map(obj), do: Activity.get_by_ap_id(obj["id"])
+  def normalize(ap_id) when is_binary(ap_id), do: Activity.get_by_ap_id(ap_id)
+  def normalize(_), do: nil
+
+  def get_in_reply_to_activity(%Activity{data: %{"object" => %{"inReplyTo" => ap_id}}}) do
+    get_create_activity_by_object_ap_id(ap_id)
+  end
+
+  def get_in_reply_to_activity(_), do: nil
 end