X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=dd680512548f622bea2dd58f816df0c856405206;hb=0a0c6bf3945d6da98d3e5a08205a9b4f24adb67f;hp=a8154859a7f81429eac2b293c2a32cd44f8a34f9;hpb=4a13b8488787773d09f67d1a436d5906e2f5b171;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index a8154859a..dd6805125 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
@@ -38,9 +58,24 @@ defmodule Pleroma.Activity do
     Repo.all(all_by_object_ap_id_q(ap_id))
   end
 
-  def get_create_activity_by_object_ap_id(ap_id) do
-    Repo.one(from activity in Activity,
-      where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ?", activity.data, activity.data, ^to_string(ap_id)),
-      where: fragment("(?)->>'type' = 'Create'", activity.data))
+  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
+        ),
+      where: fragment("(?)->>'type' = 'Create'", activity.data)
+    )
+  end
+
+  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()
   end
+
+  def get_create_activity_by_object_ap_id(_), do: nil
 end