mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-01-23 20:38:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Range command is now working correctly

Browse Source
This commit is contained in:
NovaFox161
2021-08-24 10:35:33 -06:00
parent 87a5b5bc89
commit ece73a8dd0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/kotlin/org/dreamexposure/discal/client/commands/EventsCommand.kt
View File

@@ -11,6 +11,7 @@ import reactor.core.publisher.Flux
import reactor.core.publisher.Mono
import reactor.function.TupleUtils
import java.time.Instant
import java.time.LocalDate
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.time.format.DateTimeParseException
@@ -152,9 +153,9 @@ class EventsCommand : SlashCommand {
.map { it.asString() }
.flatMap { value ->
calMono.map {
val formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd").withZone(it.timezone)
val formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd")
ZonedDateTime.parse(value, formatter)
LocalDate.parse(value, formatter).atStartOfDay(it.timezone)
}
}.map(ZonedDateTime::toInstant)
@@ -162,9 +163,10 @@ class EventsCommand : SlashCommand {
.map { it.asString() }
.flatMap { value ->
calMono.map {
val formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd").withZone(it.timezone)
val formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd")
ZonedDateTime.parse(value, formatter)
//At end of day
LocalDate.parse(value, formatter).plusDays(1).atStartOfDay(it.timezone)
}
}.map(ZonedDateTime::toInstant)