From 610e1808f53674c4eed6421e94db876b0b0cf54f Mon Sep 17 00:00:00 2001
From: Martin Pool <github@nullenenenen.nl>
Date: Fri, 6 Sep 2024 22:45:18 +0200
Subject: [PATCH] Fix midnight better

---
 apps/dutchclock/ChangeLog     | 3 ++-
 apps/dutchclock/app.js        | 5 +++--
 apps/dutchclock/metadata.json | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/dutchclock/ChangeLog b/apps/dutchclock/ChangeLog
index 0f81644ea..b55f0bbf1 100644
--- a/apps/dutchclock/ChangeLog
+++ b/apps/dutchclock/ChangeLog
@@ -1,3 +1,4 @@
 0.12: First release
 0.13: Fix widgets reappearing
-0.14: Fix midnight
\ No newline at end of file
+0.14: Fix midnight
+0.15: Fix midnight better
\ No newline at end of file
diff --git a/apps/dutchclock/app.js b/apps/dutchclock/app.js
index 0947b374a..0e647412c 100644
--- a/apps/dutchclock/app.js
+++ b/apps/dutchclock/app.js
@@ -15,6 +15,7 @@ const BOTTOM_SPACING = 5;
 const TEXT_WIDTH = SCREEN_WIDTH - 2;
 
 const MINS_IN_HOUR = 60;
+const MINS_IN_DAY = 24 * MINS_IN_HOUR;
 
 const VARIANT_EXACT = 'exact';
 const VARIANT_APPROXIMATE = 'approximate';
@@ -69,7 +70,7 @@ function initialize() {
 
 function tick() {
   date = new Date();
-  const m = date.getHours() * MINS_IN_HOUR + date.getMinutes();
+  const m = (date.getHours() * MINS_IN_HOUR + date.getMinutes()) % MINS_IN_DAY;
 
   if (m !== mins) {
     mins = m;
@@ -214,7 +215,7 @@ function getRoundMinutes(m) {
   const nearest = roundTo(5)(m);
 
   return {
-    minutes: nearest % 60,
+    minutes: nearest,
     offset: m - nearest
   };
 }
diff --git a/apps/dutchclock/metadata.json b/apps/dutchclock/metadata.json
index 4155e13b3..2a711bdd4 100644
--- a/apps/dutchclock/metadata.json
+++ b/apps/dutchclock/metadata.json
@@ -3,7 +3,7 @@
   "name": "Dutch Clock",
   "shortName":"Dutch Clock",
   "icon": "app.png",
-  "version":"0.14",
+  "version":"0.15",
   "description": "A clock that displays the time the way a Dutch person would respond when asked what time it is.",
   "type": "clock",
   "tags": "clock,dutch,text",