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

This should fix all the formatting issues

Browse Source
This commit is contained in:
NovaFox161
2021-11-20 01:55:51 -06:00
parent 3e1995d5e1
commit c0b8b7efc0
3 changed files with 15 additions and 11 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
+9 -6
View File
@@ -53,12 +53,15 @@ object CalendarEmbed : EmbedMaker {
// Show events
events.forEach { date ->
val fieldTitle = date.key.toInstant().humanReadableDate(calendar.timezone, settings.timeFormat)
val content = StringBuilder()
date.value.forEach {
content.append("```\n")
.append(it.start.humanReadableTime(it.timezone, settings.timeFormat))
val title = date.key.toInstant().humanReadableDate(calendar.timezone, settings.timeFormat, true)
// sort events
val sortedEvents = date.value.sortedBy { it.start }
val content = StringBuilder().append("```\n")
sortedEvents.forEach {
content.append(it.start.humanReadableTime(it.timezone, settings.timeFormat))
.append(" - ")
.append(it.end.humanReadableTime(it.timezone, settings.timeFormat))
.append(" | ")
@@ -68,7 +71,7 @@ object CalendarEmbed : EmbedMaker {
}
content.append("```")
builder.addField(fieldTitle, content.toString(), false)
builder.addField(title, content.toString(), false)
}
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 time: String) {
TWENTY_FOUR_HOUR(1, "LLLL dd yyyy '@' HH:mm", "yyyy/MM/dd", "HH:mm"),
TWELVE_HOUR(2, "LLLL dd yyyy '@' hh:mm a", "yyyy/MM/dd hh:mm a", "hh:mm a");
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");
companion object {
fun isValid(i: Int): Boolean {
core/src/main/kotlin/org/dreamexposure/discal/core/extensions/InstantExtension.kt
+3 -2
View File
@@ -11,8 +11,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): String {
return DateTimeFormatter.ofPattern(format.date).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)
else DateTimeFormatter.ofPattern(format.date).withZone(timezone).format(this)
}
fun Instant.humanReadableTime(timezone: ZoneId, format: TimeFormat): String {