Treat account and clan names as case-insensitive

GregHib · Jul 31, 2024 · 459ba56 · 459ba56
1 parent 81aa3ea
commit 459ba56
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/AccountDefinitions.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/AccountDefinitions.kt
@@ -21,9 +21,9 @@ class AccountDefinitions(
 ) {
 
     fun add(player: Player) {
-        displayNames[player.accountName] = player.name
-        definitions[player.name] = AccountDefinition(player.accountName, player.name, player.previousName, player.passwordHash)
-        clans[player.name] = Clan(
+        displayNames[player.accountName.lowercase()] = player.name
+        definitions[player.name.lowercase()] = AccountDefinition(player.accountName, player.name, player.previousName, player.passwordHash)
+        clans[player.name.lowercase()] = Clan(
             owner = player.accountName,
             ownerDisplayName = player.name,
             name = player["clan_name", ""],
@@ -38,30 +38,34 @@ class AccountDefinitions(
     }
 
     fun update(accountName: String, newName: String, previousDisplayName: String) {
-        val definition = definitions.remove(previousDisplayName) ?: return
-        definitions[newName] = definition
+        val definition = definitions.remove(previousDisplayName.lowercase()) ?: return
+        definitions[newName.lowercase()] = definition
         definition.displayName = newName
         definition.previousName = previousDisplayName
-        displayNames[accountName] = newName
+        displayNames[accountName.lowercase()] = newName
     }
 
-    fun clan(displayName: String) = clans[displayName]
+    fun clan(displayName: String) = clans[displayName.lowercase()]
 
     fun getByAccount(account: String): AccountDefinition? {
-        return get(displayNames[account] ?: return null)
+        return get(displayNames[account.lowercase()] ?: return null)
     }
 
-    fun get(key: String) = definitions[key]
+    fun get(key: String) = definitions[key.lowercase()]
 
-    fun getValue(key: String) = definitions.getValue(key)
+    fun getValue(key: String) = definitions.getValue(key.lowercase())
 
     fun load(storage: AccountStorage = get()): AccountDefinitions {
         timedLoad("account") {
-            definitions.putAll(storage.names())
+            for ((name, definition) in storage.names()) {
+                definitions[name.lowercase()] = definition
+            }
             for (def in definitions.values) {
-                displayNames[def.accountName] = def.displayName
+                displayNames[def.accountName.lowercase()] = def.displayName
+            }
+            for ((name, definition) in storage.clans()) {
+                clans[name.lowercase()] = definition
             }
-            clans.putAll(storage.clans())
             definitions.size
         }
         return this

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/data/json/FileStorage.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/data/json/FileStorage.kt
@@ -118,6 +118,6 @@ class FileStorage(
     }
 
     companion object {
-        private fun fileName(name: String) = "${name}.json"
+        private fun fileName(name: String) = "${name.lowercase()}.json"
     }
 }