X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=a8154859a7f81429eac2b293c2a32cd44f8a34f9;hb=312a8783f8dbf563ea9d5af3cc7991ca553dc286;hp=d77c8899749a7dd16e568829e3a77340392afa31;hpb=b403ea4d2b69cef4434ad68babdfb402d8227847;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index d77c88997..a8154859a 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -1,27 +1,46 @@
 defmodule Pleroma.Activity do
   use Ecto.Schema
-  alias Pleroma.{Repo, Activity}
+  alias Pleroma.{Repo, Activity, Notification}
   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
 
     timestamps()
   end
 
   def get_by_ap_id(ap_id) do
     Repo.one(from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{id: ap_id}))
+      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)),
+      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))
+  end
+
+  # Wrong name plz fix thx
   def all_by_object_ap_id(ap_id) do
-    Repo.all(from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{object: %{id: ap_id}}))
+    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("? @> ?", activity.data, ^%{type: "Create", object: %{id: ap_id}}))
+      where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ?", activity.data, activity.data, ^to_string(ap_id)),
+      where: fragment("(?)->>'type' = 'Create'", activity.data))
   end
 end