Mappings: Quick hotfix for unmapped names

Kord-Extensions · Aug 2, 2021 · dd428e2 · dd428e2
1 parent 1621f2b
commit dd428e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 29 deletions.
diff --git a/...rc/main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/mappings/utils/Mappings.kt b/...rc/main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/mappings/utils/Mappings.kt
@@ -28,7 +28,7 @@ fun classesToPages(
 
             val (clientName, serverName) = clazz.obfName.stringPairs()
 
-            if (clientName != null) {
+            if (clientName != null && clientName.isNotEmpty()) {
                 if (serverName == null) {
                     text += "**Name:** `$clientName` -> "
                 } else {
@@ -41,7 +41,7 @@ fun classesToPages(
                     } ?: "")
             }
 
-            if (serverName != null) {
+            if (serverName != null && serverName.isNotEmpty()) {
                 if (clientName != null) {
                     text += "\n"
                 }
@@ -64,7 +64,7 @@ fun classesToPages(
 
             val (clientName, serverName) = clazz.obfName.stringPairs()
 
-            if (clientName != null) {
+            if (clientName != null && clientName.isNotEmpty()) {
                 if (serverName == null) {
                     text += "**Name:** `$clientName` -> "
                 } else {
@@ -77,7 +77,7 @@ fun classesToPages(
                     } ?: "")
             }
 
-            if (serverName != null) {
+            if (serverName != null && serverName.isNotEmpty()) {
                 if (clientName != null) {
                     text += "\n"
                 }
@@ -130,8 +130,8 @@ fun fieldsToPages(
 
             val (clientName, serverName) = field.obfName.stringPairs()
 
-            if (clientName != null) {
-                if (serverName == null) {
+            if (!clientName.isNullOrEmpty()) {
+                if (!serverName.isNullOrEmpty()) {
                     text += "**Name:** `$clientName` -> "
                 } else {
                     text += "**Client:** `$clientName` -> "
@@ -143,8 +143,8 @@ fun fieldsToPages(
                     } ?: "")
             }
 
-            if (serverName != null) {
-                if (clientName != null) {
+            if (!serverName.isNullOrEmpty()) {
+                if (!clientName.isNullOrEmpty()) {
                     text += "\n"
                 }
 
@@ -174,8 +174,8 @@ fun fieldsToPages(
 
             val (clientName, serverName) = field.obfName.stringPairs()
 
-            if (clientName != null) {
-                if (serverName == null) {
+            if (!clientName.isNullOrEmpty()) {
+                if (!serverName.isNullOrEmpty()) {
                     text += "**Name:** `$clientName` -> "
                 } else {
                     text += "**Client:** `$clientName` -> "
@@ -187,8 +187,8 @@ fun fieldsToPages(
                     } ?: "")
             }
 
-            if (serverName != null) {
-                if (clientName != null) {
+            if (!serverName.isNullOrEmpty()) {
+                if (!clientName.isNullOrEmpty()) {
                     text += "\n"
                 }
 
@@ -255,8 +255,8 @@ fun methodsToPages(
 
             val (clientName, serverName) = method.obfName.stringPairs()
 
-            if (clientName != null) {
-                if (serverName == null) {
+            if (!clientName.isNullOrEmpty()) {
+                if (!serverName.isNullOrEmpty()) {
                     text += "**Name:** `$clientName` -> "
                 } else {
                     text += "**Client:** `$clientName` -> "
@@ -268,8 +268,8 @@ fun methodsToPages(
                     } ?: "")
             }
 
-            if (serverName != null) {
-                if (clientName != null) {
+            if (!serverName.isNullOrEmpty()) {
+                if (!clientName.isNullOrEmpty()) {
                     text += "\n"
                 }
 
@@ -294,7 +294,7 @@ fun methodsToPages(
 
             val (clientName, serverName) = method.obfName.stringPairs()
 
-            if (clientName != null) {
+            if (clientName != null && clientName.isNotEmpty()) {
                 if (serverName == null) {
                     text += "**Name:** `$clientName` -> "
                 } else {
@@ -307,7 +307,7 @@ fun methodsToPages(
                     } ?: "")
             }
 
-            if (serverName != null) {
+            if (serverName != null && serverName.isNotEmpty()) {
                 if (clientName != null) {
                     text += "\n"
                 }

diff --git a/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/checks/ChannelChecks.kt b/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/checks/ChannelChecks.kt
@@ -23,17 +23,6 @@ import mu.KotlinLogging
  */
 public fun inChannel(builder: suspend () -> ChannelBehavior): Check<*> = {
     val logger = KotlinLogging.logger("com.kotlindiscord.kord.extensions.checks.inChannel")
-
-    // TODO: When we can get the thread parent, checks will need looking at again
-//    val thread = threadFor(event)
-//
-//    val eventChannel = when(thread) {
-//        is NewsChannelThread -> thread
-//        is TextChannelThread -> thread
-//
-//        else -> channelFor(event)
-//    }
-
     val eventChannel = channelFor(event)
 
     if (eventChannel == null) {