Merge pull request #77 from KingsMMA/master

Use firstOrNull in NameCacheService to not throw for uncached players
flytegg · Dec 16, 2024 · dfcaf7c · dfcaf7c
2 parents bd5a3a1 + 935a6b9
commit dfcaf7c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/kotlin/gg/flyte/twilight/data/service/NameCacheService.kt b/src/main/kotlin/gg/flyte/twilight/data/service/NameCacheService.kt
@@ -38,14 +38,15 @@ object NameCacheService {
 
     private fun queryMongoNameByUUID(uuid: UUID): String? {
         mongoCache.let {
-            mongoCache.find(Filters.eq("_id", uuid.toString())).first()
-                .let {
+            mongoCache.find(Filters.eq("_id", uuid.toString())).firstOrNull()
+                ?.let {
                     val name =
                         it.getString("name") ?: throw MongoException("Document with '_id' '$uuid' has no field 'name'.")
                     cache[uuid] = name
                     return name
                 }
         }
+        return null
     }
 
     private fun queryMojangNameByUUID(uuid: UUID): String {
@@ -78,13 +79,14 @@ object NameCacheService {
                     "name",
                     Pattern.compile("^$name$", Pattern.CASE_INSENSITIVE)
                 )
-            ).first().let {
+            ).firstOrNull()?.let {
                 val uuid = UUID.fromString(it.getString("_id"))
                     ?: throw MongoException("Document with 'name' '$name' has no valid UUID at '_id'.")
                 cache[uuid] = name
                 return uuid
             }
         }
+        return null
     }
 
     private fun queryMojangUUIDByName(name: String): UUID {