DiscordKt 0.24.0

the-programmers-hangout · Jun 14, 2024 · fdce021 · fdce021
1 parent eb06211
commit fdce021
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 23 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,26 +1,29 @@
 group = "me.moeszyslak"
-version = "2.0.2"
+version = "2.0.3"
 description = "A multi-guild logging bot"
 
 plugins {
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.serialization") version "1.7.10"
-    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"
 }
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation("me.jakejmattson:DiscordKt:0.23.4")
-    implementation("com.google.guava:guava:30.0-jre")
+    implementation("me.jakejmattson:DiscordKt:0.24.0")
+    implementation("com.google.guava:guava:33.2.1-jre")
 }
 
 tasks {
+    kotlin {
+        jvmToolchain(11)
+    }
+
     compileKotlin {
-        kotlinOptions.jvmTarget = "1.8"
-        dependsOn("writeProperties")
+        doLast("writeProperties") {}
     }
 
     register<WriteProperties>("writeProperties") {

diff --git a/src/main/kotlin/me/moeszyslak/logbot/Main.kt b/src/main/kotlin/me/moeszyslak/logbot/Main.kt
@@ -3,10 +3,12 @@ package me.moeszyslak.logbot
 import dev.kord.common.annotation.KordPreview
 import dev.kord.common.entity.Permission
 import dev.kord.common.entity.Permissions
+import dev.kord.core.event.message.MessageCreateEvent
+import dev.kord.core.event.message.ReactionAddEvent
 import dev.kord.gateway.Intent
 import dev.kord.gateway.PrivilegedIntent
 import me.jakejmattson.discordkt.dsl.bot
-import me.jakejmattson.discordkt.extensions.plus
+import me.jakejmattson.discordkt.util.intentsOf
 import me.moeszyslak.logbot.dataclasses.Configuration
 import me.moeszyslak.logbot.services.LoggerService
 import java.awt.Color
@@ -26,7 +28,7 @@ suspend fun main() {
             commandReaction = null
             recommendCommands = false
             defaultPermissions = Permissions(Permission.ManageMessages)
-            intents = Intent.GuildMembers + Intent.GuildVoiceStates + Intent.GuildMessageReactions + Intent.DirectMessagesReactions
+            intents = Intent.GuildMembers + Intent.GuildVoiceStates + intentsOf<ReactionAddEvent>() + intentsOf<MessageCreateEvent>()
         }
 
         onStart {

diff --git a/src/main/kotlin/me/moeszyslak/logbot/embeds/MessageEditEmbeds.kt b/src/main/kotlin/me/moeszyslak/logbot/embeds/MessageEditEmbeds.kt
@@ -2,7 +2,7 @@ package me.moeszyslak.logbot.embeds
 
 import dev.kord.common.kColor
 import dev.kord.rest.builder.message.EmbedBuilder
-import me.jakejmattson.discordkt.extensions.simpleDescriptor
+import me.jakejmattson.discordkt.util.simpleDescriptor
 import me.moeszyslak.logbot.extensions.createContinuableField
 import me.moeszyslak.logbot.services.CachedMessage
 import java.awt.Color

diff --git a/src/main/kotlin/me/moeszyslak/logbot/listeners/MessageListener.kt b/src/main/kotlin/me/moeszyslak/logbot/listeners/MessageListener.kt
@@ -25,7 +25,7 @@ import java.time.Instant
 fun messageListener(configuration: Configuration, cacheService: CacheService, discord: Discord) = listeners {
     on<MessageCreateEvent> {
         message.author?.takeUnless { it.isBot } ?: return@on
-        val guild = getGuild() ?: return@on
+        val guild = getGuildOrNull() ?: return@on
         val guildConfig = configuration[guild.id] ?: return@on
 
         if (message.content.isEmpty()) return@on
@@ -51,7 +51,7 @@ fun messageListener(configuration: Configuration, cacheService: CacheService, di
         if (newContent.isEmpty()) return@on
         if (!guildConfig.listenerEnabled(Listener.Messages)) return@on
 
-        val guild = discord.kord.getGuild(guildId) ?: return@on
+        val guild = discord.kord.getGuildOrNull(guildId) ?: return@on
         val member = new.member.value ?: return@on
 
         if (!shouldBeLogged(member.roles.map { guild.getRole(it) }, guildConfig.ignoredRoles)) return@on
@@ -97,12 +97,12 @@ fun messageListener(configuration: Configuration, cacheService: CacheService, di
     }
 
     on<MessageDeleteEvent> {
-        val guild = getGuild() ?: return@on
+        val guild = getGuildOrNull() ?: return@on
         logMessageDelete(kord, guild.id, messageId)
     }
 
     on<MessageBulkDeleteEvent> {
-        val guild = getGuild() ?: return@on
+        val guild = getGuildOrNull() ?: return@on
         messageIds.forEach { logMessageDelete(kord, guild.id, it) }
     }
 }

diff --git a/src/main/kotlin/me/moeszyslak/logbot/listeners/ReactionListener.kt b/src/main/kotlin/me/moeszyslak/logbot/listeners/ReactionListener.kt
@@ -3,14 +3,14 @@ package me.moeszyslak.logbot.listeners
 import dev.kord.core.event.message.ReactionAddEvent
 import dev.kord.core.event.message.ReactionRemoveEvent
 import me.jakejmattson.discordkt.dsl.listeners
-import me.jakejmattson.discordkt.extensions.jumpLink
+import me.jakejmattson.discordkt.util.jumpLink
 import me.moeszyslak.logbot.dataclasses.Configuration
 import me.moeszyslak.logbot.dataclasses.Listener
 import me.moeszyslak.logbot.services.LoggerService
 
 fun reactionListener(loggerService: LoggerService, configuration: Configuration) = listeners {
     on<ReactionAddEvent> {
-        val guild = getGuild() ?: return@on
+        val guild = getGuildOrNull() ?: return@on
 
         val guildConfig = configuration[guild.id] ?: return@on
         if (!guildConfig.listenerEnabled(Listener.Reactions)) return@on
@@ -21,7 +21,7 @@ fun reactionListener(loggerService: LoggerService, configuration: Configuration)
     }
 
     on<ReactionRemoveEvent> {
-        val guild = getGuild() ?: return@on
+        val guild = getGuildOrNull() ?: return@on
 
         val guildConfig = configuration[guild.id] ?: return@on
         if (!guildConfig.listenerEnabled(Listener.Reactions)) return@on

diff --git a/src/main/kotlin/me/moeszyslak/logbot/services/LoggerService.kt b/src/main/kotlin/me/moeszyslak/logbot/services/LoggerService.kt
@@ -6,14 +6,14 @@ import dev.kord.core.behavior.channel.createMessage
 import dev.kord.core.behavior.getChannelOf
 import dev.kord.core.entity.*
 import dev.kord.core.entity.channel.TextChannel
-import dev.kord.rest.builder.message.create.allowedMentions
+import dev.kord.rest.builder.message.allowedMentions
 import kotlinx.coroutines.*
 import kotlinx.datetime.toJavaInstant
 import me.jakejmattson.discordkt.Discord
 import me.jakejmattson.discordkt.annotations.Service
-import me.jakejmattson.discordkt.extensions.TimeStamp
-import me.jakejmattson.discordkt.extensions.TimeStyle
-import me.jakejmattson.discordkt.extensions.descriptor
+import me.jakejmattson.discordkt.util.TimeStamp
+import me.jakejmattson.discordkt.util.TimeStyle
+import me.jakejmattson.discordkt.util.descriptor
 import me.moeszyslak.logbot.dataclasses.Configuration
 
 data class LogMessage(

diff --git a/src/main/resources/bot.properties b/src/main/resources/bot.properties
@@ -1,4 +1,4 @@
 description=A multi-guild logging bot
 name=LogBot
 url=https\://github.com/the-programmers-hangout/LogBot
-version=2.0.2
+version=2.0.3