Update to Linkie patch 121 (#279)

* Update to Linkie patch 121 * Indicate how to avoid the issue * Update mappings.properties * Update mappings_en_GB.properties --------- Co-authored-by: Gareth Coles <[email protected]>
Kord-Extensions · Feb 28, 2024 · df4abf6 · df4abf6
1 parent 9305c2a
commit df4abf6
Show file tree

Hide file tree

Showing 8 changed files with 479 additions and 195 deletions.
diff --git a/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/mappings/MappingsExtension.kt b/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/mappings/MappingsExtension.kt
@@ -280,7 +280,7 @@ class MappingsExtension : Extension() {
 		slashCommand(
 			"mcp",
 			"MCP",
-			McpNamespaceReplacement,
+			MCPNamespace,
 			::MCPArguments
 		)
 
@@ -540,7 +540,7 @@ class MappingsExtension : Extension() {
 				"feather" -> FeatherNamespace
 				"hashed-mojang" -> MojangHashedNamespace
 				"legacy-yarn" -> LegacyYarnNamespace
-				"mcp" -> McpNamespaceReplacement
+				"mcp" -> MCPNamespace
 				"mojang" -> MojangNamespace
 				"plasma" -> PlasmaNamespace
 				"quilt-mappings" -> QuiltMappingsNamespace
@@ -847,8 +847,18 @@ class MappingsExtension : Extension() {
 					MappingsProvider.empty(arguments.namespace)
 				}
 
+				val defaultVersion = version
+					?: arguments.namespace.defaultVersion
+
+				if (defaultVersion == null) {
+					respond {
+						content = translate("command.mapping.nodefault", arguments.namespace.id)
+					}
+					return@withContext
+				}
+
 				provider.injectDefaultVersion(
-					arguments.namespace.getProvider(version ?: arguments.namespace.defaultVersion)
+					arguments.namespace.getProvider(defaultVersion)
 				)
 
 				sentry.breadcrumb(BreadcrumbType.Info) {

diff --git a/...kotlin/com/kotlindiscord/kord/extensions/modules/extra/mappings/arguments/MCPArguments.kt b/...kotlin/com/kotlindiscord/kord/extensions/modules/extra/mappings/arguments/MCPArguments.kt
@@ -6,8 +6,8 @@
 
 package com.kotlindiscord.kord.extensions.modules.extra.mappings.arguments
 
-import com.kotlindiscord.kord.extensions.modules.extra.mappings.utils.McpNamespaceReplacement
+import me.shedaniel.linkie.namespaces.MCPNamespace
 
 /** Arguments for MCP mappings lookup commands. **/
 @Suppress("UndocumentedPublicProperty")
-class MCPArguments : MappingArguments(McpNamespaceReplacement)
+class MCPArguments : MappingArguments(MCPNamespace)
diff --git a/...com/kotlindiscord/kord/extensions/modules/extra/mappings/utils/McpNamespaceReplacement.kt b/...com/kotlindiscord/kord/extensions/modules/extra/mappings/utils/McpNamespaceReplacement.kt
diff --git a/extra-modules/extra-mappings/src/main/resources/translations/kordex/mappings.properties b/extra-modules/extra-mappings/src/main/resources/translations/kordex/mappings.properties
@@ -16,3 +16,4 @@ command.mapping.namespace.description=Configure which namespaces can be used in
 command.mapping.namespace.selectmenu=Select the namespaces for conversion commands
 command.mapping.namespace.selectmenu.cleared=Namespaces cleared
 command.mapping.namespace.selectmenu.updated=**Namespaces updated:** {0}
+command.mapping.nodefault=**Error:** no default version could be loaded for namespace {0}. Please specify a version via the `version` argument.
diff --git a/...a-modules/extra-mappings/src/main/resources/translations/kordex/mappings_en_GB.properties b/...a-modules/extra-mappings/src/main/resources/translations/kordex/mappings_en_GB.properties
@@ -16,3 +16,4 @@ command.mapping.namespace.description=Configure which namespaces can be used in
 command.mapping.namespace.selectmenu=Select the namespaces for conversion commands
 command.mapping.namespace.selectmenu.cleared=Namespaces cleared
 command.mapping.namespace.selectmenu.updated=**Namespaces updated:** {0}
+command.mapping.nodefault=**Error:** no default version could be loaded for namespace {0}. Please specify a version via the `version` argument.
diff --git a/extra-modules/extra-mappings/src/test/resources/logback.groovy b/extra-modules/extra-mappings/src/test/resources/logback.groovy
@@ -6,13 +6,13 @@
 
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder
 import ch.qos.logback.core.joran.spi.ConsoleTarget
+import ch.qos.logback.core.ConsoleAppender
+import ch.qos.logback.core.FileAppender
 
-def environment = System.getenv().getOrDefault("ENVIRONMENT", "production")
+def environment = System.getenv("ENVIRONMENT") ?: "dev"
 def defaultLevel = TRACE
 
 if (environment == "spam") {
-	statusListener(OnConsoleStatusListener)
-
 	logger("dev.kord.rest.DefaultGateway", TRACE)
 } else {
 	// Silence warning about missing native PRNG