From ad89a780be14689f7722e9231d5a39d7be82e02d Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:04:19 +0100 Subject: [PATCH] fix: time from midnight fix issue where time from midnight was wrong on days where DST changes --- server/src/classes/Timer.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/src/classes/Timer.js b/server/src/classes/Timer.js index feacd458a..4ee9d750a 100644 --- a/server/src/classes/Timer.js +++ b/server/src/classes/Timer.js @@ -96,12 +96,15 @@ export class Timer { // get current time in epoc _getCurrentTime() { - // date today at midnight const now = new Date(); - const midnight = new Date(now).setHours(0, 0, 0); - // return diffence - return now - midnight; + // extract milliseconds since midnight + let elapsed = now.getHours() * 3600000; + elapsed += now.getMinutes() * 60000; + elapsed += now.getSeconds() * 1000; + elapsed += now.getMilliseconds(); + + return elapsed; } _getExpectedFinish() {