Add ability to specify event duration when setting the start

This now means the event end command is no longer required, eliminating a step for some users

Author: NovaFox161

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

@@ -251,6 +251,10 @@ class EventCommand(
             .map(Long::toInt)
             .map { it.coerceAtLeast(0).coerceAtMost(59) }
             .orElse(0)
+        val duration = event.options[0].getOption("duration")
+            .flatMap(ApplicationCommandInteractionOption::getValue)
+            .map(ApplicationCommandInteractionOptionValue::asLong)
+            .getOrNull()
         val keepDuration = event.options[0].getOption("keep-duration")
             .flatMap(ApplicationCommandInteractionOption::getValue)
             .map(ApplicationCommandInteractionOptionValue::asBoolean)
@@ -280,7 +284,7 @@ class EventCommand(
         ).toInstant()
 
         if (existingWizard.entity.end == null) {
-            val modifiedWizard = existingWizard.copy(entity = existingWizard.entity.copy(start = start, end = start.plus(1, ChronoUnit.HOURS)))
+            val modifiedWizard = existingWizard.copy(entity = existingWizard.entity.copy(start = start, end = start.plus(duration ?: 1, ChronoUnit.HOURS)))
             calendarService.putEventWizard(modifiedWizard)
 
             // Handle special messaging if event is scheduled for the past
@@ -299,7 +303,7 @@ class EventCommand(
             val shouldChangeDuration = keepDuration && originalDuration != null
 
             if (existingWizard.entity.end!!.isAfter(start) || shouldChangeDuration) {
-                val modifiedEnd = if (shouldChangeDuration) start.plus(originalDuration) else existingWizard.entity.end
+                val modifiedEnd = if (duration != null) start.plus(duration, ChronoUnit.HOURS) else if (shouldChangeDuration) start.plus(originalDuration) else existingWizard.entity.end
                 val modifiedWizard = existingWizard.copy(entity = existingWizard.entity.copy(start = start, end = modifiedEnd))
                 calendarService.putEventWizard(modifiedWizard)
 

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

@@ -252,6 +252,13 @@
           "min_value": 0,
           "max_value": 59
         },
+        {
+          "name": "duration",
+          "type": 4,
+          "description": "The length of the event, in hours",
+          "required": false,
+          "min_value": 0
+        },
         {
           "name": "keep-duration",
           "type": 5,

web/src/main/html/templates/various/commands.html

@@ -423,7 +423,7 @@ <h2 class="text-center text-discal-blue">/event commands</h2>
                         <tr class="flex-table" role="rowgroup">
                             <td class="tb-flex-row tb-command" role="cell">start</td>
                             <td class="tb-flex-row" role="cell">Sets the event's start</td>
-                            <td class="tb-flex-row tb-usage" role="cell">/event start [yyyy] [MM] [dd] (hh) (mm)</td>
+                            <td class="tb-flex-row tb-usage" role="cell">/event start [yyyy] [MM] [dd] (hh) (mm) (duration) (keep-duration)</td>
                             <td class="tb-flex-row tb-access" role="cell">privileged</td>
                         </tr>