Merge remote-tracking branch 'origin/root' into root

Kord-Extensions · Jan 11, 2024 · 5dbc1c0 · 5dbc1c0
2 parents e72f1ba + a2f4726
commit 5dbc1c0
Show file tree

Hide file tree

Showing 27 changed files with 2,307 additions and 2,225 deletions.
diff --git a/...in/com/kotlindiscord/kord/extensions/modules/annotations/converters/ConverterProcessor.kt b/...in/com/kotlindiscord/kord/extensions/modules/annotations/converters/ConverterProcessor.kt
@@ -100,7 +100,7 @@ public class ConverterProcessor(
             for (name in arguments.names) {
                 if (arguments.types.count { type -> type.order == 1 } != 1) {
                     error(
-                        "Types list must contain exactly one of COALESCING or SINGLE. Convreter: " +
+                        "Types list must contain exactly one of COALESCING or SINGLE. Converter: " +
                             classDeclaration.simpleName.asString()
                     )
                 }
@@ -160,12 +160,12 @@ public class ConverterProcessor(
                         ConverterToMulti::class,
                         ConverterToOptional::class
                     )
-    
+
                     package ${classDeclaration.packageName.asString()}
-                    
+
                     // Original converter class, for safety
                     import ${classDeclaration.qualifiedName!!.asString()}
-                    
+
                     // Imports that all converters need
                     import com.kotlindiscord.kord.extensions.InvalidArgumentException
                     import com.kotlindiscord.kord.extensions.commands.Arguments
@@ -266,13 +266,13 @@ public class ConverterProcessor(
 
     internal fun classComment(name: String, see: String): String = """
         Builder class for $name converters. Used to construct a converter based on the given options.
-        
+
         @see $see
     """.trimIndent()
 
     internal fun functionComment(name: String, type: String, see: String): String = """
         Converter creation function: $name $type
-        
+
         @see $see
     """.trimIndent()
 }

diff --git a/...main/kotlin/com/kotlindiscord/kord/extensions/modules/annotations/converters/Converter.kt b/...main/kotlin/com/kotlindiscord/kord/extensions/modules/annotations/converters/Converter.kt
@@ -29,7 +29,7 @@ package com.kotlindiscord.kord.extensions.modules.annotations.converters
  * @property builderSuffixedWhere Extra generic bounds to place after `where` in the builder's signature.
  *
  * @property functionBuilderArguments Arguments to pass into the builder's constructor, if any.
- * @property functionGeneric Generic typevar that the builder should take, if any. Will be `reified`.
+ * @property functionGeneric Generic typevar that the function should take, if any. Will be `reified`.
  * @property functionSuffixedWhere Extra generic bounds to place after `where` in the function's signature.
  */
 @Retention(AnnotationRetention.SOURCE)

diff --git a/buildSrc/src/main/kotlin/ksp-module.gradle.kts b/buildSrc/src/main/kotlin/ksp-module.gradle.kts
@@ -17,6 +17,7 @@ tasks { // Hack to get KSP to pick up the module definitions
 idea { // We use this instead of sourceSets b/c we're all IJ users and this fixes build optimisations
     module {
         // Not using += due to https://github.com/gradle/gradle/issues/8749
+		// (Gradle closed this as fixed, but they broke it again)
         sourceDirs = sourceDirs +
             file("${layout.buildDirectory}/generated/ksp/main/kotlin")
 

diff --git a/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/phishing/PhishingExtension.kt b/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/phishing/PhishingExtension.kt
@@ -20,7 +20,6 @@ import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
 import com.kotlindiscord.kord.extensions.extensions.event
 import com.kotlindiscord.kord.extensions.utils.dm
 import com.kotlindiscord.kord.extensions.utils.getJumpUrl
-import com.kotlindiscord.kord.extensions.utils.tagOrUsername
 import dev.kord.core.behavior.ban
 import dev.kord.core.behavior.channel.createMessage
 import dev.kord.core.entity.Message
@@ -247,7 +246,7 @@ class PhishingExtension(private val settings: ExtPhishingBuilder) : Extension()
 
                     name = "Author"
                     value = "${message.author!!.mention} (" +
-                        "`${message.author!!.tagOrUsername()}` / " +
+                        "`${message.author!!.tag}` / " +
                         "`${message.author!!.id.value}`" +
                         ")"
                 }