Merge pull request 'Sort members list' (#45) from sort-members-list into main

Reviewed-on: #45
Reviewed-by: SauceyRed <saucey@saucey.red>

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

components/User/UserPopup.vue

@@ -21,8 +21,6 @@
 <script lang="ts" setup>
 import type { UserResponse } from '~/types/interfaces';
 
-const { fetchMembers } = useApi();
-
 const props = defineProps<{
 	user: UserResponse
 }>();

composables/api.ts

@@ -1,24 +1,36 @@
 import type { ChannelResponse, GuildMemberResponse, GuildResponse, MessageResponse, StatsResponse, UserResponse } from "~/types/interfaces";
 
+function ensureIsArray(list: any) {
+	if (Array.isArray(list)) {
+		return list
+	} else {
+		return []
+	}
+}
+
 export const useApi = () => {
-	async function fetchGuilds(): Promise<GuildResponse[] | undefined> {
-		return await fetchWithApi(`/guilds`);
+	async function fetchGuilds(): Promise<GuildResponse[]> {
+		return ensureIsArray(await fetchWithApi(`/guilds`));
 	}
 	
 	async function fetchGuild(guildId: string): Promise<GuildResponse | undefined> {
 		return await fetchWithApi(`/guilds/${guildId}`);
 	}
 
-	async function fetchChannels(guildId: string): Promise<ChannelResponse[] | undefined> {
-		return await fetchWithApi(`/guilds/${guildId}/channels`);
+	async function fetchMyGuilds(): Promise<GuildResponse[]> {
+		return ensureIsArray(await fetchWithApi(`/me/guilds`));
+	}
+
+	async function fetchChannels(guildId: string): Promise<ChannelResponse[]> {
+		return ensureIsArray(await fetchWithApi(`/guilds/${guildId}/channels`));
 	}
 
 	async function fetchChannel(channelId: string): Promise<ChannelResponse | undefined> {
 		return await fetchWithApi(`/channels/${channelId}`)
 	}
 
-	async function fetchMembers(guildId: string): Promise<GuildMemberResponse[] | undefined> {
-		return await fetchWithApi(`/guilds/${guildId}/members`);
+	async function fetchMembers(guildId: string): Promise<GuildMemberResponse[]> {
+		return ensureIsArray(await fetchWithApi(`/guilds/${guildId}/members`));
 	}
 
 	async function fetchMember(guildId: string, memberId: string): Promise<GuildMemberResponse | undefined> {
@@ -34,12 +46,7 @@ export const useApi = () => {
 	}
 	
 	async function fetchFriends(): Promise<UserResponse[]> {
-		const response = await fetchWithApi('/me/friends')
-		if (Array.isArray(response)) {
-			return response
-		} else {
-			return []
-		}
+		return ensureIsArray(await fetchWithApi('/me/friends'));
 	}
 
 	async function addFriend(username: string): Promise<void> {
@@ -90,6 +97,7 @@ export const useApi = () => {
 	return {
 		fetchGuilds,
 		fetchGuild,
+		fetchMyGuilds,
 		fetchChannels,
 		fetchChannel,
 		fetchMembers,

layouts/client.vue

@@ -95,7 +95,7 @@ const options = [
 						if (invite.length == 6) {
 							try {
 								const joinedGuild = await api.joinGuild(invite);
-								guilds?.push(joinedGuild);
+								guilds.push(joinedGuild);
 								return await navigateTo(`/servers/${joinedGuild.uuid}`);
 							} catch (error) {
 								alert(`Couldn't use invite: ${error}`);
@@ -151,7 +151,7 @@ const options = [
 	}
 ];
 
-const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
+const guilds = await api.fetchMyGuilds();
 
 function createDropdown() {
 	const dropdown = h(GuildDropdown, { options });

middleware/server.ts

@@ -5,10 +5,10 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
 
 	const guildId = to.params.serverId as string;
 
-	const channels: ChannelResponse[] | undefined = await fetchChannels(guildId);
+	const channels: ChannelResponse[] = await fetchChannels(guildId);
 	console.log("channels:", channels);
 
-	if (channels && channels.length > 0) {
+	if (channels.length > 0) {
 		console.log("wah");
 		return await navigateTo(`/servers/${guildId}/channels/${channels[0].uuid}`, { replace: true });
 	}

pages/servers/[serverId]/channels/[channelId].vue

@@ -64,7 +64,7 @@ onActivated(async () => {
 });
 
 async function setArrayVariables() {
-	members.value = await fetchMembers(route.params.serverId as string);
+	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);

utils/getDisplayName.ts

@@ -1,6 +1,6 @@
 import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
 
-export function getDisplayName(user: UserResponse, member?: GuildMemberResponse): string {
+export default (user: UserResponse, member?: GuildMemberResponse): string => {
 	if (member?.nickname) return member.nickname
 	if (user.display_name) return user.display_name
 	return user.username

utils/hashPassword.ts

@@ -1,4 +1,4 @@
-export async function hashPassword(password: string) {
+export default async (password: string) => {
   const encodedPass = new TextEncoder().encode(password);
   const hashBuffer = await crypto.subtle.digest("SHA-384", encodedPass);
   const hashArray = Array.from(new Uint8Array(hashBuffer));

utils/sortMembers.ts

@@ -0,0 +1,7 @@
+import type { GuildMemberResponse } from "~/types/interfaces";
+
+export default (members: GuildMemberResponse[]): GuildMemberResponse[] => {
+	return members.sort((a, b) => {
+		return getDisplayName(a.user, a).localeCompare(getDisplayName(b.user, b))
+	})
+}

utils/sortUsers.ts

@@ -0,0 +1,7 @@
+import type { UserResponse } from "~/types/interfaces";
+
+export default (users: UserResponse[]): UserResponse[] => {
+	return users.sort((a, b) => {
+		return getDisplayName(a).localeCompare(getDisplayName(b))
+	})
+}

utils/validateUsername.ts

@@ -0,0 +1,3 @@
+export default (username: string) => {
+  return /^[\w.-]+$/.test(username);
+}

utils/validation.ts

@@ -1,3 +0,0 @@
-export function validateUsername(username: string) {
-  return /^[\w.-]+$/.test(username);
-}