From 89a9d2b085f21b5cc1d79aa783dbb3026c87439d Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Mon, 25 Sep 2023 21:31:12 +0100
Subject: [PATCH] Make `whois` commands case-insensitive

---
 ...40914bc63425c15ea3d156b437944d0e2247.json} |  4 ++--
 ...44377c40bc92785dddf927dba6d26bea522b.json} |  4 ++--
 src/db/members.rs                             | 20 +++++++++++--------
 3 files changed, 16 insertions(+), 12 deletions(-)
 rename .sqlx/{query-56f54bfdc63d7c09add2bb4dec1e6a4544a684611755bcf2fa9424702ecd11cf.json => query-00f839a86be2867afbb09fbbd0b940914bc63425c15ea3d156b437944d0e2247.json} (83%)
 rename .sqlx/{query-87fdce1d94c71a23196d11d87fbc748cb4c9ef59333f546da68b52322bd104c2.json => query-de27ac619959b8f39424b8c4c46044377c40bc92785dddf927dba6d26bea522b.json} (83%)

diff --git a/.sqlx/query-56f54bfdc63d7c09add2bb4dec1e6a4544a684611755bcf2fa9424702ecd11cf.json b/.sqlx/query-00f839a86be2867afbb09fbbd0b940914bc63425c15ea3d156b437944d0e2247.json
similarity index 83%
rename from .sqlx/query-56f54bfdc63d7c09add2bb4dec1e6a4544a684611755bcf2fa9424702ecd11cf.json
rename to .sqlx/query-00f839a86be2867afbb09fbbd0b940914bc63425c15ea3d156b437944d0e2247.json
index 98c295a..cdd5a9d 100644
--- a/.sqlx/query-56f54bfdc63d7c09add2bb4dec1e6a4544a684611755bcf2fa9424702ecd11cf.json
+++ b/.sqlx/query-00f839a86be2867afbb09fbbd0b940914bc63425c15ea3d156b437944d0e2247.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "select * from members where realname=$1",
+  "query": "select * from members where lower(nickname)=lower($1)",
   "describe": {
     "columns": [
       {
@@ -42,5 +42,5 @@
       false
     ]
   },
-  "hash": "56f54bfdc63d7c09add2bb4dec1e6a4544a684611755bcf2fa9424702ecd11cf"
+  "hash": "00f839a86be2867afbb09fbbd0b940914bc63425c15ea3d156b437944d0e2247"
 }
diff --git a/.sqlx/query-87fdce1d94c71a23196d11d87fbc748cb4c9ef59333f546da68b52322bd104c2.json b/.sqlx/query-de27ac619959b8f39424b8c4c46044377c40bc92785dddf927dba6d26bea522b.json
similarity index 83%
rename from .sqlx/query-87fdce1d94c71a23196d11d87fbc748cb4c9ef59333f546da68b52322bd104c2.json
rename to .sqlx/query-de27ac619959b8f39424b8c4c46044377c40bc92785dddf927dba6d26bea522b.json
index 82a65de..56c482e 100644
--- a/.sqlx/query-87fdce1d94c71a23196d11d87fbc748cb4c9ef59333f546da68b52322bd104c2.json
+++ b/.sqlx/query-de27ac619959b8f39424b8c4c46044377c40bc92785dddf927dba6d26bea522b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "select * from members where nickname=$1",
+  "query": "select * from members where lower(realname)=lower($1)",
   "describe": {
     "columns": [
       {
@@ -42,5 +42,5 @@
       false
     ]
   },
-  "hash": "87fdce1d94c71a23196d11d87fbc748cb4c9ef59333f546da68b52322bd104c2"
+  "hash": "de27ac619959b8f39424b8c4c46044377c40bc92785dddf927dba6d26bea522b"
 }
diff --git a/src/db/members.rs b/src/db/members.rs
index 9dc1b0d..1e8d5e9 100644
--- a/src/db/members.rs
+++ b/src/db/members.rs
@@ -55,11 +55,13 @@ pub(crate) async fn get_member_by_nickname(
     pool: &sqlx::PgPool,
     nickname: &str,
 ) -> Result<Option<Member>, Error> {
-    Ok(
-        sqlx::query_as!(Member, "select * from members where nickname=$1", nickname)
-            .fetch_optional(pool)
-            .await?,
+    Ok(sqlx::query_as!(
+        Member,
+        "select * from members where lower(nickname)=lower($1)",
+        nickname
     )
+    .fetch_optional(pool)
+    .await?)
 }
 
 /// Get member entry by Real Name
@@ -67,11 +69,13 @@ pub(crate) async fn get_member_by_realname(
     pool: &sqlx::PgPool,
     realname: &str,
 ) -> Result<Option<Member>, Error> {
-    Ok(
-        sqlx::query_as!(Member, "select * from members where realname=$1", realname)
-            .fetch_optional(pool)
-            .await?,
+    Ok(sqlx::query_as!(
+        Member,
+        "select * from members where lower(realname)=lower($1)",
+        realname
     )
+    .fetch_optional(pool)
+    .await?)
 }
 
 /// Add member entry to members table