Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Give normalizeDayOfMonth a more readable signature. #189

Merged
merged 1 commit into from
Apr 11, 2022
Merged

Give normalizeDayOfMonth a more readable signature. #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions database/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,13 +907,13 @@ func monthStart(subscribedUntil time.Time) time.Time {
func monthStartWithTime(subscribedUntil time.Time, current time.Time) time.Time {
// Normalize the day of month. Subs ending on 31st should end on the last
// day of the month when the month doesn't have 31 days.
dayOfMonth := normalizeDayOfMonth(current.Month(), subscribedUntil.Day(), current)
dayOfMonth := normalizeDayOfMonth(current.Year(), current.Month(), subscribedUntil.Day())
// If we're past the reset day this month, use the current day of the month.
if current.Day() >= dayOfMonth {
return time.Date(current.Year(), current.Month(), dayOfMonth, 0, 0, 0, 0, time.UTC)
}
// If we haven't reached the reset day this month, use last month's day.
dayOfMonth = normalizeDayOfMonth(current.Month()-1, subscribedUntil.Day(), current)
dayOfMonth = normalizeDayOfMonth(current.Year(), current.Month()-1, subscribedUntil.Day())
return time.Date(current.Year(), current.Month()-1, dayOfMonth, 0, 0, 0, 0, time.UTC)
}

Expand All @@ -922,11 +922,11 @@ func monthStartWithTime(subscribedUntil time.Time, current time.Time) time.Time
//
// Example:
// In February normalizeDayOfMonth(31) will return 28 or 29.
func normalizeDayOfMonth(month time.Month, day int, current time.Time) int {
t := time.Date(current.Year(), month, day, 0, 0, 0, 0, time.UTC)
func normalizeDayOfMonth(year int, month time.Month, day int) int {
peterjan marked this conversation as resolved.
Show resolved Hide resolved
t := time.Date(year, month, day, 0, 0, 0, 0, time.UTC)
if t.Month() > month {
// This month doesn't have this day. Return the last day of the month.
t = time.Date(current.Year(), month+1, 0, 0, 0, 0, 0, time.UTC)
t = time.Date(year, month+1, 0, 0, 0, 0, 0, time.UTC)
}
return t.Day()
}