X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=f226c4c5f351d797a9eac90bc835645c230c10bd;hb=95cedd60004893fd646735d17f7196297c38e22c;hp=80d96d0f20bc0e765e05131833a24c712b9adace;hpb=9d7c3190cc346bf2a5576b6b93c26723059ae9a1;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 80d96d0f2..f226c4c5f 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -5,22 +5,34 @@ defmodule Pleroma.Activity do
 
   schema "activities" do
     field :data, :map
+    field :local, :boolean, default: true
 
     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
+
+  # Wrong name, only returns create activities
+  def all_by_object_ap_id_q(ap_id) do
+    from activity in Activity,
+      where: fragment("(?)->'object'->>'id' = ?", activity.data, ^to_string(ap_id))
+  end
+
+  def all_non_create_by_object_ap_id_q(ap_id) do
+    from activity in Activity,
+      where: fragment("(?)->>'object' = ?", activity.data, ^to_string(ap_id))
   end
 
   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("(?)->'object'->>'id' = ?", activity.data, ^to_string(ap_id))
+             and fragment("(?)->>'type' = 'Create'", activity.data))
   end
 end