From 134c43ad9eff4d6882c2550dc0901a031b7a3bed Mon Sep 17 00:00:00 2001
From: Emma Cypress <emmaffle@modrinth.com>
Date: Sun, 26 Jun 2022 05:04:34 +0000
Subject: [PATCH] Always return the username as fetched from the database
 (#382)

Co-authored-by: Patrick <cryne@gmx.de>
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
---
 sqlx-data.json                   | 130 ++++++++++++++++---------------
 src/database/models/user_item.rs |   4 +-
 2 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/sqlx-data.json b/sqlx-data.json
index 3bd305625..eff8cd0a6 100644
--- a/sqlx-data.json
+++ b/sqlx-data.json
@@ -3099,6 +3099,74 @@
     },
     "query": "SELECT EXISTS(SELECT 1 FROM versions WHERE (version_number = $1) AND (mod_id = $2))"
   },
+  "7ecf1bdb78a03dbdee2e4a57d0914409751c13bdc8f01fa82c8001c2255e31a5": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "github_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "name",
+          "ordinal": 2,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "email",
+          "ordinal": 3,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "avatar_url",
+          "ordinal": 4,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "username",
+          "ordinal": 5,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "bio",
+          "ordinal": 6,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "created",
+          "ordinal": 7,
+          "type_info": "Timestamptz"
+        },
+        {
+          "name": "role",
+          "ordinal": 8,
+          "type_info": "Varchar"
+        }
+      ],
+      "nullable": [
+        false,
+        true,
+        true,
+        true,
+        true,
+        false,
+        true,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "\n            SELECT u.id, u.github_id, u.name, u.email,\n                u.avatar_url, u.username, u.bio,\n                u.created, u.role\n            FROM users u\n            WHERE LOWER(u.username) = LOWER($1)\n            "
+  },
   "8129255d25bf0624d83f50558b668ed7b7f9c264e380d276522fc82bc871939b": {
     "describe": {
       "columns": [],
@@ -5510,68 +5578,6 @@
     },
     "query": "\n            SELECT id FROM licenses\n            WHERE short = $1\n            "
   },
-  "d97246f46e85cd99356468cdf36f00d86d1d576f94e4a259bf8b43cf20463f0e": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "github_id",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "name",
-          "ordinal": 2,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "email",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "avatar_url",
-          "ordinal": 4,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "bio",
-          "ordinal": 5,
-          "type_info": "Varchar"
-        },
-        {
-          "name": "created",
-          "ordinal": 6,
-          "type_info": "Timestamptz"
-        },
-        {
-          "name": "role",
-          "ordinal": 7,
-          "type_info": "Varchar"
-        }
-      ],
-      "nullable": [
-        false,
-        true,
-        true,
-        true,
-        true,
-        true,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Text"
-        ]
-      }
-    },
-    "query": "\n            SELECT u.id, u.github_id, u.name, u.email,\n                u.avatar_url, u.bio,\n                u.created, u.role\n            FROM users u\n            WHERE LOWER(u.username) = LOWER($1)\n            "
-  },
   "dc2a3a07469ce25a9749d9d1c2e7424ac6765a72e8d9dd90eb682664f7cf036f": {
     "describe": {
       "columns": [],
diff --git a/src/database/models/user_item.rs b/src/database/models/user_item.rs
index 127b2ba71..7efcbbdb1 100644
--- a/src/database/models/user_item.rs
+++ b/src/database/models/user_item.rs
@@ -127,7 +127,7 @@ impl User {
         let result = sqlx::query!(
             "
             SELECT u.id, u.github_id, u.name, u.email,
-                u.avatar_url, u.bio,
+                u.avatar_url, u.username, u.bio,
                 u.created, u.role
             FROM users u
             WHERE LOWER(u.username) = LOWER($1)
@@ -144,7 +144,7 @@ impl User {
                 name: row.name,
                 email: row.email,
                 avatar_url: row.avatar_url,
-                username,
+                username: row.username,
                 bio: row.bio,
                 created: row.created,
                 role: row.role,