X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=cdfe7ea9e482c9a36b332ce312801af7615a352b;hb=c2e0a0c8d44f8697160d4597db45c5c4afd0d8a6;hp=d907791b57f4fda10529ea0597db39edff73a5c2;hpb=28d77e373cbaf0908f86973a873c9bfd6c3221cb;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index d907791b5..cdfe7ea9e 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -4,7 +4,11 @@
 
 defmodule Pleroma.Activity do
   use Ecto.Schema
-  alias Pleroma.{Repo, Activity, Notification}
+
+  alias Pleroma.Repo
+  alias Pleroma.Activity
+  alias Pleroma.Notification
+
   import Ecto.Query
 
   @type t :: %__MODULE__{}
@@ -41,10 +45,7 @@ defmodule Pleroma.Activity do
     Repo.get(Activity, 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
+  def by_object_ap_id(ap_id) do
     from(
       activity in Activity,
       where:
@@ -53,57 +54,55 @@ defmodule Pleroma.Activity do
           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
+  def create_by_object_ap_id(ap_ids) when is_list(ap_ids) do
     from(
       activity in Activity,
       where:
         fragment(
-          "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
+          "coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)",
           activity.data,
           activity.data,
-          ^to_string(ap_id)
-        )
+          ^ap_ids
+        ),
+      where: fragment("(?)->>'type' = 'Create'", activity.data)
     )
   end
 
-  # Wrong name plz fix thx
-  def all_by_object_ap_id(ap_id) do
-    Repo.all(all_by_object_ap_id_q(ap_id))
-  end
-
-  def create_activity_by_object_id_query(ap_ids) do
+  def create_by_object_ap_id(ap_id) do
     from(
       activity in Activity,
       where:
         fragment(
-          "coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)",
+          "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
           activity.data,
           activity.data,
-          ^ap_ids
+          ^to_string(ap_id)
         ),
       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])
+  def get_all_create_by_object_ap_id(ap_id) do
+    Repo.all(create_by_object_ap_id(ap_id))
+  end
+
+  def get_create_by_object_ap_id(ap_id) when is_binary(ap_id) do
+    create_by_object_ap_id(ap_id)
     |> Repo.one()
   end
 
-  def get_create_activity_by_object_ap_id(_), do: nil
+  def get_create_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)
+    get_create_by_object_ap_id(ap_id)
   end
 
   def get_in_reply_to_activity(_), do: nil