X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=bed96861f893043f8651401fb6cc268aa91c2d5a;hb=f5b056e3ce0d160427025e46f405d6d277c2970b;hp=96ddcc480866835e6a186ddde84fa2e7345f63b9;hpb=37e5014d3ee571622d324cdadfc2bf7c345cc1fc;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 96ddcc480..bed96861f 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -4,33 +4,53 @@ defmodule Pleroma.Activity do
   import Ecto.Query
 
   schema "activities" do
-    field :data, :map
-    field :local, :boolean, default: true
-    field :actor, :string
-    field :recipients, {:array, :string}
-    has_many :notifications, Notification, on_delete: :delete_all
+    field(:data, :map)
+    field(:local, :boolean, default: true)
+    field(:actor, :string)
+    field(:recipients, {:array, :string})
+    has_many(:notifications, Notification, on_delete: :delete_all)
 
     timestamps()
   end
 
   def get_by_ap_id(ap_id) do
-    Repo.one(from activity in Activity,
-      where: fragment("(?)->>'id' = ?", activity.data, ^to_string(ap_id)))
+    Repo.one(
+      from(
+        activity in Activity,
+        where: fragment("(?)->>'id' = ?", activity.data, ^to_string(ap_id))
+      )
+    )
   end
 
   # TODO:
   # Go through these and fix them everywhere.
   # Wrong name, only returns create activities
   def all_by_object_ap_id_q(ap_id) do
-    from activity in Activity,
-      where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ?", activity.data, activity.data, ^to_string(ap_id)),
+    from(
+      activity in Activity,
+      where:
+        fragment(
+          "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
+          activity.data,
+          activity.data,
+          ^to_string(ap_id)
+        ),
       where: fragment("(?)->>'type' = 'Create'", activity.data)
+    )
   end
 
   # Wrong name, returns all.
   def all_non_create_by_object_ap_id_q(ap_id) do
-    from activity in Activity,
-      where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ?", activity.data, activity.data, ^to_string(ap_id))
+    from(
+      activity in Activity,
+      where:
+        fragment(
+          "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
+          activity.data,
+          activity.data,
+          ^to_string(ap_id)
+        )
+    )
   end
 
   # Wrong name plz fix thx
@@ -39,13 +59,27 @@ defmodule Pleroma.Activity do
   end
 
   def create_activity_by_object_id_query(ap_ids) do
-    from activity in Activity,
-      where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)", activity.data, activity.data, ^ap_ids),
+    from(
+      activity in Activity,
+      where:
+        fragment(
+          "coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)",
+          activity.data,
+          activity.data,
+          ^ap_ids
+        ),
       where: fragment("(?)->>'type' = 'Create'", activity.data)
+    )
   end
 
-  def get_create_activity_by_object_ap_id(ap_id) do
+  def get_create_activity_by_object_ap_id(ap_id) when is_binary(ap_id) do
     create_activity_by_object_id_query([ap_id])
-    |> Repo.one
+    |> Repo.one()
   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
 end