projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/2099
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
common_api.ex
diff --git
a/lib/pleroma/web/common_api/common_api.ex
b/lib/pleroma/web/common_api/common_api.ex
index 4ab533658e41342571c72d1ee64e2d9650c55908..500c3883e9661f18edb444484431f9d38a299d73 100644
(file)
--- a/
lib/pleroma/web/common_api/common_api.ex
+++ b/
lib/pleroma/web/common_api/common_api.ex
@@
-4,7
+4,6
@@
defmodule Pleroma.Web.CommonAPI do
alias Pleroma.Activity
defmodule Pleroma.Web.CommonAPI do
alias Pleroma.Activity
- alias Pleroma.ActivityExpiration
alias Pleroma.Conversation.Participation
alias Pleroma.Formatter
alias Pleroma.Object
alias Pleroma.Conversation.Participation
alias Pleroma.Formatter
alias Pleroma.Object
@@
-381,9
+380,9
@@
defmodule Pleroma.Web.CommonAPI do
def check_expiry_date({:ok, nil} = res), do: res
def check_expiry_date({:ok, in_seconds}) do
def check_expiry_date({:ok, nil} = res), do: res
def check_expiry_date({:ok, in_seconds}) do
- expiry =
NaiveDateTime.utc_now() |> NaiveDateTime.add(
in_seconds)
+ expiry =
DateTime.add(DateTime.utc_now(),
in_seconds)
- if
ActivityExpiration
.expires_late_enough?(expiry) do
+ if
Pleroma.Workers.PurgeExpiredActivity
.expires_late_enough?(expiry) do
{:ok, expiry}
else
{:error, "Expiry date is too soon"}
{:ok, expiry}
else
{:error, "Expiry date is too soon"}