commit: b3a9ba09ec5867d240c3769ae4c3fbf598f68d92
parent 2a11068a11caa33bbd3fc66f175c5511f8ab2eaf
Author: Mark Felder <feld@FreeBSD.org>
Date: Tue, 29 Sep 2020 12:16:15 -0500
More robust expires_at timestamp processing
Diffstat:
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -2291,7 +2291,9 @@ defmodule Pleroma.User do
# if pinned activity was scheduled for deletion, we reschedule it for deletion
if data["expires_at"] do
- {:ok, expires_at, _} = DateTime.from_iso8601(data["expires_at"])
+ # MRF.ActivityExpirationPolicy used UTC timestamps for expires_at in original implementation
+ {:ok, expires_at} =
+ data["expires_at"] |> Pleroma.EctoType.ActivityPub.ObjectValidators.DateTime.cast()
Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
activity_id: id,