Skip to content

Commit 840cadc

Browse files
committed
🐛 Fix timezone bug
1 parent 3431406 commit 840cadc

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

Sources/Cli/Hours.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ struct Hours: ParsableCommand {
3232
throw ExitCode.failure
3333
}
3434

35-
let today = FCalendar.current.startOfDay(for: userDate)
36-
let start = FCalendar.current.date(byAdding: .day, value: 0, to: today)!
37-
let end = FCalendar.current.date(byAdding: .day, value: 1, to: today)!
35+
var cal = FCalendar.current
36+
cal.timeZone = TimeZone.current
37+
let today = cal.startOfDay(for: userDate)
38+
let start = cal.date(byAdding: .day, value: 0, to: today)!
39+
let end = cal.date(byAdding: .day, value: 1, to: today)!
3840

3941
let opts = AllOptions(calendar: calendar, events: eventOptions, general: general)
4042

Sources/Cli/Next.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ struct Next: ParsableCommand {
2626
)) var within: Int = 60
2727

2828
mutating func run() {
29+
var cal = FCalendar.current
30+
cal.timeZone = TimeZone.current
2931
let today = Date()
30-
let start = FCalendar.current.date(byAdding: .day, value: 0, to: today)!
31-
let end = FCalendar.current.date(byAdding: .minute, value: within, to: today)!
32+
let start = cal.date(byAdding: .day, value: 0, to: today)!
33+
let end = cal.date(byAdding: .minute, value: within, to: today)!
3234

3335
let opts = AllOptions(calendar: calendar, events: eventOptions, general: general)
3436

Sources/Cli/On.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ struct On: ParsableCommand {
3434
throw ExitCode.failure
3535
}
3636

37-
let today = FCalendar.current.startOfDay(for: userDate)
38-
let start = FCalendar.current.date(byAdding: .day, value: 0, to: today)!
39-
let end = FCalendar.current.date(byAdding: .day, value: 1, to: today)!
37+
var cal = FCalendar.current
38+
cal.timeZone = TimeZone.current
39+
let today = cal.startOfDay(for: userDate)
40+
let start = cal.date(byAdding: .day, value: 0, to: today)!
41+
let end = cal.date(byAdding: .day, value: 1, to: today)!
4042

4143
let opts = AllOptions(calendar: calendar, events: eventOptions, general: general)
4244

Sources/Cli/Today.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ struct Today: ParsableCommand {
1919
var general: Options
2020

2121
mutating func run() {
22-
let today = FCalendar.current.startOfDay(for: Date())
23-
let start = FCalendar.current.date(byAdding: .day, value: 0, to: today)!
24-
let end = FCalendar.current.date(byAdding: .day, value: 1, to: today)!
22+
var cal = FCalendar.current
23+
cal.timeZone = TimeZone.current
24+
let today = cal.startOfDay(for: Date())
25+
let start = cal.date(byAdding: .day, value: 0, to: today)!
26+
let end = cal.date(byAdding: .day, value: 1, to: today)!
2527

2628
let opts = AllOptions(calendar: calendar, events: eventOptions, general: general)
2729

Sources/IO/Parser.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ struct HourTimeParser: ParserPrinter {
1818

1919
class Parser {
2020
private static func updateDate(date: Date, hourMinute: HourMinute) -> Date? {
21-
let calendar = FCalendar.current
21+
var calendar = FCalendar.current
22+
calendar.timeZone = TimeZone.current
2223
var components = calendar.dateComponents(
2324
[.year, .month, .day, .hour, .minute, .second],
2425
from: date

0 commit comments

Comments
 (0)