X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=e432fcb0738c9a333a068a6f8035e4c332c8a4e1;hb=3a7c14645ed726bd6b7deb6489ec0578c4d8cd79;hp=4a2ded51819f7dde23a89905609622735262fbb5;hpb=45f790becc2cc63ac000c6432fe8c84e0b589822;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 4a2ded518..e432fcb07 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Activity do
   use Ecto.Schema
 
   alias Pleroma.Activity
+  alias Pleroma.Bookmark
   alias Pleroma.Notification
   alias Pleroma.Object
   alias Pleroma.Repo
@@ -14,6 +15,8 @@ defmodule Pleroma.Activity do
   import Ecto.Query
 
   @type t :: %__MODULE__{}
+  @type actor :: String.t()
+
   @primary_key {:id, Pleroma.FlakeId, autogenerate: true}
 
   # https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
@@ -34,6 +37,7 @@ defmodule Pleroma.Activity do
     field(:actor, :string)
     field(:recipients, {:array, :string}, default: [])
     has_many(:notifications, Notification, on_delete: :delete_all)
+    has_many(:bookmarks, Bookmark, on_delete: :delete_all)
 
     # Attention: this is a fake relation, don't try to preload it blindly and expect it to work!
     # The foreign key is embedded in a jsonb field.
@@ -69,6 +73,12 @@ defmodule Pleroma.Activity do
         )
     )
     |> preload([activity, object], object: object)
+    |> with_preloaded_bookmarks()
+  end
+
+  def with_preloaded_bookmarks(query) do
+    query
+    |> preload(:bookmarks)
   end
 
   def get_by_ap_id(ap_id) do
@@ -102,6 +112,7 @@ defmodule Pleroma.Activity do
           ),
         preload: [object: o]
       )
+      |> with_preloaded_bookmarks()
     )
   end
 
@@ -122,6 +133,7 @@ defmodule Pleroma.Activity do
         ),
       preload: [object: o]
     )
+    |> with_preloaded_bookmarks()
     |> Repo.one()
   end
 
@@ -198,7 +210,8 @@ defmodule Pleroma.Activity do
           activity.data,
           activity.data
         ),
-      preload: [object: o]
+      preload: [object: o],
+      preload: :bookmarks
     )
   end
 
@@ -260,4 +273,9 @@ defmodule Pleroma.Activity do
     |> where([s], s.actor == ^actor)
     |> Repo.all()
   end
+
+  @spec query_by_actor(actor()) :: Ecto.Query.t()
+  def query_by_actor(actor) do
+    from(a in Activity, where: a.actor == ^actor)
+  end
 end