stage: add slash commands

build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
     application
-    id("com.google.cloud.tools.jib") version "2.8.0"
-    kotlin("jvm") version "1.5.0"
-    kotlin("kapt") version "1.5.0"
-    kotlin("plugin.serialization") version "1.5.0"
+    id("com.google.cloud.tools.jib") version "3.1.1"
+    kotlin("jvm") version "1.5.10"
+    kotlin("kapt") version "1.5.10"
+    kotlin("plugin.serialization") version "1.5.10"
 }
 
 group = "to.rxs"
@@ -17,9 +17,9 @@ repositories {
 dependencies {
     runtimeOnly(kotlin("scripting-jsr223"))
 
-    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8", "1.5.0-RC")
+    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8", "1.5.0")
 
-    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-core", "1.2.0")
+    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-core", "1.2.1")
 
     implementation("io.github.pdvrieze.xmlutil", "core-jvm", "0.81.2")
     implementation("io.github.pdvrieze.xmlutil", "serialization-jvm", "0.81.2")
@@ -36,14 +36,10 @@ dependencies {
 
     implementation("org.xerial", "sqlite-jdbc", "3.34.0")
 
-    implementation("io.ktor", "ktor-server-netty", "1.5.3")
-    implementation("io.ktor", "ktor-serialization", "1.5.3")
+    implementation("io.ktor", "ktor-server-netty", "1.5.4")
+    implementation("io.ktor", "ktor-serialization", "1.5.4")
 
-    implementation("dev.kord", "kord-core", "kotlin-1.5-20210505.195343-2") {
-        version {
-            strictly("kotlin-1.5-20210505.195343-2")
-        }
-    }
+    implementation("dev.kord", "kord-core", "0.7.x-SNAPSHOT")
 
     implementation("dev.kord.x", "emoji", "0.5.0-SNAPSHOT")
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/to/rxs/kommunity/Config.kt

@@ -1,5 +1,6 @@
 package to.rxs.kommunity
 
+import dev.kord.common.entity.Snowflake
 import org.apache.logging.log4j.Level
 import to.rxs.kommunity.util.EnvironmentConfig
 
@@ -16,6 +17,7 @@ object Config : EnvironmentConfig("") {
     val DISCORD_TOKEN by getEnv()
     val NOTIFICATION_SERVER_PORT by getEnv(1337) { it.toInt() }
     val GUILD_ID by getEnv()
+    val ROLES by getEnv { createRolesMap(it) }
     val SERVER_NEWS_ROLE by getEnv()
     val VIDEO_NEWS_ROLE by getEnv()
     val STREAM_NEWS_ROLE by getEnv()
@@ -31,3 +33,13 @@ enum class Environment {
     DEVELOPMENT,
     PRODUCTION
 }
+
+fun createRolesMap  (env: String) : Map<String, Snowflake> {
+    val roles = HashMap<String, Snowflake>()
+    val parts = env.split(",")
+    for (part: String in parts) {
+        val separated = part.split(":")
+        roles[separated[0]] = Snowflake(separated[1])
+    }
+    return roles
+}

src/main/kotlin/to/rxs/kommunity/Kommunity.kt

@@ -15,6 +15,7 @@ import kotlinx.coroutines.launch
 import mu.KotlinLogging
 import to.rxs.kommunity.core.GameAnimator
 import to.rxs.kommunity.io.connect
+import to.rxs.kommunity.listeners.interactionListener
 import to.rxs.kommunity.listeners.joinListener
 import to.rxs.kommunity.listeners.selfMentionListener
 import to.rxs.kommunity.youtube.CallbackServer
@@ -54,6 +55,7 @@ class Kommunity {
             kord.apply {
                 selfMentionListener()
                 joinListener()
+                interactionListener()
                 on<ReadyEvent> {
                     start()
                 }

src/main/kotlin/to/rxs/kommunity/commands/NewCommand.kt → src/main/kotlin/to/rxs/kommunity/commands/message/NewCommand.kt

@@ -10,8 +10,8 @@ import dev.kord.x.commands.kord.argument.TextChannelArgument
 import dev.kord.x.commands.kord.module.module
 import dev.kord.x.commands.model.command.invoke
 import io.ktor.client.request.*
-import to.rxs.kommunity.commands.arguments.HastebinArgument
-import to.rxs.kommunity.commands.arguments.URLArgument
+import to.rxs.kommunity.commands.message.arguments.HastebinArgument
+import to.rxs.kommunity.commands.message.arguments.URLArgument
 import to.rxs.kommunity.util.httpClient
 import to.rxs.kommunity.util.withPermission
 

src/main/kotlin/to/rxs/kommunity/commands/arguments/Arguments.kt → src/main/kotlin/to/rxs/kommunity/commands/message/arguments/Arguments.kt

@@ -1,4 +1,4 @@
-package to.rxs.kommunity.commands.arguments
+package to.rxs.kommunity.commands.message.arguments
 
 internal val HastebinArgument = RegexArgument(
     "hastebin.com/blah.kotlin",

src/main/kotlin/to/rxs/kommunity/commands/arguments/RegexArgument.kt → src/main/kotlin/to/rxs/kommunity/commands/message/arguments/RegexArgument.kt

@@ -1,4 +1,4 @@
-package to.rxs.kommunity.commands.arguments
+package to.rxs.kommunity.commands.message.arguments
 
 import dev.kord.x.commands.argument.SingleWordArgument
 import dev.kord.x.commands.argument.result.WordResult

src/main/kotlin/to/rxs/kommunity/commands/slash/SlashCommand.kt

@@ -0,0 +1,12 @@
+package to.rxs.kommunity.commands.slash
+
+import dev.kord.common.annotation.KordPreview
+import dev.kord.core.Kord
+import dev.kord.core.entity.interaction.Interaction
+
+@KordPreview
+interface SlashCommand {
+
+    suspend fun handle(kord: Kord, interaction: Interaction)
+
+}

src/main/kotlin/to/rxs/kommunity/commands/slash/impl/OptSlashCommand.kt

@@ -0,0 +1,41 @@
+package to.rxs.kommunity.commands.slash.impl
+
+import dev.kord.common.annotation.KordPreview
+import dev.kord.core.Kord
+import dev.kord.core.behavior.interaction.respondPublic
+import dev.kord.core.entity.GuildEmoji
+import dev.kord.core.entity.ReactionEmoji
+import dev.kord.core.entity.interaction.Interaction
+import dev.kord.x.emoji.Emojis
+import to.rxs.kommunity.Config
+import to.rxs.kommunity.commands.slash.SlashCommand
+import to.rxs.kommunity.misc.EmojiHelper
+
+@KordPreview
+object OptSlashCommand : SlashCommand {
+
+    override suspend fun handle(kord: Kord, interaction: Interaction) {
+        val action = interaction.command.options["action"]!!.value
+        val guild = kord.getGuild(interaction.data.guildId.value!!)!!
+        val role = Config.ROLES[interaction.command.options["notification"]!!.value]!!
+
+        if (action == "in") {
+            kord.rest.guild.addRoleToGuildMember(guild.id, interaction.user.id, role, "User opt in command")
+        } else if (action == "out") {
+            kord.rest.guild.deleteRoleFromGuildMember(guild.id, interaction.user.id, role, "User opt out command")
+        }
+
+        interaction.respondPublic {
+            embed {
+                title = "${EmojiHelper.SUCCESS} Success!"
+                description = "Successfully opted ${
+                    when (action) {
+                        "in" -> "**in** to"
+                        "out" -> "**out** from"
+                        else -> "undefined"
+                    }
+                } `${interaction.command.options["notification"]!!.value}` notifications!"
+            }
+        }
+    }
+}

src/main/kotlin/to/rxs/kommunity/listeners/InteractionListener.kt

@@ -0,0 +1,17 @@
+package to.rxs.kommunity.listeners
+
+import dev.kord.common.annotation.KordPreview
+import dev.kord.core.Kord
+import dev.kord.core.event.interaction.InteractionCreateEvent
+import dev.kord.core.on
+import mu.KotlinLogging
+import to.rxs.kommunity.commands.slash.impl.OptSlashCommand
+
+private val log = KotlinLogging.logger {}
+
+@OptIn(KordPreview::class)
+fun Kord.interactionListener() = on<InteractionCreateEvent> {
+    when (interaction.command.rootName) {
+        "opt" -> OptSlashCommand.handle(kord, interaction)
+    }
+}

src/main/kotlin/to/rxs/kommunity/misc/EmojiHelper.kt

@@ -0,0 +1,7 @@
+package to.rxs.kommunity.misc
+
+object EmojiHelper {
+
+    const val SUCCESS = "<:check:739205319237959820>"
+
+}

src/main/kotlin/to/rxs/kommunity/youtube/YoutubeEventListener.kt

@@ -3,9 +3,9 @@ package to.rxs.kommunity.youtube
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
 import io.ktor.client.request.*
+import kotlinx.datetime.Instant
 import to.rxs.kommunity.Config
 import to.rxs.kommunity.util.httpClient
-import java.time.Instant
 
 class YoutubeEventListener(private val client: Kord) : YouTubeEventSubscriber {