From a214d1052ad1f1bdc1db8c1eeefe21027ed85ff6 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Mon, 17 Mar 2025 14:50:28 +0100
Subject: [PATCH] fixes notifications & trail recommendations

---
 db/util/notification.go                       |  2 +-
 .../notification/notification_dropdown.svelte |  2 +-
 web/src/lib/models/user.ts                    |  3 ++-
 web/src/lib/stores/notification_store.ts      |  2 +-
 .../routes/api/v1/trail/recommend/+server.ts  | 19 +++++++------------
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/db/util/notification.go b/db/util/notification.go
index f8ddf09f..ceb20e5f 100644
--- a/db/util/notification.go
+++ b/db/util/notification.go
@@ -80,7 +80,7 @@ func SendNotification(app core.App, notification Notification, recipient string)
 	}
 
 	if permissions.Email {
-		recipientUser, err := app.FindAuthRecordByEmail("users", recipient)
+		recipientUser, err := app.FindRecordById("users", recipient)
 		if err != nil {
 			return err
 		}
diff --git a/web/src/lib/components/notification/notification_dropdown.svelte b/web/src/lib/components/notification/notification_dropdown.svelte
index 98a4a1a3..74879046 100644
--- a/web/src/lib/components/notification/notification_dropdown.svelte
+++ b/web/src/lib/components/notification/notification_dropdown.svelte
@@ -106,7 +106,7 @@
 <div class="dropdown relative">
     {#if unreadCount > 0}
         <div
-            class="absolute pointer-events-none -top-1 left-4 text-sm rounded-full bg-content text-content-inverse px-1 text-center"
+            class="absolute pointer-events-none -top-[2px] left-5 text-xs rounded-full bg-content text-content-inverse px-1 text-center"
         >
             {unreadCount}{unreadCount >= 10 ? "+" : ""}
         </div>
diff --git a/web/src/lib/models/user.ts b/web/src/lib/models/user.ts
index a0b95732..4dc02066 100644
--- a/web/src/lib/models/user.ts
+++ b/web/src/lib/models/user.ts
@@ -1,6 +1,7 @@
 import type { Settings } from "./settings";
+import { type AuthRecord } from "pocketbase";
 
-export type User = {
+export type User = AuthRecord & {
     id: string,
     username?: string,
     email?: string,
diff --git a/web/src/lib/stores/notification_store.ts b/web/src/lib/stores/notification_store.ts
index d42d6168..788ed0cd 100644
--- a/web/src/lib/stores/notification_store.ts
+++ b/web/src/lib/stores/notification_store.ts
@@ -6,7 +6,7 @@ let notifications: Notification[] = [];
 
 export async function notifications_index(data: { recipient: string, seen?: boolean }, page: number = 1, perPage: number = 10, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
     const r = await f('/api/v1/notification?' + new URLSearchParams({
-        filter: `created>=@month&&recipient='${data.recipient}'` + (data.seen !== undefined ? `&&seen=${data.seen}` : ''),
+        filter: `created<=@month&&recipient='${data.recipient}'` + (data.seen !== undefined ? `&&seen=${data.seen}` : ''),
         sort: '+seen,-created',
         page: page.toString(),
         "perPage": perPage.toString()
diff --git a/web/src/routes/api/v1/trail/recommend/+server.ts b/web/src/routes/api/v1/trail/recommend/+server.ts
index c5559a0f..50875561 100644
--- a/web/src/routes/api/v1/trail/recommend/+server.ts
+++ b/web/src/routes/api/v1/trail/recommend/+server.ts
@@ -2,25 +2,20 @@ import { TrailRecommendSchema } from '$lib/models/api/trail_schema';
 import type { Trail } from '$lib/models/trail';
 import { pb } from '$lib/pocketbase';
 import { handleError } from '$lib/util/api_util';
-import { error, json, type RequestEvent } from '@sveltejs/kit';
-import { ClientResponseError } from 'pocketbase';
+import { json, type RequestEvent } from '@sveltejs/kit';
 
 export async function GET(event: RequestEvent) {
     try {
         const searchParams = Object.fromEntries(event.url.searchParams);
         const safeSearchParams = TrailRecommendSchema.parse(searchParams);
-
-        const r = await event.fetch(pb.buildURL("/trail/recommend?" + new URLSearchParams({
+        
+        const r = await pb.send("/trail/recommend?" + new URLSearchParams({
             size: safeSearchParams.size?.toString() ?? ""
-        })));
+        }), {
+            method: "GET",
+        });
 
-        if (!r.ok) {
-            const response = await r.json()
-            console.error(response)
-            throw new ClientResponseError({ status: response.code, response })
-        }
-
-        const result: Trail[] = await r.json();
+        const result: Trail[] = r;
 
         for (const t of result) {
             if (!t.author || !pb.authStore.record) {