refactor: Minor Update

Bumped hikari version to 5.0.1
Fixed logs reporting bot actions
Removed leftover message delete logger in MessageEvents.kt
Did a bit of refractoring and cleanup in RoleSelector.kt

Author: DaRacci

build.gradle.kts

@@ -37,6 +37,7 @@ dependencies {
     implementation(libs.kaml)
 
     // TOML reader
+    @Suppress("GradlePackageUpdate")
     implementation("com.github.jezza:toml:1.2")
 
     // Github API
@@ -48,7 +49,7 @@ dependencies {
     implementation("org.jetbrains.exposed:exposed-jdbc:0.37.3")
 
     // Hikari
-    implementation("com.zaxxer:HikariCP:5.0.0")
+    implementation("com.zaxxer:HikariCP:5.0.1")
 
     // SQLite
     implementation("org.xerial:sqlite-jdbc:3.36.0.3")

gradle.properties

@@ -1,4 +1,4 @@
-# Gradle props
+# suppress inspection "UnusedProperty" for whole file
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1536M
 org.gradle.parallel=true
 kotlin.incremental=true

src/main/kotlin/dev/racci/elixir/events/LogEvents.kt

@@ -30,7 +30,7 @@ class LogEvents: Extension() {
 
         event<MessageDeleteEvent> {
             action {
-                if(event.message?.author?.id == kord.selfId) return@action
+                if(event.message?.asMessageOrNull()?.author?.isBot == true) return@action
                 val messageContent = event.message?.asMessageOrNull()?.content.toString()
                 val eventMessage = event.message
                 val messageLocation = event.channel.id.value

src/main/kotlin/dev/racci/elixir/events/MessageEvents.kt

@@ -4,7 +4,6 @@
 package dev.racci.elixir.events
 
 import com.kotlindiscord.kord.extensions.DISCORD_BLURPLE
-import com.kotlindiscord.kord.extensions.DISCORD_PINK
 import com.kotlindiscord.kord.extensions.components.components
 import com.kotlindiscord.kord.extensions.components.ephemeralButton
 import com.kotlindiscord.kord.extensions.extensions.Extension
@@ -13,18 +12,13 @@ import com.kotlindiscord.kord.extensions.sentry.BreadcrumbType
 import com.kotlindiscord.kord.extensions.types.respond
 import com.kotlindiscord.kord.extensions.utils.download
 import dev.kord.common.entity.ButtonStyle
-import dev.kord.core.behavior.channel.GuildMessageChannelBehavior
 import dev.kord.core.behavior.channel.createEmbed
 import dev.kord.core.behavior.edit
 import dev.kord.core.entity.Message
-import dev.kord.core.entity.channel.thread.ThreadChannel
 import dev.kord.core.event.message.MessageCreateEvent
-import dev.kord.core.event.message.MessageDeleteEvent
 import dev.kord.rest.builder.message.modify.actionRow
 import dev.kord.rest.builder.message.modify.embed
-import dev.racci.elixir.utils.MESSAGE_LOGS
 import dev.racci.elixir.utils.ResponseHelper
-import dev.racci.elixir.utils.SUPPORT_CHANNEL
 import io.ktor.client.HttpClient
 import io.ktor.client.request.post
 import io.ktor.client.statement.HttpResponse
@@ -41,54 +35,6 @@ class MessageEvents: Extension() {
     private val LOG_FILE_EXTENSIONS = setOf("log", "gz", "txt")
 
     override suspend fun setup() {
-        /**
-         * Log the deletion of messages to the guilds [MESSAGE_LOGS] channel
-         * @author NoComment1105
-         */
-        event<MessageDeleteEvent> {
-            action {
-                // Ignore messages from Elixir itself
-                if(event.message?.author?.id == kord.selfId) return@action
-                if(event.message?.channel !is ThreadChannel && event.message?.channel?.id == SUPPORT_CHANNEL) return@action
-
-                val actionLog = event.guild?.getChannel(MESSAGE_LOGS) as GuildMessageChannelBehavior
-                val messageContent = event.message?.asMessageOrNull()?.content.toString()
-                val eventMessage = event.message
-                val messageLocation = event.channel.id.value
-
-                actionLog.createEmbed {
-                    color = DISCORD_PINK
-                    title = "Message Deleted"
-                    description = "Location: <#$messageLocation>"
-                    timestamp = Clock.System.now()
-
-                    field {
-                        name = "Message Contents:"
-                        value =
-                            messageContent.ifEmpty {
-                                "Failed to get content of message\nMessage was likely from a Bot"
-                            }
-                        inline = false
-                    }
-                    field {
-                        name = "Message Author:"
-                        value = eventMessage?.author?.tag.toString()
-                        inline = true
-                    }
-                    field {
-                        name = "Author ID:"
-                        value = eventMessage?.author?.id.toString()
-                        inline = true
-                    }
-                }
-
-                sentry.breadcrumb(BreadcrumbType.Info) {
-                    category = "events.messageevents.MessageDeleted"
-                    message = "A message was deleted"
-                    data["content"] = messageContent.ifEmpty {"Failed to get content of message"}
-                }
-            }
-        }
 
         /**
          * Upload files that have the extensions specified in [LOG_FILE_EXTENSIONS] to hastebin, giving a user confirmation

src/main/kotlin/dev/racci/elixir/extensions/RoleSelector.kt

@@ -82,9 +82,9 @@ class RoleSelector: Extension() {
                 rsl["name"] as String,
                 rsl["channel"] as Long,
                 rsl["autoRemoveOnLimit", false] as Boolean,
-                rsl.getOrDefault("attachment", "") as String,
-                (rsl.getOrDefault("limit", -1) as Long).toInt(),
-                rsl.getOrDefault("removable", true) as Boolean,
+                rsl["attachment", ""] as String,
+                rsl["limit", -1] as Long,
+                rsl["removable", true] as Boolean,
                 rsl["role"] as TomlArray?
             )
         }
@@ -143,13 +143,13 @@ class RoleSelector: Extension() {
     }
 
     private suspend fun roleLimitCheck(
-        limit: Int,
+        limit: Long,
         autoRemoveOnLimit: Boolean,
         member: MemberBehavior,
         selectorRoles: List<RoleBehavior>,
         context: PublicInteractionButtonContext,
     ): String? {
-        if(limit == -1) return ""
+        if(limit == -1L) return ""
         val conflictingRoles = member.asMember().roles.filter(selectorRoles::contains)
         if(conflictingRoles.count() < limit) return ""
         return if(autoRemoveOnLimit) {
@@ -167,11 +167,12 @@ class RoleSelector: Extension() {
     }
 
     private suspend fun roleIncompatibleWithCheck(
-        incompatibleWith: Collection<RoleBehavior>,
+        incompatibleWith: Collection<RoleBehavior>?,
         roleBehavior: RoleBehavior,
         member: MemberBehavior,
         context: PublicInteractionButtonContext,
     ): String? {
+        incompatibleWith ?: return ""
         val incompatible = member.asMember().getAnyRole(incompatibleWith)
         return if(incompatible != null) {
             context.interactionResponse.followUpEphemeral {
@@ -205,7 +206,7 @@ class RoleSelector: Extension() {
         channel: Long,
         autoRemoveOnLimit: Boolean,
         attachment: String,
-        limit: Int,
+        limit: Long,
         removable: Boolean,
         roles: TomlArray?,
     ) {
@@ -219,12 +220,17 @@ class RoleSelector: Extension() {
                 val selectorRoles = roles.map { RoleBehavior(GUILD_ID, Snowflake((it as TomlTable)["roleId"] as Long), kord) }
 
                 for(role in roles.asList() as List<TomlTable>) {
-                    val roleBehavior = selectorRoles.first { it.id.value.toLong() == role["roleId"] as Long }
+                    val roleName: String = role["name"] as String
+                    val roleEmoji: String? = role["emoji"] as? String
+                    val roleRoleId: Long = role["roleId"] as Long
+                    val roleRequiredRoleId: Long? = role["requiredRoleId"] as? Long
+                    val roleIncompatibleWith: TomlArray? = role["incompatibleWith"] as? TomlArray
+                    val roleBehavior = selectorRoles.first { it.id.value.toLong() == roleRoleId }
 
                     publicButton {
-                        label = role["name"] as String
-                        if((role["emoji"] as String).isNotEmpty()) {
-                            val emoji = (role["emoji"] as String).split(':', limit = 3)
+                        label = roleName
+                        if(!roleEmoji.isNullOrBlank()) {
+                            val emoji = roleEmoji.split(':', limit = 3)
 
                             partialEmoji = DiscordPartialEmoji.dsl {
                                 id = Snowflake(emoji[0])
@@ -234,7 +240,7 @@ class RoleSelector: Extension() {
                         }
                         style = ButtonStyle.Secondary
 
-                        val incompatibleWith = (role["incompatibleWith"] as TomlArray).map {
+                        val incompatibleWith = roleIncompatibleWith?.map {
                             RoleBehavior(GUILD_ID, Snowflake(it.toString()), kord)
                         }
 
@@ -264,7 +270,7 @@ class RoleSelector: Extension() {
                             ) ?: return@action
 
                             requiredRoleCheck(
-                                role["requiredRoleId"] as? Long,
+                                roleRequiredRoleId,
                                 member,
                                 this
                             ) ?: return@action
@@ -278,15 +284,6 @@ class RoleSelector: Extension() {
     }
 }
 
-fun Member.hasAnyRole(roles: Collection<RoleBehavior>): Boolean {
-    return if (roles.isEmpty()) {
-        true
-    } else {
-        val ids = roles.map { it.id }
-        roleIds.any { ids.contains(id) }
-    }
-}
-
 fun Member.getAnyRole(roles: Collection<RoleBehavior>): RoleBehavior? {
     return if (roles.isEmpty()) {
         null

src/main/kotlin/dev/racci/elixir/extensions/commands/util/Github.kt

@@ -1,3 +1,4 @@
+@file:Suppress("BlockingMethodInNonBlockingContext")
 package dev.racci.elixir.extensions.commands.util
 
 import com.kotlindiscord.kord.extensions.DISCORD_RED