fixed bug

Jakkoble · Jun 10, 2023 · 2aa40c6 · 2aa40c6
1 parent 49a46dc
commit 2aa40c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/main/kotlin/de/jakkoble/TwitchBot.kt b/src/main/kotlin/de/jakkoble/TwitchBot.kt
@@ -66,7 +66,7 @@ class TwitchBot {
             val withSpecialCharacters = Pattern.compile("[^A-Za-z0-9_]").matcher(inputName).find()
             val userData = if (!withSpecialCharacters) inputName.getUserDataFromName() else null
             @Suppress("KotlinConstantConditions")
-            if (userData == null || inputName.length > 25 || withSpecialCharacters) {
+            if (userData?.id == null || userData.name == null || inputName.length > 25 || withSpecialCharacters) {
                if (sendMessage) twitchClient.chat.sendMessage(getChannelOfId(channelID), String.format(
                   playerNotFoundMessage,
                   event.redemption.user.displayName,

diff --git a/src/main/kotlin/de/jakkoble/Whitelist.kt b/src/main/kotlin/de/jakkoble/Whitelist.kt
@@ -36,19 +36,23 @@ class Whitelist {
    fun playerNames(): List<String> = whitelist.map { it.name }
    fun usedWhitelist(twitchUserID: String): Boolean {
       if (twitchUserID == channelID) return false
-      if (whitelist.count { it.twitchUserID == twitchUserID } >= ticketPerUser) return true
-      return false
+      return whitelist.count { it.twitchUserID == twitchUserID } >= ticketPerUser
    }
    fun userDataByName(name: String): UserData? = whitelist.firstOrNull { it.name.equals(name, ignoreCase = true) }
 }
 data class UserData(val name: String, val uuid: String, val twitchUserID: String)
 
-fun String.getUserDataFromName(): Response? = getRequest("https://api.mojang.com/users/profiles/minecraft/$this")
-data class Response(val name: String, val id: String)
+fun String.getUserDataFromName(): Response? {
+   val result = getRequest("https://api.mojang.com/users/profiles/minecraft/$this")
+   if (result == null) TwitchWhitelist.INSTANCE.logger.warning("I am absolutely null")
+   return result
+}
+data class Response(val name: String?, val id: String?)
 fun getRequest(url: String): Response? {
    val client = HttpClient.newBuilder().build()
    val request = HttpRequest.newBuilder()
       .uri(URI.create(url))
       .build()
-   return Gson().fromJson(client.send(request, HttpResponse.BodyHandlers.ofString()).body(), Response::class.java)
+   val data = client.send(request, HttpResponse.BodyHandlers.ofString()).body() ?: null
+   return Gson().fromJson(data, Response::class.java)
 }
diff --git a/src/main/kotlin/de/jakkoble/WhitelistCommand.kt b/src/main/kotlin/de/jakkoble/WhitelistCommand.kt
@@ -74,14 +74,14 @@ class WhitelistCommand : CommandExecutor, TabCompleter {
                return true
             }
             val userData = inputName.getUserDataFromName()
-            val playerName = userData?.name
-            if (userData == null || inputName.length > 25) {
+            if (userData?.id == null || userData.name == null || inputName.length > 25) {
                sendPlayerMessage(sender, "$prefix There is no Player called ${userData?.name ?: inputName}")
                TwitchWhitelist.INSTANCE.server.consoleSender.sendMessage("${ChatColor.YELLOW}There is no Player called ${userData?.name ?: inputName}.")
                return true
             }
+            val playerName = userData.name
             if (!Whitelist().whitelist(UserData(
-                  name = playerName ?: return true,
+                  name = playerName,
                   uuid = userData.id,
                   twitchUserID = channelID))) {
                sendPlayerMessage(sender, "$prefix The Player $playerName is already Whitelisted.")