Merge pull request #2 from devOS-Sanity-Edition/feat/vibe-check

⬆️✨ Update Yiski6 and added Heartbeat

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Run chmod to make gradlew executable

Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/java17-debian11
+FROM gcr.io/distroless/java21-debian12:latest
 
 ENV APP_HOME=/app
 

build.gradle.kts

@@ -2,9 +2,10 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    kotlin("plugin.serialization") version "1.7.20"
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    kotlin("jvm") version "2.0.0"
+    kotlin("plugin.serialization") version "2.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.ktor.plugin") version "2.3.12"
 }
 
 group = "one.devos"
@@ -24,7 +25,7 @@ val exposedVersion: String by project
 val ktorVersion: String by project
 
 dependencies {// Logger libraries for writing to the console
-    api("org.slf4j:slf4j-api:2.0.5")
+    api("org.slf4j:slf4j-api:2.0.13")
     implementation("ch.qos.logback:logback-classic:$logbackVersion")
     implementation("ch.qos.logback:logback-core:$logbackVersion")
     // Kotlin
@@ -33,7 +34,7 @@ dependencies {// Logger libraries for writing to the console
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-debug:$coroutinesVersion")
     // JSON Serialization
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2")
     // TOML Serialization - YW Devin
     implementation("com.akuleshov7:ktoml-core:$ktomlVersion")
     implementation("com.akuleshov7:ktoml-file:$ktomlVersion")
@@ -51,23 +52,23 @@ dependencies {// Logger libraries for writing to the console
     implementation("io.ktor:ktor-server-core:$ktorVersion")
     implementation("io.ktor:ktor-server-cio:$ktorVersion")
     // Aviation - Storm's command library made by Artrinix, will probably break
-    implementation("xyz.artrinix:aviation:8804d641")
+    implementation("xyz.artrinix:aviation:7d1dcef7")
     // Audio dependencies
     //implementation("dev.schlaubi.lavakord:jda:3.7.0")
     implementation("com.github.devoxin:lavaplayer:1.4.2")
     //implementation("com.sedmelluq:lavaplayer-natives:1.3.14")
     implementation("com.github.aikaterna:lavaplayer-natives:original-SNAPSHOT")
     // JDA
-    implementation("net.dv8tion:JDA:5.0.0-beta.6") {
+    implementation("net.dv8tion:JDA:5.0.1") {
         exclude(module = "opus-java")
     }
     // Kotlin Extensions for JDA
-    implementation("com.github.minndevelopment:jda-ktx:9fc90f6")
+    implementation("com.github.minndevelopment:jda-ktx:0.12.0")
 }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
         freeCompilerArgs = listOf("-Xinline-classes", "-Xopt-in=kotlin.RequiresOptIn")
     }
 }
@@ -82,4 +83,11 @@ tasks.withType<ShadowJar> {
             )
         )
     }
+}
+
+application { // apparently needed for ktor? ok.
+    mainClass.set("one.devos.yiski.YiskiKt")
+
+    val isDevelopment: Boolean = project.ext.has("development")
+    applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
 }

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
-logbackVersion=1.4.4
-coroutinesVersion=1.6.4
-ktomlVersion=0.3.0
-exposedVersion=0.41.1
-ktorVersion=2.2.1
+logbackVersion=1.5.8
+coroutinesVersion=1.9.0-RC.2
+ktomlVersion=0.5.2
+exposedVersion=0.54.0
+ktorVersion=2.3.12

gradle/wrapper/gradle-wrapper.properties

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

src/main/kotlin/one/devos/yiski/Yiski.kt

@@ -5,6 +5,11 @@ import dev.minn.jda.ktx.events.listener
 import dev.minn.jda.ktx.generics.getChannel
 import dev.minn.jda.ktx.jdabuilder.default
 import dev.minn.jda.ktx.jdabuilder.intents
+import io.ktor.server.application.*
+import io.ktor.server.cio.*
+import io.ktor.server.engine.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
 import kotlinx.coroutines.runBlocking
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.entities.Activity
@@ -140,6 +145,9 @@ object Yiski {
                 }
             }
         }
+
+        io.ktor.server.engine.embeddedServer(CIO, port = 8080, host = "0.0.0.0", module = Application::module)
+            .start(wait = true)
     }
 
     private fun listenAviationEvents() {
@@ -151,4 +159,16 @@ object Yiski {
             logger.error("[Command Execution] A command has failed. ", this.error)
         }
     }
+}
+
+fun Application.module() {
+    configureRouting()
+}
+
+fun Application.configureRouting() {
+    routing {
+        get("/heartbeat") {
+            call.respondText("howdy")
+        }
+    }
 }

src/main/kotlin/one/devos/yiski/audio/Audio.kt

@@ -7,6 +7,7 @@ import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import net.dv8tion.jda.api.audio.SpeakingMode
 import net.dv8tion.jda.api.audio.hooks.ConnectionListener
 import net.dv8tion.jda.api.audio.hooks.ConnectionStatus
 import net.dv8tion.jda.api.entities.Guild
@@ -17,6 +18,7 @@ import net.dv8tion.jda.api.managers.AudioManager
 import one.devos.yiski.Yiski
 import one.devos.yiski.audio.lavaplayer.ByteAudioSourceManager
 import one.devos.yiski.tiktok.Voices
+import java.util.*
 
 object Audio {
     /**
@@ -72,7 +74,11 @@ object Audio {
                     }
                 }
 
-                override fun onUserSpeaking(user: User, speaking: Boolean) {
+//                override fun onUserSpeaking(user: User, speaking: Boolean) {
+//
+//                }
+
+                override fun onUserSpeakingModeUpdate(user: User, modes: EnumSet<SpeakingMode>) {
 
                 }
             }