From 6a14e2c538a4a3b5bdb01d2b2f4758256f7eecde Mon Sep 17 00:00:00 2001
From: axel <contact@axel.moe>
Date: Sat, 12 Apr 2025 21:48:45 +0200
Subject: [PATCH] minor session management refactors

---
 src/hooks.server.ts        |  2 +-
 src/lib/server/sessions.ts | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index adfc00b..546f63f 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -33,7 +33,7 @@ export const init: ServerInit = async () => {
 export async function handle({ event, resolve }) {
 	const { cookies, locals } = event;
 
-	locals.guard = new Guard(await getUserFromSession(cookies.get('session')));
+	locals.guard = new Guard(getUserFromSession(cookies.get('session')));
 
 	return await resolve(event);
 }
diff --git a/src/lib/server/sessions.ts b/src/lib/server/sessions.ts
index 8ef512b..9990059 100644
--- a/src/lib/server/sessions.ts
+++ b/src/lib/server/sessions.ts
@@ -15,22 +15,13 @@ export function createSession(data: SessionData) {
 	return token;
 }
 
-export async function getUserFromSession(sessionId?: string) {
-	if (!sessionId) {
-		return undefined;
-	}
+export function getUserFromSession(sessionId?: string) {
+	if (!sessionId) return undefined;
 
 	const data = sessions.get(sessionId);
+	if (!data) return undefined;
 
-	if (!data) {
-		return undefined;
-	}
-
-	// what in the nested fuck is this shit
-	// I thought ORMs made it easier but they just make queries more ridiculous
-	const user = await db.data.users.find((u) => u.id === data.userId);
-
-	return user;
+	return db.data.users.find((u) => u.id === data.userId);
 }
 
 export function deleteSession(sessionId?: string) {