X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=09ea8079391b6b8c7c882ee7d19778e58c1bce42;hb=64553ebae2f415b309df5f6b1c13b9972bc65aaa;hp=71ace1c34a51afc3ed93c22fd1e7e9b6126296ad;hpb=2a11068a11caa33bbd3fc66f175c5511f8ab2eaf;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 71ace1c34..09ea80793 100644
--- 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,