Cleanup

Author: Avanatiker

src/main/kotlin/com/lambda/client/command/commands/PlaytimeCommand.kt

@@ -6,6 +6,8 @@ import com.lambda.client.commons.utils.ConnectionUtils
 import com.lambda.client.commons.utils.grammar
 import com.lambda.client.manager.managers.UUIDManager
 import com.lambda.client.util.text.MessageSendHelper
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 object PlaytimeCommand: ClientCommand(
     name = "playtime",
@@ -17,38 +19,26 @@ object PlaytimeCommand: ClientCommand(
     init {
         string("playerName") { playerName ->
             executeAsync("Check a player's playtime on 2b2t") {
-                UUIDManager.getByName(playerName.value)?.let { profile ->
+                UUIDManager.getByName(playerName.value)?.let outer@ { profile ->
                     ConnectionUtils.requestRawJsonFrom("https://api.2b2t.vc/playtime?uuid=${profile.uuid}") {
                         MessageSendHelper.sendChatMessage("Failed querying playtime data for player: ${it.message}")
                     }?.let {
                         if (it.isEmpty()) {
                             MessageSendHelper.sendChatMessage("No data found for player: ${profile.name}")
-                            return@let
+                            return@outer
                         }
                         val jsonElement = parser.parse(it)
-                        val playtimeSeconds = jsonElement.asJsonObject["playtimeSeconds"].asInt
-                        MessageSendHelper.sendChatMessage("${profile.name} has played for ${formatDuration(playtimeSeconds.toLong())}")
+                        val playtimeSeconds = jsonElement.asJsonObject["playtimeSeconds"].asDouble
+                        MessageSendHelper.sendChatMessage("${profile.name} has played for ${
+                            playtimeSeconds.toDuration(DurationUnit.SECONDS)
+                        }")
                     }
-                } ?: run{
-                    MessageSendHelper.sendChatMessage("Failed to find player with name ${playerName.value}")
-                }
-            }
-        }
-    }
 
-    private fun formatDuration(durationInSeconds: Long): String {
-        val secondsInMinute = 60L
-        val secondsInHour = secondsInMinute * 60L
-        val secondsInDay = secondsInHour * 24L
-        val secondsInMonth = secondsInDay * 30L // assuming 30 days per month
+                    return@executeAsync
+                }
 
-        val months = durationInSeconds / secondsInMonth
-        val days = (durationInSeconds % secondsInMonth) / secondsInDay
-        val hours = (durationInSeconds % secondsInDay) / secondsInHour
-        return buildString {
-            append(if(months > 0) "${grammar(months.toInt(), "month", "months")}, " else "")
-            append(if(days > 0) "${grammar(days.toInt(), "day", "days")}, " else "")
-            append(grammar(hours.toInt(), "hour", "hours"))
+                MessageSendHelper.sendChatMessage("Failed to find player with name ${playerName.value}")
+            }
         }
     }
 }

src/main/kotlin/com/lambda/client/command/commands/SeenCommand.kt

@@ -20,23 +20,25 @@ object SeenCommand : ClientCommand(
     init {
         string("playerName") { playerName ->
             executeAsync("Check when a player was last seen") {
-                UUIDManager.getByName(playerName.value)?.let { profile ->
+                UUIDManager.getByName(playerName.value)?.let outer@ { profile ->
                     ConnectionUtils.requestRawJsonFrom("https://api.2b2t.vc/seen?uuid=${profile.uuid}") {
                         MessageSendHelper.sendChatMessage("Failed querying seen data for player: ${it.message}")
                     }?.let {
                         if (it.isEmpty()) {
                             MessageSendHelper.sendChatMessage("No data found for player: ${profile.name}")
-                            return@let
+                            return@outer
                         }
                         val jsonElement = parser.parse(it)
                         val dateRaw = jsonElement.asJsonObject["time"].asString
                         val parsedDate = ZonedDateTime.parse(dateRaw).withZoneSameInstant(ZoneId.systemDefault())
                         val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(java.time.format.FormatStyle.LONG)
                         MessageSendHelper.sendChatMessage("${profile.name} was last seen on ${parsedDate.format(dateFormatter)}")
                     }
-                } ?: run {
-                    MessageSendHelper.sendChatMessage("Failed to find player with name ${playerName.value}")
+
+                    return@executeAsync
                 }
+
+                MessageSendHelper.sendChatMessage("Failed to find player with name ${playerName.value}")
             }
         }
     }

src/main/kotlin/com/lambda/client/gui/hudgui/elements/misc/Queue2B2T.kt

@@ -68,27 +68,28 @@ internal object Queue2B2T : LabelHud(
         if (NetworkManager.isOffline) {
             displayText.addLine("Cannot connect to api.2b2t.vc", primaryColor)
             displayText.add("Make sure your internet is working!", primaryColor)
-        } else {
-            if (showPriority) {
-                displayText.add("Priority: ", primaryColor)
-                displayText.add("${queueData.prio}", secondaryColor)
-            }
+            return
+        }
 
-            if (showRegular) {
-                displayText.add("Regular: ", primaryColor)
-                displayText.add("${queueData.regular}", secondaryColor)
-            }
-            if (showUpdatedTime) {
-                displayText.addLine("", primaryColor)
-                displayText.add("Last updated $lastUpdate ago", primaryColor)
-            }
+        if (showPriority) {
+            displayText.add("Priority: ", primaryColor)
+            displayText.add("${queueData.prio}", secondaryColor)
+        }
+
+        if (showRegular) {
+            displayText.add("Regular: ", primaryColor)
+            displayText.add("${queueData.regular}", secondaryColor)
+        }
+        if (showUpdatedTime) {
+            displayText.addLine("", primaryColor)
+            displayText.add("Last updated $lastUpdate ago", primaryColor)
         }
     }
 
     private fun sendWarning() {
         MessageSendHelper.sendWarningMessage(
             "This module uses an external API, api.2b2t.vc, which is operated by rfresh#2222." +
-                "If you do not trust this external API / have not verified the safety yourself, disable this HUD component."
+                " If you do not trust this external API / have not verified the safety yourself, disable this HUD component."
         )
         hasShownWarning.value = true
     }
@@ -101,9 +102,10 @@ internal object Queue2B2T : LabelHud(
                 }?.let {
                     gson.fromJson(it, QueueData::class.java)?.let { data ->
                         queueData = data
-                    } ?: run {
-                        LambdaMod.LOG.error("No queue data received. Is 2b2t down?")
+                        return@runCatching
                     }
+
+                    LambdaMod.LOG.error("No queue data received. Is 2b2t down?")
                 }
             }
         }