X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Factivity.ex;h=be485056018bb12c1e28d1a891736a216f53a027;hb=36012ef6c1dfea2489e61063e14783fa3fb52700;hp=99589590c1b3bddba86134e849d3935adf26145a;hpb=eb02edcad9cb0d65fc216408960aec63713e5d2b;p=akkoma diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index 99589590c..be4850560 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.ActivityExpiration alias Pleroma.Bookmark alias Pleroma.Notification alias Pleroma.Object @@ -59,6 +60,8 @@ defmodule Pleroma.Activity do # typical case. has_one(:object, Object, on_delete: :nothing, foreign_key: :id) + has_one(:expiration, ActivityExpiration, on_delete: :delete_all) + timestamps() end @@ -343,4 +346,6 @@ defmodule Pleroma.Activity do ) ) end + + defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search end