Reduce OP fetching queries.

[akkoma] / lib / pleroma / activity.ex

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index f43b32b565a502c8338b2d9a655577fc906b1a2b..96ddcc480866835e6a186ddde84fa2e7345f63b9 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -6,7 +6,9 @@ defmodule Pleroma.Activity do
   schema "activities" do
     field :data, :map
     field :local, :boolean, default: true
-    has_many :notifications, Notification
+    field :actor, :string
+    field :recipients, {:array, :string}
+    has_many :notifications, Notification, on_delete: :delete_all
 
     timestamps()
   end
@@ -36,9 +38,14 @@ defmodule Pleroma.Activity do
     Repo.all(all_by_object_ap_id_q(ap_id))
   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),
+      where: fragment("(?)->>'type' = 'Create'", activity.data)
+  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))
+    create_activity_by_object_id_query([ap_id])
+    |> Repo.one
   end
 end