fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-29 08:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix using Date.now() instead of intl.now() (#25234)

Browse source
This commit is contained in:
S.H 2023-06-01 20:46:19 +09:00 committed by GitHub
parent 942d850b0a
commit b3f9a0da52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/components/poll.jsx
View file

@ -57,9 +57,9 @@ class Poll extends ImmutablePureComponent {
}; };
static getDerivedStateFromProps (props, state) { static getDerivedStateFromProps (props, state) {
const { poll, intl } = props; const { poll } = props;
const expires_at = poll.get('expires_at'); const expires_at = poll.get('expires_at');
const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now(); const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < Date.now();
return (expired === state.expired) ? null : { expired }; return (expired === state.expired) ? null : { expired };
} }
@ -76,10 +76,10 @@ class Poll extends ImmutablePureComponent {
} }
_setupTimer () { _setupTimer () {
const { poll, intl } = this.props; const { poll } = this.props;
clearTimeout(this._timer); clearTimeout(this._timer);
if (!this.state.expired) { if (!this.state.expired) {
const delay = (new Date(poll.get('expires_at'))).getTime() - intl.now(); const delay = (new Date(poll.get('expires_at'))).getTime() - Date.now();
this._timer = setTimeout(() => { this._timer = setTimeout(() => {
this.setState({ expired: true }); this.setState({ expired: true });
}, delay); }, delay);