소스 검색

simplify cal weekday index

Juan Xavier Gomez 7 달 전
부모
커밋
44ee813c6f
1개의 변경된 파일3개의 추가작업 그리고 8개의 파일을 삭제
  1. 3 8
      internal/feed/calendar.go

+ 3 - 8
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)