fix username change logic

1 files changed, 9 insertions, 9 deletions

diff --git a/routes/users.ts b/routes/users.ts
index 7b9a486b..e3810d70 100644
--- a/routes/users.ts
+++ b/routes/users.ts
@@ -241,17 +241,17 @@ export default {
 
       if (username) {
         const currentUsername = user.username.replace(/\s/g, "").toLowerCase();
-        exists = await db.exists(`user:${currentUsername}`);
+        if (username !== currentUsername) {
+          exists = await db.exists(`user:${username}`);
 
-        if (currentUsername !== username && exists) {
-          err("username taken", username, currentUsername);
-          fail("Username taken");
-        } else if (username) {
-          if (currentUsername !== username)
+          if (exists) {
+            err("username taken", username, currentUsername);
+            fail("Username taken");
+          } else {
             l("changing username", currentUsername, username);
-
-          await db.del(`user:${currentUsername}`);
-          user.username = username;
+            await db.del(`user:${currentUsername}`);
+            user.username = username;
+          }
         }
       }