From f7e212e1d1dc598a7a9654b565c2a909ff998a5c Mon Sep 17 00:00:00 2001 From: Sam Lewis Date: Wed, 9 Nov 2022 17:41:13 -0500 Subject: [PATCH] fix sunset/sunrise schedule bug --- schedule.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/schedule.go b/schedule.go index 47fdc49..b6b006a 100644 --- a/schedule.go +++ b/schedule.go @@ -6,6 +6,7 @@ import ( "runtime" "time" + "github.com/golang-module/carbon" "github.com/saml-dev/gome-assistant/internal" ) @@ -200,7 +201,12 @@ func popSchedule(a *App) Schedule { func requeueSchedule(a *App, s Schedule) { if s.isSunrise || s.isSunset { - nextSunTime := getSunriseSunsetFromApp(a, s.isSunrise, s.sunOffset) + var nextSunTime carbon.Carbon + if s.sunOffset != "" { + nextSunTime = getSunriseSunsetFromApp(a, s.isSunrise, s.sunOffset) + } else { + nextSunTime = getSunriseSunsetFromApp(a, s.isSunrise) + } // this is true when there is a negative offset, so schedule runs before sunset/sunrise and // HA still shows today's sunset as next sunset. Just add 24h as a default handler