From f6ede67c26bfcbc0cfa0164e2f1a31bb0460b22e Mon Sep 17 00:00:00 2001
From: JustTemmie <47639983+JustTemmie@users.noreply.github.com>
Date: Wed, 16 Jul 2025 10:59:00 +0200
Subject: [PATCH] style: seperate out sortUsers and sortMembers

---
 components/Me/FriendsList.vue                     | 4 +---
 pages/servers/[serverId]/channels/[channelId].vue | 4 +---
 utils/sortMembers.ts                              | 7 +++++++
 utils/sortUsers.ts                                | 7 +++++++
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 utils/sortMembers.ts
 create mode 100644 utils/sortUsers.ts

diff --git a/components/Me/FriendsList.vue b/components/Me/FriendsList.vue
index 654957d..0a1481e 100644
--- a/components/Me/FriendsList.vue
+++ b/components/Me/FriendsList.vue
@@ -26,9 +26,7 @@
 <script lang="ts" setup>
 const { fetchFriends } = useApi();
 
-const friends = await fetchFriends().then((response) => {
-	return response.sort((a, b) => getDisplayName(a).localeCompare(getDisplayName(b)))
-})
+const friends = sortUsers(await fetchFriends())
 
 const props = defineProps<{
     variant: string
diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue
index dbca349..5e39ef4 100644
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@@ -64,9 +64,7 @@ onActivated(async () => {
 });
 
 async function setArrayVariables() {
-	members.value = await fetchMembers(route.params.serverId as string).then((response) => {
-		return response.sort((a, b) => getDisplayName(a.user, a).localeCompare(getDisplayName(b.user, b)))
-	});
+	members.value = sortMembers(await fetchMembers(route.params.serverId as string))
 	const guildUrl = `guilds/${route.params.serverId}`;
 	channels.value = await fetchWithApi(`${guildUrl}/channels`);
 	console.log("channels:", channels.value);
diff --git a/utils/sortMembers.ts b/utils/sortMembers.ts
new file mode 100644
index 0000000..fba862c
--- /dev/null
+++ b/utils/sortMembers.ts
@@ -0,0 +1,7 @@
+import type { GuildMemberResponse } from "~/types/interfaces";
+
+export default function sortMembers(members: GuildMemberResponse[]): GuildMemberResponse[] {
+	return members.sort((a, b) => {
+		return getDisplayName(a.user, a).localeCompare(getDisplayName(b.user, b))
+	})
+}
\ No newline at end of file
diff --git a/utils/sortUsers.ts b/utils/sortUsers.ts
new file mode 100644
index 0000000..8be8613
--- /dev/null
+++ b/utils/sortUsers.ts
@@ -0,0 +1,7 @@
+import type { UserResponse } from "~/types/interfaces";
+
+export default function sortUsers(users: UserResponse[]): UserResponse[] {
+	return users.sort((a, b) => {
+		return getDisplayName(a).localeCompare(getDisplayName(b))
+	})
+}
\ No newline at end of file