Skip to content

Commit 5079c82

Browse files
committed
Readd JDA-KTX and accept using JDA 5 instead of 6, and start gutting
1 parent d3d6084 commit 5079c82

39 files changed

+118
-1412
lines changed

glyph-bot/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dependencies {
1818
implementation(libs.google.cloud.dialogflow)
1919
implementation(libs.google.cloud.storage)
2020
implementation(libs.jda)
21+
implementation(libs.jda.ktx)
2122
implementation(libs.jsoup)
2223
implementation(libs.ktor.client.content.negotiation)
2324
implementation(libs.ktor.client.java)
@@ -27,7 +28,6 @@ dependencies {
2728
implementation(libs.prettytime)
2829
implementation(libs.typesafe.config)
2930

30-
3131
testImplementation(kotlin("test"))
3232
}
3333

glyph-bot/src/Director.kt

Lines changed: 0 additions & 43 deletions
This file was deleted.

glyph-bot/src/Glyph.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ package org.yttr.glyph.bot
22

33
import com.typesafe.config.Config
44
import com.typesafe.config.ConfigFactory
5+
import dev.minn.jda.ktx.interactions.commands.updateCommands
6+
import dev.minn.jda.ktx.jdabuilder.default
7+
import dev.minn.jda.ktx.jdabuilder.intents
58
import io.lettuce.core.RedisClient
6-
import net.dv8tion.jda.api.JDABuilder
79
import net.dv8tion.jda.api.requests.GatewayIntent
810
import org.yttr.glyph.bot.modules.HelpModule
911
import org.yttr.glyph.bot.modules.SnowstampModule
@@ -41,19 +43,19 @@ object Glyph {
4143
* Build the bot and run
4244
*/
4345
fun run() {
44-
val jda = JDABuilder.createDefault(conf.getString("discord-token"))
45-
.enableIntents(GatewayIntent.GUILD_MEMBERS)
46-
.build()
47-
48-
val commands = jda.updateCommands()
46+
val jda = default(conf.getString("discord-token")) {
47+
intents += GatewayIntent.GUILD_MESSAGES
48+
}
4949

5050
for (module in modules) {
51-
jda.addEventListener(module)
52-
module.register()
53-
commands.addCommands(module.commands())
51+
module.boot(jda)
5452
}
5553

56-
commands.queue()
54+
jda.updateCommands {
55+
for (module in modules) {
56+
module.updateCommands(commands = this)
57+
}
58+
}
5759
}
5860
}
5961

glyph-bot/src/ai/AIAgent.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

glyph-bot/src/ai/AIFulfillment.kt

Lines changed: 0 additions & 11 deletions
This file was deleted.

glyph-bot/src/ai/AIResponse.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

glyph-bot/src/ai/AIResult.kt

Lines changed: 0 additions & 33 deletions
This file was deleted.

glyph-bot/src/ai/dialogflow/Dialogflow.kt

Lines changed: 0 additions & 64 deletions
This file was deleted.

glyph-bot/src/ai/dialogflow/DialogflowFulfillment.kt

Lines changed: 0 additions & 14 deletions
This file was deleted.

glyph-bot/src/ai/dialogflow/DialogflowResponse.kt

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)