pleroma

commit: 7f83b35a9dea7181b57d9b975742233813fa3a8b
parent 2a11068a11caa33bbd3fc66f175c5511f8ab2eaf
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue, 29 Sep 2020 17:42:08 +0000

Merge branch 'fix/2189-unpin-activity' into 'develop'

#2189 More robust expires_at timestamp processing

See merge request pleroma/pleroma!3046
Diffstat:
M
lib/pleroma/user.ex
4
+++-

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,