get everything up to date, also release 0.6.1

NotJansel · NotJansel · commit 64314a33cee7 · 2023-11-23T15:50:32.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.util.Date
+import java.util.*
 
 plugins {
     application
@@ -34,9 +34,9 @@ fun String.runCommand(
 
 
 group = "org.hyacinthbots.allium"
-version = "0.6.0-build.local-" + "git rev-parse --short=8 HEAD".runCommand(workingDir = rootDir) + "-" + "git branch --show-current".runCommand(workingDir = rootDir).replace("/", ".")
+//version = "0.6.0-build.local-" + "git rev-parse --short=8 HEAD".runCommand(workingDir = rootDir) + "-" + "git branch --show-current".runCommand(workingDir = rootDir).replace("/", ".")
 var buildTime = Date().time / 1000
-// version = "0.6.0"
+version = "0.6.1"
 // The current LTS Java version
 val javaVersion = 17
 
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-detekt = "1.23.1"  # Note: Plugin versions must be updated in the settings.gradle.kts too
+detekt = "1.23.3"  # Note: Plugin versions must be updated in the settings.gradle.kts too
 
 jansi = "2.4.0"
-kord-extensions = "1.5.10-SNAPSHOT"
-kx-ser = "1.6.0"
+kord-extensions = "1.6.0-SNAPSHOT"
+kx-ser = "1.6.1"
 logging = "3.0.5"
 logback = "1.4.11"
 logback-groovy = "1.14.4"
 gson = "2.10.1"
 doc-gen = "0.1.2"
 kmongo = "4.9.0"
 groovy = "3.0.13"
-ktor = "2.3.5"
+ktor = "2.3.6"
 
 [libraries]
 detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,11 +1,11 @@
 pluginManagement {
     plugins {
-        val kotlinVersion = "1.9.10"
+        val kotlinVersion = "1.9.20"
         kotlin("jvm") version kotlinVersion
         kotlin("plugin.serialization") version kotlinVersion
 
         // Update this in libs.version.toml when you change it here
-        id("io.gitlab.arturbosch.detekt") version "1.23.1"
+        id("io.gitlab.arturbosch.detekt") version "1.23.3"
 
         id("com.github.jakemarsden.git-hooks") version "0.0.2"
         id("com.github.johnrengelman.shadow") version "8.1.1"
diff --git a/src/main/kotlin/org/hyacinthbots/allium/extensions/About.kt b/src/main/kotlin/org/hyacinthbots/allium/extensions/About.kt
@@ -4,10 +4,12 @@ import com.kotlindiscord.kord.extensions.components.components
 import com.kotlindiscord.kord.extensions.components.linkButton
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
-import dev.kord.rest.builder.message.create.embed
+import dev.kord.rest.builder.message.EmbedBuilder
+import dev.kord.rest.builder.message.embed
 import kotlinx.coroutines.flow.count
-import org.hyacinthbots.allium.utils.*
+import org.hyacinthbots.allium.utils.BUILD
+import org.hyacinthbots.allium.utils.BUILDTIME
+import org.hyacinthbots.allium.utils.getRandomUpdateMessage
 
 /**
  * About command.
@@ -24,7 +26,7 @@ class About : Extension() {
             action {
                 val kord = this@About.kord
                 respond {
-                    embed {
+                    embed(fun EmbedBuilder.() {
                         title = "Allium"
                         field {
                             name = "General Information"
@@ -66,7 +68,7 @@ class About : Extension() {
                             name = "Next update?"
                             value = getRandomUpdateMessage()
                         }
-                    }
+                    })
                     components {
                         linkButton {
                             this.label = "Source Code"
diff --git a/src/main/kotlin/org/hyacinthbots/allium/extensions/Config.kt b/src/main/kotlin/org/hyacinthbots/allium/extensions/Config.kt
@@ -7,9 +7,9 @@ import com.kotlindiscord.kord.extensions.commands.application.slash.converters.i
 import com.kotlindiscord.kord.extensions.commands.application.slash.publicSubCommand
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.common.entity.Permission
-import dev.kord.rest.builder.message.create.embed
+import dev.kord.rest.builder.message.EmbedBuilder
+import dev.kord.rest.builder.message.embed
 import org.hyacinthbots.allium.database.collections.ConfigCollection
 
 class Config : Extension() {
@@ -42,14 +42,14 @@ class Config : Extension() {
                 }
                 action {
                     respond {
-                        embed {
+                        embed(fun EmbedBuilder.() {
                             title = "Config for Guild ${getGuild()!!.asGuild().name}"
                             field {
                                 name = "Log Uploading type"
                                 value = ConfigCollection().logUploadingType(guild!!.id)
                                 inline = true
                             }
-                        }
+                        })
                     }
                 }
             }
diff --git a/src/main/kotlin/org/hyacinthbots/allium/extensions/CurseForge.kt b/src/main/kotlin/org/hyacinthbots/allium/extensions/CurseForge.kt
@@ -6,8 +6,6 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.defaultingInt
 import com.kotlindiscord.kord.extensions.commands.converters.impl.string
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
-import com.kotlindiscord.kord.extensions.types.respondingPaginator
 import dev.kord.rest.builder.message.EmbedBuilder
 import dev.kord.rest.builder.message.create.embed
 import io.ktor.client.*
diff --git a/src/main/kotlin/org/hyacinthbots/allium/extensions/LogUploading.kt b/src/main/kotlin/org/hyacinthbots/allium/extensions/LogUploading.kt
@@ -2,7 +2,9 @@ package org.hyacinthbots.allium.extensions
 
 import com.kotlindiscord.kord.extensions.DISCORD_PINK
 import com.kotlindiscord.kord.extensions.DISCORD_RED
-import com.kotlindiscord.kord.extensions.checks.*
+import com.kotlindiscord.kord.extensions.checks.anyGuild
+import com.kotlindiscord.kord.extensions.checks.channelFor
+import com.kotlindiscord.kord.extensions.checks.hasPermission
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.application.slash.ephemeralSubCommand
 import com.kotlindiscord.kord.extensions.commands.converters.impl.channel
@@ -12,7 +14,6 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.extensions.event
 import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
 import com.kotlindiscord.kord.extensions.sentry.tag
-import com.kotlindiscord.kord.extensions.types.respond
 import com.kotlindiscord.kord.extensions.utils.download
 import com.kotlindiscord.kord.extensions.utils.isNullOrBot
 import dev.kord.common.entity.ButtonStyle
@@ -23,9 +24,10 @@ import dev.kord.core.behavior.edit
 import dev.kord.core.entity.Message
 import dev.kord.core.entity.channel.MessageChannel
 import dev.kord.core.event.message.MessageCreateEvent
-import dev.kord.rest.builder.message.create.embed
-import dev.kord.rest.builder.message.modify.actionRow
-import dev.kord.rest.builder.message.modify.embed
+import dev.kord.rest.builder.component.ActionRowBuilder
+import dev.kord.rest.builder.message.EmbedBuilder
+import dev.kord.rest.builder.message.actionRow
+import dev.kord.rest.builder.message.embed
 import io.ktor.client.*
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
@@ -120,7 +122,7 @@ class LogUploading : Extension() {
                             var confirmationMessage: Message? = null
 
                             confirmationMessage = uploadChannel?.createMessage {
-                                embed {
+                                embed(fun EmbedBuilder.() {
                                     title = "Do you want to upload this file to mclo.gs?"
                                     description =
                                             "mclo.gs is a website that allows users to share minecraft logs " +
@@ -131,7 +133,7 @@ class LogUploading : Extension() {
                                                 "Uploaded by ${eventMessage.author?.username ?: eventMember?.asUserOrNull()?.username}"
                                     }
                                     color = DISCORD_PINK
-                                }
+                                })
 
                                 components {
                                     ephemeralButton(row = 0) {
@@ -168,11 +170,11 @@ class LogUploading : Extension() {
                                                             color = DISCORD_PINK
                                                         }
 
-                                                        actionRow {
+                                                        actionRow(fun ActionRowBuilder.() {
                                                             linkButton(response) {
                                                                 label = "Click here to view"
                                                             }
-                                                        }
+                                                        })
                                                     }
                                                 } catch (e: IOException) {
                                                     // If the upload fails, we'll just show the error
diff --git a/src/main/kotlin/org/hyacinthbots/allium/extensions/Modrinth.kt b/src/main/kotlin/org/hyacinthbots/allium/extensions/Modrinth.kt
@@ -10,15 +10,10 @@ import com.kotlindiscord.kord.extensions.components.menus.string.EphemeralString
 import com.kotlindiscord.kord.extensions.components.publicButton
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
-import com.kotlindiscord.kord.extensions.types.edit
-import com.kotlindiscord.kord.extensions.types.editingPaginator
-import com.kotlindiscord.kord.extensions.types.respond
-import com.kotlindiscord.kord.extensions.types.respondingPaginator
 import dev.kord.rest.builder.message.EmbedBuilder
-import dev.kord.rest.builder.message.create.embed
+import dev.kord.rest.builder.message.embed
 import io.ktor.client.*
 import io.ktor.client.call.*
-import io.ktor.client.call.body
 import io.ktor.client.engine.cio.*
 import io.ktor.client.plugins.*
 import io.ktor.client.plugins.contentnegotiation.*
@@ -71,9 +66,9 @@ class Modrinth : Extension() {
                         return@action
                     }
                     respond {
-                        embed {
+                        embed(fun EmbedBuilder.() {
                             embedUser(response)
-                        }
+                        })
                     }
                 }
             }
diff --git a/src/main/kotlin/org/hyacinthbots/allium/extensions/StatusPing.kt b/src/main/kotlin/org/hyacinthbots/allium/extensions/StatusPing.kt
@@ -4,8 +4,8 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
 import com.kotlindiscord.kord.extensions.utils.envOrNull
 import com.kotlindiscord.kord.extensions.utils.scheduling.Scheduler
 import com.kotlindiscord.kord.extensions.utils.scheduling.Task
-import io.ktor.client.HttpClient
-import io.ktor.client.request.post
+import io.ktor.client.*
+import io.ktor.client.request.*
 import mu.KotlinLogging
 import kotlin.time.Duration.Companion.seconds
 
diff --git a/src/main/kotlin/org/hyacinthbots/allium/utils/_Utils.kt b/src/main/kotlin/org/hyacinthbots/allium/utils/_Utils.kt
@@ -10,7 +10,6 @@ import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import io.ktor.http.content.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.util.cio.*
 import io.ktor.utils.io.*
diff --git a/src/main/resources/logback.groovy b/src/main/resources/logback.groovy
@@ -1,5 +1,4 @@
 import ch.qos.logback.core.joran.spi.ConsoleTarget
-import ch.qos.logback.core.ConsoleAppender
 
 def environment = System.getenv("ENVIRONMENT") ?: "prod"
 

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ import com.kotlindiscord.kord.extensions.commands.application.slash.converters.i`
`7`	`7`	`import com.kotlindiscord.kord.extensions.commands.application.slash.publicSubCommand`
`8`	`8`	`import com.kotlindiscord.kord.extensions.extensions.Extension`
`9`	`9`	`import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand`
`10`		`-import com.kotlindiscord.kord.extensions.types.respond`
`11`	`10`	`import dev.kord.common.entity.Permission`
`12`		`-import dev.kord.rest.builder.message.create.embed`
	`11`	`+import dev.kord.rest.builder.message.EmbedBuilder`
	`12`	`+import dev.kord.rest.builder.message.embed`
`13`	`13`	`import org.hyacinthbots.allium.database.collections.ConfigCollection`
`14`	`14`
`15`	`15`	`class Config : Extension() {`
`@@ -42,14 +42,14 @@ class Config : Extension() {`
`42`	`42`	`}`
`43`	`43`	`action {`
`44`	`44`	`respond {`
`45`		`- embed {`
	`45`	`+ embed(fun EmbedBuilder.() {`
`46`	`46`	`title = "Config for Guild ${getGuild()!!.asGuild().name}"`
`47`	`47`	`field {`
`48`	`48`	`name = "Log Uploading type"`
`49`	`49`	`value = ConfigCollection().logUploadingType(guild!!.id)`
`50`	`50`	`inline = true`
`51`	`51`	`}`
`52`		`- }`
	`52`	`+ })`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`