From 642dbe5270cb72e418e77f9d784c6490daa41556 Mon Sep 17 00:00:00 2001
From: Radical <radical@radical.fun>
Date: Tue, 5 Aug 2025 00:02:21 +0200
Subject: [PATCH 1/2] fix: remove order_by on single fetches

---
 src/objects/member.rs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/objects/member.rs b/src/objects/member.rs
index 0bba11b..20109cf 100644
--- a/src/objects/member.rs
+++ b/src/objects/member.rs
@@ -167,11 +167,6 @@ impl Member {
                         .and(fdsl::uuid2.eq(users::uuid))
                         .or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))),
                 )
-                .order_by(coalesce(
-                    dsl::nickname,
-                    users::display_name,
-                    users::username,
-                ))
                 .select((
                     MemberBuilder::as_select(),
                     UserBuilder::as_select(),
@@ -206,11 +201,6 @@ impl Member {
                         .and(fdsl::uuid2.eq(users::uuid))
                         .or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))),
                 )
-                .order_by(coalesce(
-                    dsl::nickname,
-                    users::display_name,
-                    users::username,
-                ))
                 .select((
                     MemberBuilder::as_select(),
                     UserBuilder::as_select(),
@@ -222,11 +212,6 @@ impl Member {
             (member, user) = dsl::guild_members
                 .filter(dsl::uuid.eq(uuid))
                 .inner_join(users::table)
-                .order_by(coalesce(
-                    dsl::nickname,
-                    users::display_name,
-                    users::username,
-                ))
                 .select((MemberBuilder::as_select(), UserBuilder::as_select()))
                 .get_result(conn)
                 .await?;

From ac1678bfa8d98d757627f8b097684ee16aa8c07b Mon Sep 17 00:00:00 2001
From: Radical <radical@radical.fun>
Date: Tue, 5 Aug 2025 00:02:30 +0200
Subject: [PATCH 2/2] fix: use dedicated function for member count

---
 src/objects/member.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/objects/member.rs b/src/objects/member.rs
index 20109cf..1247ea2 100644
--- a/src/objects/member.rs
+++ b/src/objects/member.rs
@@ -268,13 +268,7 @@ impl Member {
                 .await,
         )?;
 
-        let member_count: i64 = dsl::guild_members
-            .filter(dsl::guild_uuid.eq(guild_uuid))
-            .count()
-            .get_result(conn)
-            .await?;
-
-        let pages = member_count as f32 / per_page as f32;
+        let pages = Member::count(conn, guild_uuid).await? as f32 / per_page as f32;
 
         let mut members = Pagination::<Member> {
             objects: Vec::with_capacity(member_builders.len()),