~cytrogen/masto-fe

a4d7a17089f62cd3f4cb2486c7b94ba00b639bfb — S.H 2 years ago aa57f7e
[Glitch] Fix using Date.now() instead of intl.now()

Port b3f9a0da520e8024de94b30f801e4ebb83336e8b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 files changed, 4 insertions(+), 4 deletions(-)

M app/javascript/flavours/glitch/components/poll.jsx
M app/javascript/flavours/glitch/components/poll.jsx => app/javascript/flavours/glitch/components/poll.jsx +4 -4
@@ 58,9 58,9 @@ class Poll extends ImmutablePureComponent {
  };

  static getDerivedStateFromProps (props, state) {
    const { poll, intl } = props;
    const { poll } = props;
    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 };
  }



@@ 77,10 77,10 @@ class Poll extends ImmutablePureComponent {
  }

  _setupTimer () {
    const { poll, intl } = this.props;
    const { poll } = this.props;
    clearTimeout(this._timer);
    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.setState({ expired: true });
      }, delay);