mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-05-12 20:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Display day of week in overview, eg Wednesday - 08 December 2021

Browse Source
This commit is contained in:
NovaFox161
2021-12-08 16:58:37 -06:00
parent 766f1377ca
commit 63a35d5b3a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/main/kotlin/org/dreamexposure/discal/client/message/embed/CalendarEmbed.kt
+1 -1
View File
@@ -55,7 +55,7 @@ object CalendarEmbed : EmbedMaker {
// Show events
events.forEach { date ->
val title = date.key.toInstant().humanReadableDate(calendar.timezone, settings.timeFormat, true)
val title = date.key.toInstant().humanReadableDate(calendar.timezone, settings.timeFormat, longDay = true)
// sort events
val sortedEvents = date.value.sortedBy { it.start }
core/src/main/kotlin/org/dreamexposure/discal/core/enums/time/TimeFormat.kt
+3 -3
View File
@@ -9,9 +9,9 @@ import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
@Serializable(with = TimeFormatAsIntSerializer::class)
enum class TimeFormat(val value: Int = 1, val full: String, val date: String, val longDate: String, val time: String) {
TWENTY_FOUR_HOUR(1, "LLLL dd yyyy '@' HH:mm", "yyyy/MM/dd", "dd LLLL yyyy", "HH:mm"),
TWELVE_HOUR(2, "LLLL dd yyyy '@' hh:mm a", "yyyy/MM/dd", "dd LLLL yyyy", "hh:mm a");
enum class TimeFormat(val value: Int = 1, val full: String, val date: String, val longDate: String, val time: String, val dayOfWeek: String) {
TWENTY_FOUR_HOUR(1, "LLLL dd yyyy '@' HH:mm", "yyyy/MM/dd", "dd LLLL yyyy", "HH:mm", "EEEE '-' dd LLLL yyyy"),
TWELVE_HOUR(2, "LLLL dd yyyy '@' hh:mm a", "yyyy/MM/dd", "dd LLLL yyyy", "hh:mm a", "EEEE '-' dd LLLL yyyy");
companion object {
fun isValid(i: Int): Boolean {
core/src/main/kotlin/org/dreamexposure/discal/core/extensions/InstantExtension.kt
+3 -2
View File
@@ -12,8 +12,9 @@ fun Instant.humanReadableFull(timezone: ZoneId, format: TimeFormat): String {
return DateTimeFormatter.ofPattern(format.full).withZone(timezone).format(this)
}
fun Instant.humanReadableDate(timezone: ZoneId, format: TimeFormat, long: Boolean): String {
return if (long) DateTimeFormatter.ofPattern(format.longDate).withZone(timezone).format(this)
fun Instant.humanReadableDate(timezone: ZoneId, format: TimeFormat, long: Boolean = true, longDay: Boolean = false): String {
return if (long && longDay) DateTimeFormatter.ofPattern(format.dayOfWeek).withZone(timezone).format(this)
else if (long) DateTimeFormatter.ofPattern(format.longDate).withZone(timezone).format(this)
else DateTimeFormatter.ofPattern(format.date).withZone(timezone).format(this)
}