style: move profile functions into a composable

components/Avatar.vue

@@ -12,6 +12,8 @@
 import { NuxtImg } from '#components';
 import type { GuildMemberResponse, UserResponse } from '~/types/interfaces';
 
+const { getDisplayName } = useProfile()
+
 const props = defineProps<{
 	profile: UserResponse | GuildMemberResponse,
 }>();

components/Guild/MemberEntry.vue

@@ -11,6 +11,8 @@
 import { ModalProfilePopup } from '#components';
 import type { GuildMemberResponse } from '~/types/interfaces';
 
+const { getDisplayName } = useProfile()
+
 const props = defineProps<{
     member: GuildMemberResponse
 }>();
@@ -18,12 +20,10 @@ const props = defineProps<{
 const modalPopupVisible = ref<boolean>(false);
 
 function showModalPopup() {
-    console.log("hello there")
     modalPopupVisible.value = true
 }
 
 function hideModalPopup() {
-    console.log("gone")
     modalPopupVisible.value = false
 }
 </script>

components/Me/AddFriend.vue

@@ -23,8 +23,10 @@ async function sendRequest() {
 		try {
 			await addFriend(inputField.value.value)
 			alert("Friend request sent!")
-		} catch {
+		} catch (error: any) {
-			alert("Request failed :(")
+			if (error?.response?.status !== 200) {
+				alert(`error ${error?.response?.status} met whilst trying to add friend\n"${error?.response._data?.message}"`)
+			}
 		}
 	}
 }

components/Me/FriendsList.vue

@@ -24,6 +24,8 @@
 </template>
 
 <script lang="ts" setup>
+
+const { getDisplayName } = useProfile()
 const { fetchFriends } = useApi();
 
 const friends = sortUsers(await fetchFriends())

components/Message.vue

@@ -69,6 +69,8 @@ import type { MessageProps } from '~/types/props';
 import MessageMedia from './MessageMedia.vue';
 import MessageReply from './UserInterface/MessageReply.vue';
 
+const { getDisplayName } = useProfile()
+
 const props = defineProps<MessageProps>();
 
 const messageElement = ref<HTMLDivElement>();

components/MessageArea.vue

@@ -44,6 +44,7 @@ import type { MessageResponse, ScrollPosition, UserResponse } from '~/types/inte
 import scrollToBottom from '~/utils/scrollToBottom';
 import { generateIrcColor } from '#imports';
 
+const { getDisplayName } = useProfile()
 const { fetchMe } = useApi()
 
 const props = defineProps<{ channelUrl: string, amount?: number, offset?: number }>();

components/Modal/ProfilePopup.vue

@@ -62,6 +62,7 @@ import type { GuildMemberResponse, ModalProps, UserResponse } from '~/types/inte
 import VerticalSpacer from '../UserInterface/VerticalSpacer.vue';
 import Button from '../UserInterface/Button.vue';
 
+const { getDisplayName, getUsername, getPronouns, getAboutMe, getRegistrationDate, getGuildJoinDate, getFriendsSince, getUuid } = useProfile()
 const { addFriend, fetchMe } = useApi();
 
 const props = defineProps<ModalProps & {
@@ -69,7 +70,6 @@ const props = defineProps<ModalProps & {
 	onFinish: () => void
 }>();
 
-const friendsSinceRequest = await getFriendsSince(props.profile)
 const me = await fetchMe() as UserResponse
 
 const displayName = getDisplayName(props.profile)
@@ -79,7 +79,7 @@ const aboutMe = getAboutMe(props.profile)
 
 const registrationDate = getRegistrationDate(props.profile)
 const joinDate = getGuildJoinDate(props.profile)
-const friendsSince = friendsSinceRequest
+const friendsSince = await getFriendsSince(props.profile)
 
 const uuid = getUuid(props.profile)
 
@@ -96,8 +96,10 @@ async function buttonAddFriend() {
 	try {
 		await addFriend(username)
 		alert("sent!")
-	} catch {
+	} catch (error: any) {
-		alert("failed :(")
+		if (error?.response?.status !== 200) {
+			alert(`error ${error?.response?.status} met whilst trying to add friend\n"${error?.response._data?.message}"`)
+		}
 	}
 }
 
@@ -165,7 +167,6 @@ function buttonEditProfile() {
 #display-name {
 	font-weight: 800;
 	font-size: 2em;
-
 }
 
 #username-and-pronouns {
@@ -235,6 +236,7 @@ function buttonEditProfile() {
 .date-entry-title {
 	font-size: .8em;
 }
+
 .date-entry-value {
 	font-size: 1em;
 }

components/User/UserEntry.vue

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

components/User/UserPopup.vue

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

composables/profile.ts

@@ -0,0 +1,95 @@
+import type { GuildMemberResponse, UserResponse } from "~/types/interfaces"
+
+const { fetchFriends } = useApi();
+
+export const useProfile = () => {
+	function getAboutMe (profile: UserResponse | GuildMemberResponse): string | null {
+		if ("username" in profile) {
+			return profile.about
+		} else {
+			return profile.user.about
+		}
+	}
+
+	function getDisplayName (profile: UserResponse | GuildMemberResponse): string  {
+		if ("username" in profile) {
+			// assume it's a UserRespone
+			if (profile.display_name) return profile.display_name
+			return profile.username
+		} else {
+			// assume it's a GuildMemberResponse
+			if (profile.nickname) return profile.nickname
+			if (profile.user.display_name) return profile.user.display_name
+			return profile.user.username
+		}
+	}
+
+	async function getFriendsSince (profile: UserResponse | GuildMemberResponse): Promise<Date | null> {
+		let user_uuid: string;
+
+		if ("username" in profile) {
+			user_uuid = profile.uuid
+		} else {
+			user_uuid = profile.user_uuid
+		}
+
+		const friends = await fetchFriends()
+		const friend = friends.find(friend => friend.uuid === user_uuid);
+		if (friend?.friends_since) {
+			return new Date(friend.friends_since);
+		}
+
+		return null
+	}
+
+	function getGuildJoinDate (profile: UserResponse | GuildMemberResponse): Date | null {
+		if ("username" in profile) {
+			return null
+		} else {
+			return uuidToDate(profile.uuid)
+		}
+	}
+
+	function getPronouns (profile: UserResponse | GuildMemberResponse): string | null  {
+		if ("username" in profile) {
+			return profile.pronouns
+		} else {
+			return profile.user.pronouns
+		}
+	}
+
+	function getRegistrationDate (profile: UserResponse | GuildMemberResponse): Date | null {
+		if ("username" in profile) {
+			return uuidToDate(profile.uuid)
+		} else {
+			return uuidToDate(profile.user_uuid)
+		}
+	}
+
+	function getUsername (profile: UserResponse | GuildMemberResponse): string {
+		if ("username" in profile) {
+			return profile.username
+		} else {
+			return profile.user.username
+		}
+	}
+
+	function getUuid (profile: UserResponse | GuildMemberResponse): string | null {
+		if ("username" in profile) {
+			return profile.uuid
+		} else {
+			return profile.user.uuid
+		}
+	}
+	
+	return {
+		getAboutMe,
+		getDisplayName,
+		getFriendsSince,
+		getGuildJoinDate,
+		getRegistrationDate,
+		getPronouns,
+		getUsername,
+		getUuid		
+	}
+}

layouts/client.vue

@@ -61,6 +61,7 @@ const loading = useState("loading", () => false);
 
 const createButtonContainer = ref<HTMLButtonElement>();
 
+const { getDisplayName } = useProfile()
 const api = useApi();
 
 const blockedCanvas = isCanvasBlocked()

utils/getAboutMe.ts

@@ -1,9 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-export default (profile: UserResponse | GuildMemberResponse): string | null => {
-	if ("username" in profile) {
-		return profile.about
-	} else {
-		return profile.user.about
-	}
-}

utils/getDisplayName.ts

@@ -1,14 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-export default (profile: UserResponse | GuildMemberResponse): string => {
-	if ("username" in profile) {
-		// assume it's a UserRespone
-		if (profile.display_name) return profile.display_name
-		return profile.username
-	} else {
-		// assume it's a GuildMemberResponse
-		if (profile.nickname) return profile.nickname
-		if (profile.user.display_name) return profile.user.display_name
-		return profile.user.username
-	}
-}

utils/getFriendsSince.ts

@@ -1,21 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-const { fetchFriends } = useApi();
-
-export default async (profile: UserResponse | GuildMemberResponse): Promise<Date | null> => {
-	let user_uuid: string;
-
-	if ("username" in profile) {
-		user_uuid = profile.uuid
-	} else {
-		user_uuid = profile.user_uuid
-	}
-
-	const friends = await fetchFriends()
-	const friend = friends.find(friend => friend.uuid === user_uuid);
-	if (friend?.friends_since) {
-		return new Date(friend.friends_since);
-	}
-
-	return null
-}

utils/getGuildJoinDate.ts

@@ -1,9 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-export default (profile: UserResponse | GuildMemberResponse): Date | null => {
-	if ("username" in profile) {
-		return null
-	} else {
-		return uuidToDate(profile.uuid)
-	}
-}

utils/getPronouns.ts

@@ -1,9 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-export default (profile: UserResponse | GuildMemberResponse): string | null => {
-	if ("username" in profile) {
-		return profile.pronouns
-	} else {
-		return profile.user.pronouns
-	}
-}

utils/getRegistrationDate.ts

@@ -1,9 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-export default (profile: UserResponse | GuildMemberResponse): Date | null => {
-	if ("username" in profile) {
-		return uuidToDate(profile.uuid)
-	} else {
-		return uuidToDate(profile.user_uuid)
-	}
-}

utils/getUsername.ts

@@ -1,9 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-export default (profile: UserResponse | GuildMemberResponse): string => {
-	if ("username" in profile) {
-		return profile.username
-	} else {
-		return profile.user.username
-	}
-}

utils/getUuid.ts

@@ -1,9 +0,0 @@
-import type { GuildMemberResponse, UserResponse } from "~/types/interfaces";
-
-export default (profile: UserResponse | GuildMemberResponse): string | null => {
-	if ("username" in profile) {
-		return profile.uuid
-	} else {
-		return profile.user.uuid
-	}
-}

utils/sortMembers.ts

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

utils/sortUsers.ts

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