Fix user profile group links

Author: Heliodex

Site/src/routes/(main)/user/[username]/+page.server.ts

@@ -3,6 +3,7 @@ import { authorise } from "$lib/server/auth"
 import formData from "$lib/server/formData"
 import requestRender from "$lib/server/requestRender"
 import { db, Record, type RecordId } from "$lib/server/surreal"
+import type { Group } from "../../groups/+page.server"
 import type { RequestEvent } from "./$types.d"
 import acceptExistingQuery from "./acceptExisting.surql"
 import alreadyFriendsQuery from "./alreadyFriends.surql"
@@ -28,14 +29,8 @@ interface User extends BasicUser {
 	followingCount: number
 	friendCount: number
 	friends: boolean
-	groups: {
-		memberCount: number
-		name: string
-	}[]
-	groupsOwned: {
-		memberCount: number
-		name: string
-	}[]
+	groups: Group[]
+	groupsOwned: Group[]
 	incomingRequest: boolean
 	outgoingRequest: boolean
 	permissionLevel: number

Site/src/routes/(main)/user/[username]/+page.svelte

@@ -225,7 +225,7 @@
 									total: data.groupsOwned.length
 								}}
 								class="card bg-darker no-underline"
-								href="/groups/{group.name}">
+								href="/groups/{group.id}">
 								<div class="p-2">
 									<span class="float-start">
 										{group.name}
@@ -248,9 +248,12 @@
 					{#each data.groups as group, num}
 						<div class="py-2">
 							<a
-								in:fade={{ num, total: data.groups.length }}
+								in:fade={{
+									num,
+									total: data.groups.length
+								}}
 								class="card bg-darker no-underline"
-								href="/groups/{group.name}">
+								href="/groups/{group.id}">
 								<div class="p-2">
 									<span class="float-start">
 										{group.name}

Site/src/routes/(main)/user/[username]/user.surql

@@ -35,8 +35,14 @@ SELECT
 	$user IN ->request->user AS incomingRequest,
 	$user IN <-request<-user AS outgoingRequest,
 
-	(SELECT name, count(<-member) AS memberCount
+	(SELECT 
+		record::id(id) AS id,
+		name,
+		count(<-member) AS memberCount
 	FROM ->member->group) AS groups,
-	(SELECT name, count(<-member) AS memberCount
+	(SELECT 
+		record::id(id) AS id,
+		name,
+		count(<-member) AS memberCount
 	FROM ->ownsGroup->group) AS groupsOwned
 FROM user WHERE username = $username;