Skip to content

fix: daily time reset #60

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

Merged
ykisana merged 1 commit into from
Oct 7, 2026
Merged

fix: daily time reset #60

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion Normal/Models/UsageLimitEditPolicy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,14 @@ nonisolated enum UsageLimitEditPolicy {

static func lockState(anchor: Date?, now: Date = .now) -> UsageLimitLockState {
guard let anchor else { return .unlocked }
let unlock = anchor + cooldownInterval
if now < anchor {
return .locked(until: unlock)
}
let graceEnds = anchor + graceInterval
if now < graceEnds {
return .grace(until: graceEnds)
}
let unlock = anchor + cooldownInterval
return now < unlock ? .locked(until: unlock) : .unlocked
}

Expand Down
18 changes: 18 additions & 0 deletions NormalTests/Models/UsageLimitEditPolicyTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,24 @@ struct UsageLimitEditPolicyTests {
#expect(current == anchor)
}

@Test(arguments: [
UsageLimitEdit.adjust(from: 30, to: 60, dropsCoverage: false),
.adjust(from: 60, to: 60, dropsCoverage: true),
.delete(minutes: 30),
.changeReset,
])
func windingTheClockBackBeforeTheAnchorDoesNotReopenGrace(edit: UsageLimitEdit) {
let decision = UsageLimitEditPolicy.decide(edit, anchor: anchor, now: anchor - .days(1))
#expect(decision == .locked(until: anchor + .days(7)))
}

@Test func restoringTheClockAfterAFutureAnchorStaysLocked() {
#expect(
UsageLimitEditPolicy.lockState(anchor: anchor, now: anchor - 1)
== .locked(until: anchor + .days(7))
)
}

// MARK: - Anchor bookkeeping

@Test func onlyCooldownElapsedStartsANewWeek() {
Expand Down
Loading