X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=eb37b95a6ed88da494ee69adc64bb2e4b7112e23;hb=9ef912aecfbeef670db0614ec2014321c37f3b7a;hp=ff0e592418a4c9b9d1a3e5f5a3f1cabeeaa8a718;hpb=92b4a1aa1bc750bb077ae45c422967f9712e247d;p=akkoma

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index ff0e59241..eb37b95a6 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -23,6 +23,23 @@ defmodule Pleroma.Object do
     timestamps()
   end
 
+  def with_joined_activity(query, activity_type \\ "Create", join_type \\ :inner) do
+    object_position = Map.get(query.aliases, :object, 0)
+
+    join(query, join_type, [{object, object_position}], a in Activity,
+      on:
+        fragment(
+          "COALESCE(?->'object'->>'id', ?->>'object') = (? ->> 'id') AND (?->>'type' = ?) ",
+          a.data,
+          a.data,
+          object.data,
+          a.data,
+          ^activity_type
+        ),
+      as: :object_activity
+    )
+  end
+
   def create(data) do
     Object.change(%Object{}, %{data: data})
     |> Repo.insert()