Merge pull request #93 from the-programmers-hangout/develop

release: merge develop with master
the-programmers-hangout · Jun 16, 2021 · 45afe1c · 45afe1c
2 parents 1aaff27 + 5629c4a
commit 45afe1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/kotlin/me/ddivad/judgebot/Main.kt b/src/main/kotlin/me/ddivad/judgebot/Main.kt
@@ -57,7 +57,7 @@ suspend fun main(args: Array<String>) {
             field {
                 name = "Build Info"
                 value = "```" +
-                        "Version:   2.1.1\n" +
+                        "Version:   2.1.2\n" +
                         "DiscordKt: ${versions.library}\n" +
                         "Kotlin:    $kotlinVersion" +
                         "```"

diff --git a/src/main/kotlin/me/ddivad/judgebot/conversations/InfractionConversation.kt b/src/main/kotlin/me/ddivad/judgebot/conversations/InfractionConversation.kt
@@ -22,11 +22,17 @@ class InfractionConversation(private val databaseService: DatabaseService,
                 else guildConfiguration.infractionConfiguration.warnPoints
         val rules = databaseService.guilds.getRules(guild)
         val ruleId = if (rules.isNotEmpty()) {
-            val rule = promptEmbed(IntegerArg) { createInfractionRuleEmbed(guild, rules) }
+            respond { createInfractionRuleEmbed(guild, rules) }
+            val rule = promptUntil(
+                    IntegerArg,
+                    prompt = "Enter choice:",
+                    isValid = { number -> rules.any { it.number == number } || number == 0 },
+                    error = "Rule not found. Please enter a valid rule ID or 0:"
+            )
             if (rule > 0) rule else null
         } else null
         val infraction = Infraction(this.user.id.value, infractionReason, type, points, ruleId)
         infractionService.infract(targetUser, guild, user, infraction)
         respondMenu { createHistoryEmbed(targetUser, user, guild, configuration, databaseService) }
     }
-}
+}