diff options
| author | feld <feld@feld.me> | 2020-02-13 14:37:55 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-02-13 14:37:55 +0000 |
| commit | b312c36b8e14b6aaa450bd8509e320c9784d0f48 (patch) | |
| tree | 970f7522951f583f100f682142d7aa1b4e1082c3 /lib | |
| parent | 571a475c7ec8f9bb6e3a252aa7c3c65a1621bed6 (diff) | |
| parent | 0db88f547b371fb480148279278bd081e5929003 (diff) | |
| download | pleroma-b312c36b8e14b6aaa450bd8509e320c9784d0f48.tar.gz | |
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
# Conflicts:
# config/description.exs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/activity_expiration.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/activity_expiration.ex b/lib/pleroma/activity_expiration.ex index 7ea5c48ca..a58a493f7 100644 --- a/lib/pleroma/activity_expiration.ex +++ b/lib/pleroma/activity_expiration.ex @@ -62,6 +62,6 @@ defmodule Pleroma.ActivityExpiration do def expires_late_enough?(scheduled_at) do now = NaiveDateTime.utc_now() diff = NaiveDateTime.diff(scheduled_at, now, :millisecond) - diff >= @min_activity_lifetime + diff > @min_activity_lifetime end end |