chore: Push local changes

Author: DaRacci

build.gradle.kts

@@ -16,41 +16,33 @@ repositories {
 
 dependencies {
 
+    implementation(platform(kotlin("bom")))
+    implementation(libs.bundles.kotlin)
+    implementation(libs.bundles.kotlinx)
+
     implementation(eLib.kord.extensions)
     implementation(eLib.kord.phishing)
-    implementation(libs.kotlin.stdlib)
 
     // Logging dependencies
     implementation(eLib.groovy)
     implementation(eLib.logback)
     implementation(eLib.logging)
 
     // Tags
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.kotlinx.serialization.kaml)
-
-    @Suppress("GradlePackageUpdate")
-    implementation("com.github.jezza:toml:1.2")
-
-    // Github API
-    implementation("org.kohsuke:github-api:1.301")
+//    implementation(libs.kotlinx.serialization.json)
+//    implementation(libs.kotlinx.serialization.kaml)
 
-    // Exposed
+    implementation(eLib.toml)
+    implementation(eLib.githubAPI)
+    implementation(eLib.kmongo)
     implementation(libs.bundles.exposed)
-
-    // SQLite
-    implementation("org.xerial:sqlite-jdbc:3.36.0.3")
 }
 
 application {
     // This is deprecated, but the Shadow plugin requires it
     mainClassName = "dev.racci.elixir.ElixirBotKt"
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-}
-
 tasks.jar {
     manifest {
         attributes(

gradle.properties

@@ -1,10 +1,10 @@
 # suppress inspection "UnusedProperty" for whole file
 group=dev.racci
-version=v0.1.1
+version=1.0.0-SNAPSHOT
 addRunNumber=false
-kotlinVersion=1.6.10
-minixVersion=0.4.47
-minixConventions=1.6.10-47
+kotlinVersion=1.6.21
+minixVersion=0.6.165
+minixConventions=1.6.21-165
 copyJar=false
 org.gradle.caching=true
 org.gradle.console=rich

libs.versions.toml

@@ -10,4 +10,8 @@ groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" }
 kord-extensions = { module = "com.kotlindiscord.kord.extensions:kord-extensions", version.ref = "kord-extensions" }
 kord-phishing = { module = "com.kotlindiscord.kord.extensions:extra-phishing", version.ref = "kord-extensions" }
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
-logging = { module = "io.github.microutils:kotlin-logging", version.ref = "logging" }
+logging = { module = "io.github.microutils:kotlin-logging", version.ref = "logging" }
+
+toml = "com.github.jezza:toml:1.2"
+githubAPI = "org.kohsuke:github-api:1.306"
+kmongo = "org.litote.kmongo:kmongo-coroutine-serialization:4.5.1"

settings.gradle.kts

@@ -4,12 +4,14 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
         maven("https://repo.racci.dev/releases")
+        // TODO: Fix the standing issue in Minix Conventions so we don't need to add this.
         maven("https://papermc.io/repo/repository/maven-public/")
     }
 
     plugins {
         val kotlinVersion: String by settings
         kotlin("plugin.serialization") version kotlinVersion
+        id("org.jetbrains.dokka") version kotlinVersion
         id("com.github.johnrengelman.shadow") version "7.1.2"
     }
     val minixConventions: String by settings

src/main/kotlin/dev/racci/elixir/ElixirBot.kt

@@ -6,6 +6,8 @@ import com.github.jezza.TomlTable
 import com.kotlindiscord.kord.extensions.ExtensibleBot
 import com.kotlindiscord.kord.extensions.modules.extra.phishing.DetectionAction
 import com.kotlindiscord.kord.extensions.modules.extra.phishing.extPhishing
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
 import dev.kord.common.entity.PresenceStatus
 import dev.kord.gateway.Intent
 import dev.kord.gateway.PrivilegedIntent
@@ -22,32 +24,47 @@ import dev.racci.elixir.extensions.commands.util.Github
 import dev.racci.elixir.extensions.commands.util.Ping
 import dev.racci.elixir.support.ThreadInviter
 import dev.racci.elixir.utils.BOT_TOKEN
-import dev.racci.elixir.utils.CONFIG_PATH
+import dev.racci.elixir.utils.DATA_PATH
 import dev.racci.elixir.utils.GITHUB_OAUTH
-import dev.racci.elixir.utils.GUILD_ID
+import dev.racci.elixir.utils.MONGO_URI
 import dev.racci.elixir.utils.SENTRY_DSN
 import mu.KotlinLogging
+import org.bson.UuidRepresentation
 import org.kohsuke.github.GitHub
 import org.kohsuke.github.GitHubBuilder
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
+import org.litote.kmongo.coroutine.coroutine
+import org.litote.kmongo.reactivestreams.KMongo
+import java.io.IOException
+import kotlin.io.path.Path
+import kotlin.io.path.inputStream
 import kotlin.properties.Delegates
 
-val configPath: Path = Paths.get(CONFIG_PATH)
-val config: TomlTable = Toml.from(Files.newInputStream(Paths.get("$configPath/config.toml")))
-var github: GitHub? = null
+val config: TomlTable = Toml.from(Path("$DATA_PATH/config.toml").inputStream())
+val github: GitHub? = run {
+    try {
+        val inst = GitHubBuilder().withOAuthToken(GITHUB_OAUTH).build()
+        gitHubLogger.info("Logged into GitHub!")
+        inst
+    } catch (e: IOException) {
+        gitHubLogger.error(e) { "Failed to log into GitHub!" }
+        null
+    }
+}
+
 var bot by Delegates.notNull<ExtensibleBot>()
 
 private val gitHubLogger = KotlinLogging.logger {}
 
 suspend fun main() {
     bot = ExtensibleBot(BOT_TOKEN) {
         applicationCommands {
-            defaultGuild(GUILD_ID)
+            enabled = true
+//            defaultGuild(GUILD_ID) // No more specific guilds
         }
         members {
-            fill(GUILD_ID)
+            lockMemberRequests = true
+            all()
+//            fill(GUILD_ID)
         }
         intents {
             +Intent.GuildMembers
@@ -66,7 +83,7 @@ suspend fun main() {
             add(::Report)
             add(::JoinLeaveEvent)
             add(::MessageEvents)
-            add(::Github)
+            if (github != null) add(::Github)
             add(::Custom)
             add(::StatChannels)
             add(::LogEvents)
@@ -91,17 +108,7 @@ suspend fun main() {
         }
         presence {
             status = PresenceStatus.Online
-            playing(config.get("activity") as String)
-        }
-
-        try {
-            @Suppress("BlockingMethodInNonBlockingContext")
-            github = GitHubBuilder().withOAuthToken(GITHUB_OAUTH).build()
-            gitHubLogger.info("Logged into GitHub!")
-        } catch (exception: Exception) {
-            exception.printStackTrace()
-            gitHubLogger.error("Failed to log into GitHub!")
-            throw Exception(exception)
+            watching("you.")
         }
     }
     bot.start()

src/main/kotlin/dev/racci/elixir/database/DatabaseManager.kt

@@ -1,22 +1,10 @@
 package dev.racci.elixir.database
 
-import com.zaxxer.hikari.HikariConfig
-import com.zaxxer.hikari.HikariDataSource
-import dev.racci.elixir.utils.JDBC_URL
-import io.ktor.utils.io.errors.IOException
-import mu.KotlinLogging
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.SchemaUtils
-import org.jetbrains.exposed.sql.Table
-import org.jetbrains.exposed.sql.transactions.transaction
-import java.nio.file.Files
-import java.nio.file.Path
-
 /**
  * The Database system within the bot
  * @author chalkyjeans
  */
-object DatabaseManager {
+/* object DatabaseManager {
 
     private val logger = KotlinLogging.logger { }
     private val config = HikariConfig()
@@ -70,4 +58,4 @@ object DatabaseManager {
             SchemaUtils.createMissingTablesAndColumns(RoleSelector)
         }
     }
-}
+} */

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

@@ -1,20 +1,18 @@
-@file:OptIn(ExperimentalTime::class)
-
 package dev.racci.elixir.events
 
 import com.kotlindiscord.kord.extensions.DISCORD_GREEN
 import com.kotlindiscord.kord.extensions.DISCORD_RED
+import com.kotlindiscord.kord.extensions.checks.guildFor
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.extensions.event
 import com.kotlindiscord.kord.extensions.sentry.BreadcrumbType
 import dev.kord.core.behavior.channel.GuildMessageChannelBehavior
 import dev.kord.core.behavior.channel.createEmbed
 import dev.kord.core.event.guild.MemberJoinEvent
 import dev.kord.core.event.guild.MemberLeaveEvent
-import dev.racci.elixir.utils.JOIN_CHANNEL
+import dev.racci.elixir.utils.DatabaseHelper
 import kotlinx.coroutines.flow.count
 import kotlinx.datetime.Clock
-import kotlin.time.ExperimentalTime
 
 /**
  * The join and leave logging for Members in the guild. More accurate join and leave times for users
@@ -27,9 +25,10 @@ class JoinLeaveEvent : Extension() {
     override suspend fun setup() {
         event<MemberJoinEvent> {
             action {
+                val channel = DatabaseHelper.getConfig(guildFor(event)?.id)?.joinChannel ?: return@action
                 val eventMember = event.member
                 val guildMemberCount = event.getGuild().members.count()
-                val joinChannel = event.guild.getChannel(JOIN_CHANNEL) as GuildMessageChannelBehavior
+                val joinChannel = event.guild.getChannel(channel) as GuildMessageChannelBehavior
 
                 joinChannel.createEmbed {
                     color = DISCORD_GREEN
@@ -59,9 +58,10 @@ class JoinLeaveEvent : Extension() {
         }
         event<MemberLeaveEvent> {
             action {
+                val channel = DatabaseHelper.getConfig(guildFor(event)?.id)?.joinChannel ?: return@action
                 val eventUser = event.user
                 val guildMemberCount = event.getGuild().members.count()
-                val joinChannel = event.guild.getChannel(JOIN_CHANNEL) as GuildMessageChannelBehavior
+                val joinChannel = event.guild.getChannel(channel) as GuildMessageChannelBehavior
 
                 joinChannel.createEmbed {
                     color = DISCORD_RED

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

@@ -1,6 +1,7 @@
 package dev.racci.elixir.events
 
 import com.kotlindiscord.kord.extensions.DISCORD_PINK
+import com.kotlindiscord.kord.extensions.checks.guildFor
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.extensions.event
 import com.kotlindiscord.kord.extensions.sentry.BreadcrumbType
@@ -13,8 +14,7 @@ import dev.kord.core.event.guild.MemberLeaveEvent
 import dev.kord.core.event.message.MessageBulkDeleteEvent
 import dev.kord.core.event.message.MessageDeleteEvent
 import dev.kord.core.event.message.MessageUpdateEvent
-import dev.racci.elixir.utils.GUILD_ID
-import dev.racci.elixir.utils.MESSAGE_LOGS
+import dev.racci.elixir.utils.DatabaseHelper
 import kotlinx.coroutines.flow.count
 import kotlinx.coroutines.flow.toSet
 import kotlinx.datetime.Clock
@@ -26,10 +26,10 @@ class LogEvents : Extension() {
     override val name = "LogEvents"
 
     override suspend fun setup() {
-        val logChannel = kord.getGuild(GUILD_ID)?.getChannel(MESSAGE_LOGS) as GuildMessageChannelBehavior
-
         event<MessageDeleteEvent> {
             action {
+                val guild = guildFor(event)
+                val logChannel = DatabaseHelper.getConfig(guild?.id)?.logChannel?.let { guild!!.getChannelOrNull(it) } as? GuildMessageChannelBehavior ?: return@action
                 if (event.message?.asMessageOrNull()?.author?.isBot == true) return@action
                 val messageContent = event.message?.asMessageOrNull()?.content.toString()
                 val eventMessage = event.message
@@ -71,6 +71,8 @@ class LogEvents : Extension() {
 
         event<MessageUpdateEvent> {
             action {
+                val guild = guildFor(event)
+                val logChannel = DatabaseHelper.getConfig(guild?.id)?.logChannel?.let { guild!!.getChannelOrNull(it) } as? GuildMessageChannelBehavior ?: return@action
                 if (event.message.asMessageOrNull()?.author?.isBot == true) return@action
                 val messageContentBefore = event.old?.content.toString()
                 val messageContentAfter = event.new.content.toString()
@@ -127,6 +129,8 @@ class LogEvents : Extension() {
 
         event<MessageBulkDeleteEvent> {
             action {
+                val guild = guildFor(event)
+                val logChannel = DatabaseHelper.getConfig(guild?.id)?.logChannel?.let { guild!!.getChannelOrNull(it) } as? GuildMessageChannelBehavior ?: return@action
                 val deletedCount = event.messages.count()
                 val messageLocation = event.channel.id.value
 
@@ -155,6 +159,8 @@ class LogEvents : Extension() {
 
         event<InviteCreateEvent> {
             action {
+                val guild = guildFor(event)
+                val logChannel = DatabaseHelper.getConfig(guild?.id)?.logChannel?.let { guild!!.getChannelOrNull(it) } as? GuildMessageChannelBehavior ?: return@action
                 val inviter = event.inviterMember?.nicknameMention ?: event.inviterId.toString()
                 val maxUses = event.maxUses.toString()
                 val maxAge = event.maxAge.toString()
@@ -193,6 +199,8 @@ class LogEvents : Extension() {
 
         event<MemberJoinEvent> {
             action {
+                val guild = guildFor(event)
+                val logChannel = DatabaseHelper.getConfig(guild?.id)?.logChannel?.let { guild!!.getChannelOrNull(it) } as? GuildMessageChannelBehavior ?: return@action
                 val eventMember = event.member
                 val guildMemberCount = event.getGuild().members.count()
                 val now = Clock.System.now()
@@ -225,6 +233,8 @@ class LogEvents : Extension() {
 
         event<MemberLeaveEvent> {
             action {
+                val guild = guildFor(event)
+                val logChannel = DatabaseHelper.getConfig(guild?.id)?.logChannel?.let { guild!!.getChannelOrNull(it) } as? GuildMessageChannelBehavior ?: return@action
                 val eventMember = event.old ?: return@action
                 val guildMemberCount = event.getGuild().members.count()
                 val now = Clock.System.now()