From 429f8cb676f3f3d75aa50d6c8145080bc3b8fa94 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Tue, 10 Dec 2024 22:38:31 +0100
Subject: [PATCH] bugfixing: pocketbase crash

---
 src/hooks.server.ts                         |  3 +-
 src/routes/api/get-notifications/+server.ts |  6 +--
 src/routes/api/update-comment/+server.ts    | 47 ---------------------
 3 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 src/routes/api/update-comment/+server.ts

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index bcc5da4d..485c4df0 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -39,9 +39,10 @@ export const handle = sequence(async ({ event, resolve }) => {
     try {
       await event.locals.pb.collection("users").authRefresh();
       event.locals.user = serializeNonPOJOs(event.locals.pb.authStore.model);
-    } catch (_) {
+    } catch (e) {
       event.locals.pb.authStore.clear();
       event.locals.user = undefined;
+      console.log(e)
     }
   }
 
diff --git a/src/routes/api/get-notifications/+server.ts b/src/routes/api/get-notifications/+server.ts
index f5b14c23..737ff97c 100644
--- a/src/routes/api/get-notifications/+server.ts
+++ b/src/routes/api/get-notifications/+server.ts
@@ -6,9 +6,9 @@ export const GET: RequestHandler = async ({ locals }) => {
   let output;
 
   try {
-    output = await pb.collection("notifications")?.getFullList({
+    output = await pb?.collection("notifications")?.getFullList({
       filter: `opUser="${user?.id}" `,
-      expand: "user,post,comment",
+      expand: "user",
       sort: "-created",
     });
   } catch (e) {
@@ -16,5 +16,5 @@ export const GET: RequestHandler = async ({ locals }) => {
     output = [];
   }
 
-  return new Response(JSON.stringify(output));
+  return new Response(JSON?.stringify(output));
 };
diff --git a/src/routes/api/update-comment/+server.ts b/src/routes/api/update-comment/+server.ts
deleted file mode 100644
index f997369e..00000000
--- a/src/routes/api/update-comment/+server.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { RequestHandler } from "./$types";
-import { serialize } from "object-to-formdata";
-import { validateData } from "$lib/utils";
-import { updateCommentTextSchema } from "$lib/schemas";
-import { error } from "@sveltejs/kit";
-
-export const POST = (async ({ request, locals }) => {
-  let output = "error";
-
-  const body = await request.formData();
-  const commentId = body?.get("commentId");
-
-  if (body?.get("comment") === "undefined") {
-    body?.delete("comment");
-    body?.append("comment", "");
-  }
-
-  const { formData, errors } = await validateData(
-    body,
-    updateCommentTextSchema,
-  );
-  console.log(error);
-
-  if (errors) {
-    return new Response(JSON.stringify(output));
-  }
-
-  let updateComment;
-  try {
-    updateComment = await locals.pb
-      .collection("comments")
-      .update(commentId, serialize(formData));
-
-    updateComment = await locals.pb.collection("comments").getOne(commentId, {
-      expand: "user,alreadyVoted(comment)",
-      fields:
-        "*,expand.user,expand.alreadyVoted(comment).user,expand.alreadyVoted(comment).type",
-    });
-
-    output = "success";
-  } catch (err) {
-    console.log("Error: ", err);
-    error(err.status, err.message);
-  }
-
-  return new Response(JSON.stringify([output, updateComment]));
-}) satisfies RequestHandler;