diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-29 17:42:08 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-29 17:42:08 +0000 |
| commit | 7f83b35a9dea7181b57d9b975742233813fa3a8b (patch) | |
| tree | 381d2644f34e86f1aada07f432a3ee0da2917cb4 | |
| parent | 2a11068a11caa33bbd3fc66f175c5511f8ab2eaf (diff) | |
| parent | b3a9ba09ec5867d240c3769ae4c3fbf598f68d92 (diff) | |
Merge branch 'fix/2189-unpin-activity' into 'develop'
#2189 More robust expires_at timestamp processing
See merge request pleroma/pleroma!3046
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 3 insertions, 1 deletions
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, |