projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/1.1.8' into 'stable'
[akkoma]
/
lib
/
pleroma
/
activity_expiration.ex
diff --git
a/lib/pleroma/activity_expiration.ex
b/lib/pleroma/activity_expiration.ex
index bf57abca493381792dde61e6981dac1c617f498b..7ea5c48ca25564c4066266306692b0a43cd9001d 100644
(file)
--- a/
lib/pleroma/activity_expiration.ex
+++ b/
lib/pleroma/activity_expiration.ex
@@
-7,7
+7,6
@@
defmodule Pleroma.ActivityExpiration do
alias Pleroma.Activity
alias Pleroma.ActivityExpiration
alias Pleroma.Activity
alias Pleroma.ActivityExpiration
- alias Pleroma.FlakeId
alias Pleroma.Repo
import Ecto.Changeset
alias Pleroma.Repo
import Ecto.Changeset
@@
-17,7
+16,7
@@
defmodule Pleroma.ActivityExpiration do
@min_activity_lifetime :timer.hours(1)
schema "activity_expirations" do
@min_activity_lifetime :timer.hours(1)
schema "activity_expirations" do
- belongs_to(:activity, Activity, type: FlakeId)
+ belongs_to(:activity, Activity, type: FlakeId
.Ecto.CompatType
)
field(:scheduled_at, :naive_datetime)
end
field(:scheduled_at, :naive_datetime)
end