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

Messing with formatting and logic

Browse Source
This commit is contained in:
NovaFox161
2021-11-20 01:12:52 -06:00
parent 833df3efd1
commit 1dd7baf919
2 changed files with 5 additions and 3 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
+3 -2
View File
@@ -65,8 +65,9 @@ object CalendarEmbed : EmbedMaker {
.append(" - ")
.append(it.end.asDiscordTimestamp(DiscordTimestampFormat.SHORT_TIME))
.append(" | ")
if (it.name.isNotBlank()) content.append("`${it.name}`").append(" | ")
content.append("`${it.eventId}`").append("\n")
if (it.name.isNotBlank()) content.append(it.name).append(" | ")
else content.append(getMessage("calendar", "link.field.id", settings)).append(" ${it.eventId}")
content.append(it.eventId).append("\n")
}
builder.addField(fieldTitle, content.toString(), false)
core/src/main/kotlin/org/dreamexposure/discal/core/extensions/MutableList.kt
+2 -1
View File
@@ -2,6 +2,7 @@ package org.dreamexposure.discal.core.extensions
import org.dreamexposure.discal.core.entities.Event
import java.time.ZonedDateTime
import java.time.temporal.ChronoUnit
import java.time.temporal.TemporalAdjusters
import java.util.stream.Collectors
@@ -23,7 +24,7 @@ fun MutableList<String>.asStringList(): String {
fun MutableList<Event>.groupByDate(): Map<ZonedDateTime, List<Event>> {
return this.stream()
.collect(Collectors.groupingBy {
ZonedDateTime.ofInstant(it.start, it.timezone)
ZonedDateTime.ofInstant(it.start, it.timezone).truncatedTo(ChronoUnit.DAYS)
.with(TemporalAdjusters.ofDateAdjuster { identity -> identity })
})