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

master
Takeshi Umeda 5 years ago committed by Eugen Rochko
parent 7512f3a3e0
commit 5b46467474
  1. 3
      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 };
}

Loading…
Cancel
Save