From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sun, 27 Oct 2019 11:45:55 +0000 (+0900)
Subject: Fix an issue where polls with 'expires_at' not set expired (#12222)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5b46467474dd88e1563561bf50643324b4f021e8;p=mastodon.git

Fix an issue where polls with 'expires_at' not set expired (#12222)
---

diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index cdbcf8f70..0edd064e0 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -39,7 +39,8 @@ class Poll extends ImmutablePureComponent {
 
   static getDerivedStateFromProps (props, state) {
     const { poll, intl } = props;
-    const expired = poll.get('expired') || (new Date(poll.get('expires_at'))).getTime() < intl.now();
+    const expires_at = poll.get('expires_at');
+    const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now();
     return (expired === state.expired) ? null : { expired };
   }