Attempting to use a modal for event create command

Author: NovaFox161

client/src/main/kotlin/org/dreamexposure/discal/client/commands/global/EventCommand.kt

@@ -35,6 +35,7 @@ class EventCommand(
     override fun shouldDefer(event: ChatInputInteractionEvent): Boolean {
         // check if this is the recur command, if so, check if modal will get sent
         return when (event.options[0].name) {
+            "create" -> false
             "recur" -> {
                 val shouldRecur = event.options[0].getOption("recur")
                     .flatMap(ApplicationCommandInteractionOption::getValue)
@@ -76,24 +77,6 @@ class EventCommand(
     }
 
     private suspend fun create(event: ChatInputInteractionEvent, settings: GuildSettings) {
-        val name = event.options[0].getOption("name")
-            .flatMap(ApplicationCommandInteractionOption::getValue)
-            .map(ApplicationCommandInteractionOptionValue::asString)
-            .orElse("")
-        val description = event.options[0].getOption("description")
-            .flatMap(ApplicationCommandInteractionOption::getValue)
-            .map(ApplicationCommandInteractionOptionValue::asString)
-            .orElse("")
-        val location = event.options[0].getOption("location")
-            .flatMap(ApplicationCommandInteractionOption::getValue)
-            .map(ApplicationCommandInteractionOptionValue::asString)
-            .orElse("")
-        val calendarNumber = event.options[0].getOption("calendar")
-            .flatMap(ApplicationCommandInteractionOption::getValue)
-            .map(ApplicationCommandInteractionOptionValue::asLong)
-            .map(Long::toInt)
-            .orElse(1)
-
         // Validate permissions
         val hasControlRole = permissionService.hasControlRole(settings.guildId, event.interaction.user.id)
         if (!hasControlRole) {
@@ -114,42 +97,12 @@ class EventCommand(
             return
         }
 
-        // Make sure calendar exists
-        val calendar = calendarService.getCalendar(settings.guildId, calendarNumber)
-        if (calendar == null) {
-            event.createFollowup(getCommonMsg("error.notFound.calendar", settings.locale))
-                .withEphemeral(ephemeral)
-                .awaitSingle()
-            return
-        }
-
-        val newWizard = EventWizardState(
-            guildId = settings.guildId,
-            userId = event.interaction.user.id,
-            editing = false,
-            entity = Event.PartialEvent(
-                id = null,
-                guildId = settings.guildId,
-                calendarNumber = calendarNumber,
-                name = name,
-                description = description,
-                location = location,
-                color = EventColor.NONE,
-                start = null,
-                end = null,
-                recur = false,
-                recurrence = null,
-                image = null,
-                timezone = calendar.timezone,
-            )
-        )
-        calendarService.putEventWizard(newWizard)
-
-        event.createFollowup(getMessage("create.success", settings))
-            .withEphemeral(ephemeral)
-            .withEmbeds(embedService.eventWizardEmbed(newWizard, settings))
-            .withComponents(*componentService.getWizardComponents(newWizard, settings))
-            .awaitSingle()
+        // Pop modal
+        event.presentModal()
+            .withCustomId("event-wizard.create-event")
+            .withTitle(getCommonMsg("modal.event.create.title", settings.locale))
+            .withComponents(*componentService.getEventCreateModalComponents(settings, calendarService.getAllCalendars(settings.guildId)))
+            .awaitSingleOrNull()
     }
 
     private suspend fun name(event: ChatInputInteractionEvent, settings: GuildSettings) {

client/src/main/kotlin/org/dreamexposure/discal/client/interaction/EventCreateModal.kt

@@ -0,0 +1,105 @@
+package org.dreamexposure.discal.client.interaction
+
+import discord4j.core.event.domain.interaction.ModalSubmitInteractionEvent
+import discord4j.core.`object`.component.StringSelectMenu
+import discord4j.core.`object`.component.TextInput
+import kotlinx.coroutines.reactor.awaitSingle
+import org.dreamexposure.discal.core.business.CalendarService
+import org.dreamexposure.discal.core.business.ComponentService
+import org.dreamexposure.discal.core.business.EmbedService
+import org.dreamexposure.discal.core.business.PermissionService
+import org.dreamexposure.discal.core.enums.event.EventColor
+import org.dreamexposure.discal.core.`object`.new.Event
+import org.dreamexposure.discal.core.`object`.new.EventWizardState
+import org.dreamexposure.discal.core.`object`.new.GuildSettings
+import org.dreamexposure.discal.core.utils.getCommonMsg
+import org.springframework.stereotype.Component
+
+@Component
+class EventCreateModal(
+    private val permissionService: PermissionService,
+    private val calendarService: CalendarService,
+    private val embedService: EmbedService,
+    private val componentService: ComponentService,
+): InteractionHandler<ModalSubmitInteractionEvent> {
+    override val ids = arrayOf("event-wizard.create-event")
+    override val ephemeral = true
+
+    override suspend fun handle(event: ModalSubmitInteractionEvent, settings: GuildSettings) {
+        val textInputs = event.getComponents(TextInput::class.java)
+        val selectInputs = event.getComponents(StringSelectMenu::class.java)
+
+        val name = textInputs.first { it.customId == "event.create.name" }
+            .value
+            .orElse("")
+        val description = textInputs.first { it.customId == "event.create.description" }
+            .value
+            .orElse("")
+        val location = textInputs.first { it.customId == "event.create.location" }
+            .value
+            .orElse("")
+        val calendarNumber = selectInputs.first { it.customId == "event.create.calendar" }
+            .values
+            .get()
+            .first()
+            .toInt()
+
+
+        // Validate permissions
+        val hasControlRole = permissionService.hasControlRole(settings.guildId, event.interaction.user.id)
+        if (!hasControlRole) {
+            event.createFollowup(getCommonMsg("error.perms.privileged", settings.locale))
+                .withEphemeral(ephemeral)
+                .awaitSingle()
+            return
+        }
+
+        // Check if wizard already started
+        val existingWizard = calendarService.getEventWizard(settings.guildId, event.interaction.user.id)
+        if (existingWizard != null) {
+            event.createFollowup(getCommonMsg("error.event.wizard.started", settings.locale))
+                .withEphemeral(ephemeral)
+                .withEmbeds(embedService.eventWizardEmbed(existingWizard, settings))
+                .withComponents(*componentService.getWizardComponents(existingWizard, settings))
+                .awaitSingle()
+            return
+        }
+
+        // Make sure calendar exists
+        val calendar = calendarService.getCalendar(settings.guildId, calendarNumber)
+        if (calendar == null) {
+            event.createFollowup(getCommonMsg("error.notFound.calendar", settings.locale))
+                .withEphemeral(ephemeral)
+                .awaitSingle()
+            return
+        }
+
+        val newWizard = EventWizardState(
+            guildId = settings.guildId,
+            userId = event.interaction.user.id,
+            editing = false,
+            entity = Event.PartialEvent(
+                id = null,
+                guildId = settings.guildId,
+                calendarNumber = calendarNumber,
+                name = name,
+                description = description,
+                location = location,
+                color = EventColor.NONE,
+                start = null,
+                end = null,
+                recur = false,
+                recurrence = null,
+                image = null,
+                timezone = calendar.timezone,
+            )
+        )
+        calendarService.putEventWizard(newWizard)
+
+        event.createFollowup(getCommonMsg("modal.event.create.success", settings.locale))
+            .withEphemeral(ephemeral)
+            .withEmbeds(embedService.eventWizardEmbed(newWizard, settings))
+            .withComponents(*componentService.getWizardComponents(newWizard, settings))
+            .awaitSingle()
+    }
+}

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

@@ -3,6 +3,8 @@ package org.dreamexposure.discal.core.business
 import discord4j.common.util.Snowflake
 import discord4j.core.`object`.component.*
 import discord4j.core.`object`.emoji.Emoji
+import org.dreamexposure.discal.core.extensions.autocompleteSafe
+import org.dreamexposure.discal.core.extensions.toMarkdown
 import org.dreamexposure.discal.core.`object`.new.*
 import org.dreamexposure.discal.core.utils.getCommonMsg
 import org.springframework.stereotype.Component
@@ -69,6 +71,37 @@ class ComponentService {
         return arrayOf(ActionRow.of(confirmButton, cancelButton))
     }
 
+    fun getEventCreateModalComponents(settings: GuildSettings, calendars: List<Calendar>): Array<LayoutComponent> {
+        val nameInput = TextInput.small("event.create.name")
+            .placeholder(getCommonMsg("modal.event.create.name.placeholder", settings.locale))
+            .required(false)
+
+        val descriptionInput = TextInput.paragraph("event.create.description")
+            .placeholder(getCommonMsg("modal.event.create.description.placeholder", settings.locale))
+            .required(false)
+
+        val locationInput = TextInput.small("event.create.location")
+            .placeholder(getCommonMsg("modal.event.create.location.placeholder", settings.locale))
+            .required(false)
+
+        // Generate calendar options
+        val calendarOptions = calendars.subList(0, 25.coerceAtMost(calendars.size)).map {
+            SelectMenu.Option.of("[${it.metadata.number}] ${it.name.toMarkdown().autocompleteSafe(6)}", it.metadata.number.toString())
+                .withDefault(it.metadata.number == 1)
+        }
+        val calendarSelect = SelectMenu.of("event.create.calendar", calendarOptions)
+            .withPlaceholder(getCommonMsg("modal.event.create.calendar.placeholder", settings.locale))
+            .required(true)
+
+
+        return arrayOf(
+            Label.of(getCommonMsg("modal.event.create.name.label", settings.locale), nameInput),
+            Label.of(getCommonMsg("modal.event.create.description.label", settings.locale), descriptionInput),
+            Label.of(getCommonMsg("modal.event.create.location.label", settings.locale), locationInput),
+            Label.of(getCommonMsg("modal.event.create.calendar.label", settings.locale), calendarSelect),
+        )
+    }
+
     fun getEventRecurrenceWeeklyModalComponents(settings: GuildSettings, event: Event.PartialEvent): Array<LayoutComponent> {
         // Determine pre-selected days
         val selectedDays = emptyList<DayOfWeek>().toMutableList()

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

@@ -6,35 +6,7 @@
       "name": "create",
       "type": 1,
       "description": "Starts the event creation wizard",
-      "required": false,
-      "options": [
-        {
-          "name": "name",
-          "type": 3,
-          "description": "The name of the new event",
-          "required": false
-        },
-        {
-          "name": "description",
-          "type": 3,
-          "description": "The description of the new event",
-          "required": false
-        },
-        {
-          "name": "location",
-          "type": 3,
-          "description": "The location of the new event",
-          "required": false
-        },
-        {
-          "name": "calendar",
-          "type": 4,
-          "description": "The calendar to create the event in (defaults to 1)",
-          "autocomplete":true,
-          "required": false,
-          "min_value": 1
-        }
-      ]
+      "required": false
     },
     {
       "name": "name",

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

@@ -1,4 +1,4 @@
-create.success=event wizard started! Please supply required information and then confirm the creation of your new \
+create.success=Event wizard started! Please supply required information and then confirm the creation of your new \
   event with `/event confirm`
 
 name.success=Successfully set the name of the event.

core/src/main/resources/i18n/common.properties

@@ -34,6 +34,7 @@ error.format.snowflake.message=Invalid Message ID provided. To get an ID see: \
 
 error.event.ended=That event has already ended!
 error.event.wizard.notStarted=The event wizard has not been started yet.
+error.event.wizard.started=Event wizard has already been started.
 
 error.calendar.max=The max amount of calendars have already been created. Consider supporting at \
   https://patreon.com/Novafox to unlock a greater limit.
@@ -48,6 +49,19 @@ dropdown.rsvp.option.not-going.label=Not going
 dropdown.rsvp.option.undecided.label=Undecided
 dropdown.rsvp.response.unexpected-option=The selected option was not recognized, please try again
 
+# Event create menus
+modal.event.create.title=Create Event
+modal.event.create.name.label=Name
+modal.event.create.name.placeholder=The name of your event...
+modal.event.create.description.label=Description
+modal.event.create.description.placeholder=A longer form description of your event...
+modal.event.create.location.label=Location
+modal.event.create.location.placeholder=Where your event is taking place...
+modal.event.create.calendar.label=Calendar
+modal.event.create.calendar.placeholder=The calendar to schedule your event on
+modal.event.create.success=Event wizard started! Please supply required information and then confirm the creation of your new \
+  event with `/event confirm`
+
 # Event Recurrence menus
 select.event.recurrence.days.label=Days of Week
 select.event.recurrence.month.label=Monthly Recurrence Options