From 1ac3042470b5307fafeef97da509c80f5e3309b1 Mon Sep 17 00:00:00 2001
From: JustTemmie <47639983+JustTemmie@users.noreply.github.com>
Date: Sat, 19 Jul 2025 17:19:14 +0200
Subject: [PATCH] style: move profile functions into a composable

---
 components/Avatar.vue             |  2 +
 components/Guild/MemberEntry.vue  |  2 +
 components/Me/FriendsList.vue     |  2 +
 components/Message.vue            |  2 +
 components/MessageArea.vue        |  1 +
 components/Modal/ProfilePopup.vue |  1 +
 components/User/UserEntry.vue     |  2 +
 components/User/UserPopup.vue     |  2 +
 composables/profile.ts            | 95 +++++++++++++++++++++++++++++++
 layouts/client.vue                |  1 +
 utils/getAboutMe.ts               |  9 ---
 utils/getDisplayName.ts           | 14 -----
 utils/getFriendsSince.ts          | 21 -------
 utils/getGuildJoinDate.ts         |  9 ---
 utils/getPronouns.ts              |  9 ---
 utils/getRegistrationDate.ts      |  9 ---
 utils/getUsername.ts              |  9 ---
 utils/getUuid.ts                  |  9 ---
 utils/sortMembers.ts              |  1 +
 utils/sortUsers.ts                |  1 +
 20 files changed, 112 insertions(+), 89 deletions(-)
 create mode 100644 composables/profile.ts
 delete mode 100644 utils/getAboutMe.ts
 delete mode 100644 utils/getDisplayName.ts
 delete mode 100644 utils/getFriendsSince.ts
 delete mode 100644 utils/getGuildJoinDate.ts
 delete mode 100644 utils/getPronouns.ts
 delete mode 100644 utils/getRegistrationDate.ts
 delete mode 100644 utils/getUsername.ts
 delete mode 100644 utils/getUuid.ts

diff --git a/components/Avatar.vue b/components/Avatar.vue
index 5f16251..23aae79 100644
--- a/components/Avatar.vue
+++ b/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,
 }>();
diff --git a/components/Guild/MemberEntry.vue b/components/Guild/MemberEntry.vue
index 0c82d61..d9ce4f6 100644
--- a/components/Guild/MemberEntry.vue
+++ b/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
 }>();
diff --git a/components/Me/FriendsList.vue b/components/Me/FriendsList.vue
index 0a1481e..25b9924 100644
--- a/components/Me/FriendsList.vue
+++ b/components/Me/FriendsList.vue
@@ -24,6 +24,8 @@
 </template>
 
 <script lang="ts" setup>
+
+const { getDisplayName } = useProfile()
 const { fetchFriends } = useApi();
 
 const friends = sortUsers(await fetchFriends())
diff --git a/components/Message.vue b/components/Message.vue
index 71687e1..7f43049 100644
--- a/components/Message.vue
+++ b/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>();
diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index 0fe702e..80606fb 100644
--- a/components/MessageArea.vue
+++ b/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 }>();
diff --git a/components/Modal/ProfilePopup.vue b/components/Modal/ProfilePopup.vue
index ac97e19..07181be 100644
--- a/components/Modal/ProfilePopup.vue
+++ b/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 & {
diff --git a/components/User/UserEntry.vue b/components/User/UserEntry.vue
index d0d4ad6..204ec73 100644
--- a/components/User/UserEntry.vue
+++ b/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
 }>();
diff --git a/components/User/UserPopup.vue b/components/User/UserPopup.vue
index 406ba89..9c30824 100644
--- a/components/User/UserPopup.vue
+++ b/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
 }>();
diff --git a/composables/profile.ts b/composables/profile.ts
new file mode 100644
index 0000000..1fc4f24
--- /dev/null
+++ b/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		
+	}
+}
diff --git a/layouts/client.vue b/layouts/client.vue
index 48a7f66..626783d 100644
--- a/layouts/client.vue
+++ b/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()
diff --git a/utils/getAboutMe.ts b/utils/getAboutMe.ts
deleted file mode 100644
index 9f67a29..0000000
--- a/utils/getAboutMe.ts
+++ /dev/null
@@ -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
-	}
-}
\ No newline at end of file
diff --git a/utils/getDisplayName.ts b/utils/getDisplayName.ts
deleted file mode 100644
index d1be9a8..0000000
--- a/utils/getDisplayName.ts
+++ /dev/null
@@ -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
-	}
-}
\ No newline at end of file
diff --git a/utils/getFriendsSince.ts b/utils/getFriendsSince.ts
deleted file mode 100644
index 3f6d859..0000000
--- a/utils/getFriendsSince.ts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/utils/getGuildJoinDate.ts b/utils/getGuildJoinDate.ts
deleted file mode 100644
index 1b89e9a..0000000
--- a/utils/getGuildJoinDate.ts
+++ /dev/null
@@ -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)
-	}
-}
\ No newline at end of file
diff --git a/utils/getPronouns.ts b/utils/getPronouns.ts
deleted file mode 100644
index b7cb55d..0000000
--- a/utils/getPronouns.ts
+++ /dev/null
@@ -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
-	}
-}
\ No newline at end of file
diff --git a/utils/getRegistrationDate.ts b/utils/getRegistrationDate.ts
deleted file mode 100644
index 010d871..0000000
--- a/utils/getRegistrationDate.ts
+++ /dev/null
@@ -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)
-	}
-}
\ No newline at end of file
diff --git a/utils/getUsername.ts b/utils/getUsername.ts
deleted file mode 100644
index ba0dfbb..0000000
--- a/utils/getUsername.ts
+++ /dev/null
@@ -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
-	}
-}
\ No newline at end of file
diff --git a/utils/getUuid.ts b/utils/getUuid.ts
deleted file mode 100644
index 0bc7316..0000000
--- a/utils/getUuid.ts
+++ /dev/null
@@ -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
-	}
-}
\ No newline at end of file
diff --git a/utils/sortMembers.ts b/utils/sortMembers.ts
index e0f9c8e..b232763 100644
--- a/utils/sortMembers.ts
+++ b/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) => {
diff --git a/utils/sortUsers.ts b/utils/sortUsers.ts
index 8708366..83f5713 100644
--- a/utils/sortUsers.ts
+++ 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) => {