hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

question_validator: fix for mastodon poll expiration

Browse source 
Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-06-15 05:18:30 +02:00
commit 173f69c854
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/web/mastodon_api/views/poll_view.ex
View file

@ -40,15 +40,13 @@ defmodule Pleroma.Web.MastodonAPI.PollView do
end
defp end_time_and_expired(object) do
case object.data["closed"] || object.data["endTime"] do
end_time when is_binary(end_time) ->
end_time = NaiveDateTime.from_iso8601!(end_time)
expired = NaiveDateTime.compare(end_time, NaiveDateTime.utc_now()) == :lt
if object.data["closed"] do
end_time = NaiveDateTime.from_iso8601!(object.data["closed"])
expired = NaiveDateTime.compare(end_time, NaiveDateTime.utc_now()) == :lt
{Utils.to_masto_date(end_time), expired}
_ ->
{nil, false}
{Utils.to_masto_date(end_time), expired}
else
{nil, false}
end
end