From 44ee813c6ffb62645cd76cdfca3815d43db86cfc Mon Sep 17 00:00:00 2001 From: Juan Xavier Gomez Date: Mon, 25 Nov 2024 15:49:28 -0500 Subject: [PATCH] simplify cal weekday index --- internal/feed/calendar.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/feed/calendar.go b/internal/feed/calendar.go index a4beae3..e608dbe 100644 --- a/internal/feed/calendar.go +++ b/internal/feed/calendar.go @@ -7,9 +7,8 @@ import "time" func NewCalendar(now time.Time, startSunday bool) *Calendar { year, week := now.ISOWeek() weekday := now.Weekday() - - if weekday == 0 { - weekday = 7 + if !startSunday { + weekday = (weekday + 6) % 7 // Shift Monday to 0 } currentMonthDays := daysInMonth(now.Month(), year) @@ -22,11 +21,7 @@ func NewCalendar(now time.Time, startSunday bool) *Calendar { previousMonthDays = daysInMonth(previousMonthNumber, year) } - var offset time.Weekday = 6 - if startSunday { - offset = 7 - } - startDaysFrom := now.Day() - int(weekday+offset) + startDaysFrom := now.Day() - int(weekday) - 7 days := make([]int, 21)