Merge branch 'develop' into dm-default-false

# Conflicts:
#	src/main/kotlin/org/hyacinthbots/lilybot/extensions/config/Config.kt
#	src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/commands/ModerationCommands.kt

.editorconfig

@@ -12,8 +12,6 @@ indent_style = tab
 
 [*.kt]
 indent_style = tab
-ij_kotlin_name_count_to_use_star_import = 99999
-ij_kotlin_name_count_to_use_star_import_for_members = 99999
 
 [*.properties]
 indent_style = space

.github/workflows/gradle.yml

@@ -25,7 +25,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build Project
         run: ./gradlew build --stacktrace

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build Project
         run: ./gradlew build --stacktrace

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build Project
         run: ./gradlew build --stacktrace

.gitignore

@@ -5,6 +5,9 @@ build/
 out/
 classes/
 
+# kotlin
+.kotlin/
+
 # eclipse
 
 *.launch

build.gradle.kts

@@ -17,6 +17,8 @@ plugins {
 group = "org.hyacinthbots.lilybot"
 version = "4.9.0"
 
+val className = "org.hyacinthbots.lilybot.LilyBotKt"
+
 repositories {
 	mavenCentral()
 
@@ -30,6 +32,11 @@ repositories {
 		url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
 	}
 
+	maven {
+		name = "Kord Extensions (Snapshots)"
+		url = uri("https://snapshots-repo.kordex.dev")
+	}
+
 	maven {
 		name = "JitPack"
 		url = uri("https://jitpack.io")
@@ -61,7 +68,7 @@ dependencies {
 }
 
 application {
-	mainClass.set("org.hyacinthbots.lilybot.LilyBotKt")
+	mainClass.set(className)
 }
 
 gitHooks {
@@ -80,9 +87,14 @@ tasks {
 		}
 	}
 
+	java {  // Should match the Kotlin compiler options ideally
+		sourceCompatibility = JavaVersion.toVersion("21")
+		targetCompatibility = JavaVersion.toVersion("21")
+	}
+
 	jar {
 		manifest {
-			attributes("Main-Class" to "org.hyacinthbots.lilybot.LilyBotKt")
+			attributes("Main-Class" to className)
 		}
 	}
 

detekt.yml

@@ -175,6 +175,7 @@ formatting:
     active: true
     autoCorrect: true
   NoWildcardImports:
+    active: false
     packagesToUseImportOnDemandProperty: ""
   PackageName:
     active: true
@@ -361,3 +362,5 @@ style:
     active: true
   UseRequireNotNull:
     active: true
+  WildcardImport:
+    active: false

docs/commands.md

@@ -1,5 +1,11 @@
 ## Slash Commands
 
+### Command name: `about`
+**Description**: Learn about this bot
+
+* Arguments:
+None
+---
 ### Command name: `auto-threading enable`
 **Description**: Automatically create a thread for each message sent in this channel.
 
@@ -102,6 +108,21 @@ None
 	* `before` - The ID of the message to clear before - Snowflake
 	* `author` - The author of the messages to clear - Optional User
 
+---
+### Command name: `config logging`
+**Description**: Configure Lily's logging system
+
+**Required Member Permissions**: Manage Server
+
+* **Arguments**:
+	* `enable-delete-logs` - Enable logging of message deletions - Boolean
+	* `enable-edit-logs` - Enable logging of message edits - Boolean
+	* `enable-member-logging` - Enable logging of members joining and leaving the guild - Boolean
+	* `enable-public-member-logging` - Enable logging of members joining and leaving the guild with a public message and ping if enabled - Boolean
+	* `message-logs` - The channel for logging message deletions - Optional Channel
+	* `member-log` - The channel for logging members joining and leaving the guild - Optional Channel
+	* `public-member-log` - The channel for the public logging of members joining and leaving the guild - Optional Channel
+
 ---
 ### Command name: `config moderation`
 **Description**: Configure Lily's moderation system
@@ -118,21 +139,6 @@ None
 	* `ban-dm-message` - A custom message to send to users when they are banned. - Optional String
 	* `auto-invite-moderator-role` - Silently ping moderators to invite them to new threads. - Optional Boolean
 
----
-### Command name: `config logging`
-**Description**: Configure Lily's logging system
-
-**Required Member Permissions**: Manage Server
-
-* **Arguments**:
-	* `enable-delete-logs` - Enable logging of message deletions - Boolean
-	* `enable-edit-logs` - Enable logging of message edits - Boolean
-	* `enable-member-logging` - Enable logging of members joining and leaving the guild - Boolean
-	* `enable-public-member-logging` - Enable logging of members joining and leaving the guild with a public message and ping if enabled - Boolean
-	* `message-logs` - The channel for logging message deletions - Optional Channel
-	* `member-log` - The channel for logging members joining and leaving the guild - Optional Channel
-	* `public-member-log` - The channel for the public logging of members joining and leaving the guild - Optional Channel
-
 ---
 ### Command name: `config utility`
 **Description**: Configure Lily's utility settings
@@ -234,12 +240,6 @@ None
 ### Command name: `help`
 **Description**: Get help with using Lily!
 
-* Arguments:
-None
----
-### Command name: `info`
-**Description**: Learn about Lily, and get uptime data!
-
 * Arguments:
 None
 ---

gradle/libs.versions.toml

@@ -1,26 +1,27 @@
 [versions]
 # Plugins
-kotlin = "2.0.10-RC"
+kotlin = "2.0.10"
 shadow = "8.1.1"
 detekt = "1.23.6"
 git-hooks = "0.0.2"
 grgit = "5.2.2"
 blossom = "2.1.0"
 
 # Libraries
-kord-extensions = "1.9.0-20240714.071343-11"
+kord-extensions = "2.2.0-20240824.203242-3"
 logging = "7.0.0"
-logback = "1.5.6"
-github-api = "1.323"
+logback = "1.5.7"
+github-api = "1.324"
 kmongo = "5.1.0"
-docgenerator = "0.2.0-SNAPSHOT"
+docgenerator = "0.2.2-SNAPSHOT"
 
 [libraries]
-kord-extensions-core = { module = "com.kotlindiscord.kord.extensions:kord-extensions", version.ref = "kord-extensions" }
-kord-extensions-phishing = { module = "com.kotlindiscord.kord.extensions:extra-phishing", version.ref = "kord-extensions" }
-kord-extensions-pluralkit = { module = "com.kotlindiscord.kord.extensions:extra-pluralkit", version.ref = "kord-extensions"}
-kord-extensions-unsafe = { module = "com.kotlindiscord.kord.extensions:unsafe", version.ref = "kord-extensions"}
-kord-extensions-welcome = { module = "com.kotlindiscord.kord.extensions:extra-welcome", version.ref = "kord-extensions"}
+kord-extensions-core = { module = "dev.kordex:kord-extensions", version.ref = "kord-extensions" }
+kord-extensions-phishing = { module = "dev.kordex.modules:func-phishing", version.ref = "kord-extensions" }
+kord-extensions-pluralkit = { module = "dev.kordex.modules:pluralkit", version.ref = "kord-extensions"}
+kord-extensions-unsafe = { module = "dev.kordex.modules:dev-unsafe", version.ref = "kord-extensions"}
+kord-extensions-welcome = { module = "dev.kordex.modules:func-welcome", version.ref = "kord-extensions"}
+
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" }
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 logging = { module = "io.github.oshai:kotlin-logging", version.ref = "logging" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME