From fe1474416f1c74059ca0185f3ceda9976fa39e0c Mon Sep 17 00:00:00 2001 From: SauceyRed Date: Sat, 31 May 2025 14:27:37 +0200 Subject: [PATCH 1/5] feat: change all occurrences of server with guild --- components/InvitePopup.vue | 2 +- layouts/client.vue | 8 ++++---- pages/servers/[serverId]/index.vue | 4 ++-- utils/fetchMember.ts | 4 ++-- utils/fetchUser.ts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/InvitePopup.vue b/components/InvitePopup.vue index ee6f124..f42a659 100644 --- a/components/InvitePopup.vue +++ b/components/InvitePopup.vue @@ -20,7 +20,7 @@ const route = useRoute(); async function generateInvite(): Promise { const createdInvite: InviteResponse | undefined = await fetchWithApi( - `/servers/${route.params.serverId}/invites`, + `/guilds/${route.params.guildId}/invites`, { method: "POST", body: { custom_id: "oijewfoiewf" } } ); diff --git a/layouts/client.vue b/layouts/client.vue index 1038412..52fb3c7 100644 --- a/layouts/client.vue +++ b/layouts/client.vue @@ -10,8 +10,8 @@ -
- +
+
@@ -26,7 +26,7 @@ import type { GuildResponse } from '~/types/interfaces'; const loading = useState("loading", () => false); -const servers: GuildResponse[] | undefined = await fetchWithApi("/me/guilds"); +const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds"); //const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[]; //console.log("servers:", servers); @@ -169,7 +169,7 @@ const members = [ padding-bottom: 1dvh; } -#servers-list { +#guilds-list { display: flex; flex-direction: column; gap: 1dvh; diff --git a/pages/servers/[serverId]/index.vue b/pages/servers/[serverId]/index.vue index ce6bea5..cc3f36a 100644 --- a/pages/servers/[serverId]/index.vue +++ b/pages/servers/[serverId]/index.vue @@ -5,8 +5,8 @@ diff --git a/utils/fetchMember.ts b/utils/fetchMember.ts index 8f4a9e4..c6eadfb 100644 --- a/utils/fetchMember.ts +++ b/utils/fetchMember.ts @@ -1,6 +1,6 @@ import type { UserResponse } from "~/types/interfaces" -export default async (serverId: string, memberId: string): Promise => { - const user = await fetchWithApi(`/guilds/${serverId}/members/${memberId}`) as UserResponse; +export default async (guildId: string, memberId: string): Promise => { + const user = await fetchWithApi(`/guilds/${guildId}/members/${memberId}`) as UserResponse; return user; } diff --git a/utils/fetchUser.ts b/utils/fetchUser.ts index d509fe0..fbd3843 100644 --- a/utils/fetchUser.ts +++ b/utils/fetchUser.ts @@ -1,6 +1,6 @@ import type { UserResponse } from "~/types/interfaces" -export default async (serverId: string, userId: string): Promise => { +export default async (guildId: string, userId: string): Promise => { const user = await fetchWithApi(`/users/${userId}`) as UserResponse; return user; } From 4eeb3a8c2a0993c2772c7181283d866ed5ed281e Mon Sep 17 00:00:00 2001 From: SauceyRed Date: Sat, 31 May 2025 14:31:32 +0200 Subject: [PATCH 2/5] fix: fetching from malformed endpoints --- pages/servers/[serverId]/channels/[channelId].vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue index cdb2c94..a921b24 100644 --- a/pages/servers/[serverId]/channels/[channelId].vue +++ b/pages/servers/[serverId]/channels/[channelId].vue @@ -102,9 +102,10 @@ const members = [ onMounted(async () => { console.log("channelid: set loading to true"); - server.value = await fetchWithApi(`servers/${route.params.serverId}`); + const serverUrl = `guilds/${route.params.serverId}`; + server.value = await fetchWithApi(serverUrl); - channels.value = await fetchWithApi(`/channels`); + channels.value = await fetchWithApi(`${serverUrl}/channels`); console.log("channels:", channels.value); channel.value = await fetchWithApi(route.path); console.log("channel:", channel.value); From aa710e0a4d48a3a507a788c71ea3a70ef26b563f Mon Sep 17 00:00:00 2001 From: SauceyRed Date: Sat, 31 May 2025 14:38:49 +0200 Subject: [PATCH 3/5] feat: rename some occurrences of guild back to server --- components/InvitePopup.vue | 2 +- layouts/client.vue | 6 +++--- pages/servers/[serverId]/channels/[channelId].vue | 12 ++++++------ pages/servers/[serverId]/index.vue | 2 +- utils/fetchMember.ts | 4 ++-- utils/fetchUser.ts | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/InvitePopup.vue b/components/InvitePopup.vue index f42a659..262507a 100644 --- a/components/InvitePopup.vue +++ b/components/InvitePopup.vue @@ -20,7 +20,7 @@ const route = useRoute(); async function generateInvite(): Promise { const createdInvite: InviteResponse | undefined = await fetchWithApi( - `/guilds/${route.params.guildId}/invites`, + `/guilds/${route.params.serverId}/invites`, { method: "POST", body: { custom_id: "oijewfoiewf" } } ); diff --git a/layouts/client.vue b/layouts/client.vue index 52fb3c7..312b0a5 100644 --- a/layouts/client.vue +++ b/layouts/client.vue @@ -10,8 +10,8 @@ -
- +
+
@@ -169,7 +169,7 @@ const members = [ padding-bottom: 1dvh; } -#guilds-list { +#servers-list { display: flex; flex-direction: column; gap: 1dvh; diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue index a921b24..5458088 100644 --- a/pages/servers/[serverId]/channels/[channelId].vue +++ b/pages/servers/[serverId]/channels/[channelId].vue @@ -5,7 +5,7 @@

{{ server?.name }} - @@ -20,7 +20,7 @@
+ :href="`/servers/${route.params.serverId}/channels/${channel.uuid}`" />

@@ -102,10 +102,10 @@ const members = [ onMounted(async () => { console.log("channelid: set loading to true"); - const serverUrl = `guilds/${route.params.serverId}`; - server.value = await fetchWithApi(serverUrl); + const guildUrl = `guilds/${route.params.serverId}`; + server.value = await fetchWithApi(guildUrl); - channels.value = await fetchWithApi(`${serverUrl}/channels`); + channels.value = await fetchWithApi(`${guildUrl}/channels`); console.log("channels:", channels.value); channel.value = await fetchWithApi(route.path); console.log("channel:", channel.value); @@ -114,7 +114,7 @@ onMounted(async () => { console.log("channelid: set loading to false"); }); -function showServerSettings() { } +function showGuildSettings() { } function toggleInvitePopup(e: Event) { e.preventDefault(); diff --git a/pages/servers/[serverId]/index.vue b/pages/servers/[serverId]/index.vue index cc3f36a..28ee913 100644 --- a/pages/servers/[serverId]/index.vue +++ b/pages/servers/[serverId]/index.vue @@ -5,7 +5,7 @@ diff --git a/utils/fetchMember.ts b/utils/fetchMember.ts index c6eadfb..8f4a9e4 100644 --- a/utils/fetchMember.ts +++ b/utils/fetchMember.ts @@ -1,6 +1,6 @@ import type { UserResponse } from "~/types/interfaces" -export default async (guildId: string, memberId: string): Promise => { - const user = await fetchWithApi(`/guilds/${guildId}/members/${memberId}`) as UserResponse; +export default async (serverId: string, memberId: string): Promise => { + const user = await fetchWithApi(`/guilds/${serverId}/members/${memberId}`) as UserResponse; return user; } diff --git a/utils/fetchUser.ts b/utils/fetchUser.ts index fbd3843..d509fe0 100644 --- a/utils/fetchUser.ts +++ b/utils/fetchUser.ts @@ -1,6 +1,6 @@ import type { UserResponse } from "~/types/interfaces" -export default async (guildId: string, userId: string): Promise => { +export default async (serverId: string, userId: string): Promise => { const user = await fetchWithApi(`/users/${userId}`) as UserResponse; return user; } From 3c65a700ffcc05c343e51352468054bda5024e5a Mon Sep 17 00:00:00 2001 From: SauceyRed Date: Sat, 31 May 2025 14:46:01 +0200 Subject: [PATCH 4/5] fix: fetching from malformed endpoints, again --- pages/servers/[serverId]/channels/[channelId].vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue index 5458088..ac36105 100644 --- a/pages/servers/[serverId]/channels/[channelId].vue +++ b/pages/servers/[serverId]/channels/[channelId].vue @@ -40,7 +40,7 @@ const route = useRoute(); const loading = useState("loading"); -const channelUrlPath = `/channels/${route.params.channelId}`; +const channelUrlPath = `channels/${route.params.channelId}`; const server = ref(); const channels = ref(); @@ -107,7 +107,7 @@ onMounted(async () => { channels.value = await fetchWithApi(`${guildUrl}/channels`); console.log("channels:", channels.value); - channel.value = await fetchWithApi(route.path); + channel.value = await fetchWithApi(`/channels/${route.params.channelId}`); console.log("channel:", channel.value); console.log("channelid: channel:", channel); From 4da2ede58a9fe4faa766211fec7ca526dae933af Mon Sep 17 00:00:00 2001 From: SauceyRed Date: Sat, 31 May 2025 14:50:44 +0200 Subject: [PATCH 5/5] feat: change grouped messages being called compact to grouped --- components/Message.vue | 4 ++-- components/MessageArea.vue | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/Message.vue b/components/Message.vue index bf85a17..32162c1 100644 --- a/components/Message.vue +++ b/components/Message.vue @@ -18,7 +18,7 @@
-
+
@@ -42,7 +42,7 @@ const props = defineProps<{ text: string, timestamp: number, format: "12" | "24", - type: "normal" | "compact", + type: "normal" | "grouped", marginBottom: boolean }>(); diff --git a/components/MessageArea.vue b/components/MessageArea.vue index 7d3520c..1688f6d 100644 --- a/components/MessageArea.vue +++ b/components/MessageArea.vue @@ -27,12 +27,13 @@ import scrollToBottom from '~/utils/scrollToBottom'; const props = defineProps<{ channelUrl: string, amount?: number, offset?: number }>(); const messageTimestamps = ref>({}); -const messagesType = ref>({}); +const messagesType = ref>({}); const messagesRes: MessageResponse[] | undefined = await fetchWithApi( `${props.channelUrl}/messages`, { query: { "amount": props.amount ?? 100, "offset": props.offset ?? 0 } } ); + if (messagesRes) { messagesRes.reverse(); console.log("messages res:", messagesRes.map(msg => msg.message)); @@ -77,7 +78,7 @@ if (messagesRes) { continue; } console.log("RETURNING " + lessThanMax.toString().toUpperCase()); - messagesType.value[message.uuid] = "compact"; + messagesType.value[message.uuid] = "grouped"; } }