Add display cal option to show only the next upcoming event

Author: NovaFox161

core/src/main/kotlin/org/dreamexposure/discal/core/business/EmbedService.kt

@@ -195,8 +195,7 @@ class EmbedService(
 
         // set footer
         if (showUpdate) {
-            val lastUpdate = Instant.now().asDiscordTimestamp(DiscordTimestampFormat.RELATIVE_TIME)
-            builder.footer(getEmbedMessage("calendar", "link.footer.update", settings.locale, lastUpdate), null)
+            builder.footer(getEmbedMessage("calendar", "link.footer.update", settings.locale), null)
                 .timestamp(Instant.now())
         } else builder.footer(getEmbedMessage("calendar", "link.footer.default", settings.locale), null)
 
@@ -378,6 +377,54 @@ class EmbedService(
     //////////////////////////
     ////// Event Embeds //////
     //////////////////////////
+    suspend fun nextUpcomingEventEmbed(event: Event?, guildId: Snowflake, showUpdate: Boolean): EmbedCreateSpec {
+        val settings = settingsService.getSettings(guildId)
+        val builder = defaultEmbedBuilder(settings)
+            .color(event?.color?.asColor() ?: GlobalVal.discalColor)
+            .title(getEmbedMessage("event", "upcoming.title", settings.locale))
+
+        // Add footer info
+        if (showUpdate) {
+            builder.footer(getEmbedMessage("event", "upcoming.footer", settings.locale), null)
+                .timestamp(Instant.now())
+        }
+
+        // If event is null, turn this into a stub
+        if (event == null) {
+            builder.description(getEmbedMessage("event", "upcoming.description.no-event", settings.locale))
+
+            return builder.build()
+        }
+
+        // Handle adding name and description + info about this event
+        val descriptionBuilder = StringBuilder()
+        if (event.name.isNotBlank()) descriptionBuilder.append(event.name.toMarkdown()).append("\n\n")
+        if (event.description.isNotBlank()) descriptionBuilder.append(event.description.toMarkdown())
+
+        if (descriptionBuilder.isNotBlank()) builder.description(descriptionBuilder.toString().embedDescriptionSafe())
+
+
+        builder.addField(
+            getEmbedMessage("event", "upcoming.field.start", settings.locale),
+            event.start.asDiscordTimestamp(LONG_DATETIME),
+            true)
+        builder.addField(
+            getEmbedMessage("event", "upcoming.field.end", settings.locale),
+            event.end.asDiscordTimestamp(LONG_DATETIME),
+            true
+        )
+
+        if (event.location.isNotBlank()) builder.addField(
+            getEmbedMessage("event", "upcoming.field.location", settings.locale),
+            event.location.toMarkdown().embedFieldSafe(),
+            false
+        )
+
+        if (event.image.isNotEmpty()) builder.image(event.image)
+
+        return builder.build()
+    }
+
     suspend fun fullEventEmbed(event: Event, settings: GuildSettings): EmbedCreateSpec {
         val builder = defaultEmbedBuilder(settings)
             .footer(getEmbedMessage("event", "full.footer", settings.locale, event.id), null)

core/src/main/kotlin/org/dreamexposure/discal/core/business/StaticMessageService.kt

@@ -97,6 +97,10 @@ class StaticMessageService(
                 val events = calendarService.getEventsInNextNDays(guildId, calendarNumber, 6)
                 embedService.calendarWeekOverviewEmbed(calendar, events, showUpdate = true)
             }
+            StaticMessage.Type.NEXT_EVENT -> {
+                val event = calendarService.getUpcomingEvents(guildId, calendarNumber, 1).firstOrNull()
+                embedService.nextUpcomingEventEmbed(event, guildId, showUpdate = true)
+            }
         }
 
 
@@ -183,6 +187,10 @@ class StaticMessageService(
                 val events = calendarService.getEventsInNextNDays(guildId, old.calendarNumber, 6)
                 embedService.calendarWeekOverviewEmbed(calendar, events, showUpdate = true)
             }
+            StaticMessage.Type.NEXT_EVENT -> {
+                val event = calendarService.getUpcomingEvents(guildId, old.calendarNumber, 1).firstOrNull()
+                embedService.nextUpcomingEventEmbed(event, guildId, showUpdate = true)
+            }
         }
 
         discordClient.getMessageById(old.channelId, old.messageId).edit(
@@ -272,6 +280,10 @@ class StaticMessageService(
                     val events = calendarService.getEventsInNextNDays(guildId, calendarNumber, 6)
                     embedService.calendarWeekOverviewEmbed(calendar, events, showUpdate = true)
                 }
+                StaticMessage.Type.NEXT_EVENT -> {
+                    val event = calendarService.getUpcomingEvents(guildId, calendarNumber, 1).firstOrNull()
+                    embedService.nextUpcomingEventEmbed(event, guildId, showUpdate = true)
+                }
             }
 
             discordClient.getMessageById(old.channelId, old.messageId).edit(

core/src/main/kotlin/org/dreamexposure/discal/core/object/new/StaticMessage.kt

@@ -36,7 +36,9 @@ data class StaticMessage(
 
     enum class Type(val value: Int) {
         CALENDAR_OVERVIEW(1),
-        CALENDAR_WEEKLY(2);
+        CALENDAR_WEEKLY(2),
+        NEXT_EVENT(3),
+        ;
 
         companion object {
             fun getByValue(value: Int) = entries.first { it.value == value }

core/src/main/resources/commands/global/displayCal.json

@@ -20,6 +20,10 @@
             {
               "name": "Weekly Overview",
               "value": 2
+            },
+            {
+              "name": "Next Upcoming Event",
+              "value": 3
             }
           ]
         },

core/src/main/resources/i18n/embed/event.properties

@@ -1,3 +1,11 @@
+upcoming.title=~ Next Upcoming Event ~
+upcoming.description.no-event=```\n[ No Upcoming Events ] \n```\n\nSchedule an event with `/event create`.
+upcoming.field.start=Start (Local)
+upcoming.field.end=End (Local)
+upcoming.field.location=Location
+upcoming.footer=Last Update
+
+
 full.title=Event Info
 full.field.start=Start (Local)
 full.field.end=End (Local)