Merge branch 'command-check-and-call-extras'

Author: yttrian

README.md

@@ -30,7 +30,7 @@ dependencies {
     implementation("net.dv8tion:JDA:4.2.1_253") {
         exclude(module = "opus-java") // optional, for if you don't plan to use voice chat
     }
-    implementation("com.github.yttrian:koncorda:0.3.0")
+    implementation("com.github.yttrian:koncorda:0.3.1")
 }
 ```
 

build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "org.yttr"
-version = "0.3.0"
+version = "0.3.1"
 
 plugins {
     id("tanvd.kosogor") version "1.0.10" apply true

koncorda/src/main/kotlin/command/CommandCall.kt

@@ -1,13 +1,30 @@
 package org.yttr.koncorda.command
 
 import kotlinx.coroutines.future.await
+import net.dv8tion.jda.api.MessageBuilder
+import net.dv8tion.jda.api.entities.Message
+import net.dv8tion.jda.api.entities.MessageEmbed
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 
 data class CommandCall(val event: MessageReceivedEvent, val args: List<String>) {
     /**
-     * Respond to the event.
+     * Respond to the event with text.
      */
     suspend fun MessageReceivedEvent.respond(content: String) {
-        if (content.isNotBlank()) channel.sendMessage(content).submit().await()
+        if (content.isNotBlank()) respond(MessageBuilder().setContent(content).build())
+    }
+
+    /**
+     * Respond to the event with an embed.
+     */
+    suspend fun MessageReceivedEvent.respond(embed: MessageEmbed) {
+        respond(MessageBuilder().setEmbed(embed).build())
+    }
+
+    /**
+     * Respond the the event with a complex message.
+     */
+    suspend fun MessageReceivedEvent.respond(message: Message) {
+        channel.sendMessage(message).submit().await()
     }
 }

koncorda/src/main/kotlin/command/check/CommandCheck.kt

@@ -5,3 +5,23 @@ import org.yttr.koncorda.command.CommandCall
 interface CommandCheck {
     suspend fun check(call: CommandCall): Boolean
 }
+
+infix fun CommandCheck.or(right: CommandCheck): CommandCheck = composite(this, right, Boolean::or)
+
+infix fun CommandCheck.and(right: CommandCheck): CommandCheck = composite(this, right, Boolean::and)
+
+operator fun CommandCheck.not(): CommandCheck = object : CommandCheck {
+    override suspend fun check(call: CommandCall): Boolean = !this@not.check(call)
+}
+
+private fun composite(
+    left: CommandCheck,
+    right: CommandCheck,
+    predicate: (Boolean, Boolean) -> Boolean
+): CommandCheck {
+    return object : CommandCheck {
+        override suspend fun check(call: CommandCall): Boolean {
+            return predicate(left.check(call), right.check(call))
+        }
+    }
+}

koncorda/src/test/kotlin/TestBot.kt

@@ -1,9 +1,13 @@
 import command.HelpCommand
 import command.TestCommand
 import command.check.Useless
+import net.dv8tion.jda.api.MessageBuilder
 import net.dv8tion.jda.api.requests.GatewayIntent
 import org.yttr.koncorda.await
 import org.yttr.koncorda.command.check.Impossible
+import org.yttr.koncorda.command.check.and
+import org.yttr.koncorda.command.check.not
+import org.yttr.koncorda.command.check.or
 import org.yttr.koncorda.commands
 import org.yttr.koncorda.koncorda
 import org.yttr.koncorda.onReady
@@ -30,7 +34,16 @@ fun main() {
                 event.respond("Hello ${event.author}!")
             }
             check(Useless) {
-                leaf("world") { event.respond("Yay!") }
+                leaf("world") { event.respond(MessageBuilder().setContent("Yay!").build()) }
+            }
+            check(Useless and Impossible) {
+                leaf("everyone") { event.respond("Huh?") }
+            }
+            check(Useless and !Impossible) {
+                leaf("everybody") { event.respond("Hmm.") }
+            }
+            check(Useless or Impossible) {
+                leaf("everything") { event.respond("Hmm.") }
             }
         }