From 236a9ffbfbcf9ba1f613400bf12bfe92d4b3f680 Mon Sep 17 00:00:00 2001
From: verbiricha <bandarra@protonmail.com>
Date: Mon, 31 Jul 2023 23:42:30 +0200
Subject: [PATCH] refactor: use since in filter

---
 src/hooks/badges.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/hooks/badges.ts b/src/hooks/badges.ts
index 8743578..c133581 100644
--- a/src/hooks/badges.ts
+++ b/src/hooks/badges.ts
@@ -14,11 +14,13 @@ export function useBadges(pubkey: string, leaveOpen = true): Array<Badge> {
   const rb = useMemo(() => {
     const rb = new RequestBuilder(`badges:${pubkey.slice(0, 12)}`);
     rb.withOptions({ leaveOpen });
+    rb.withFilter().authors([pubkey]).kinds([EventKind.Badge]);
     rb.withFilter()
       .authors([pubkey])
-      .kinds([EventKind.Badge, EventKind.BadgeAward]);
+      .kinds([EventKind.BadgeAward])
+      .since(since);
     return rb;
-  }, [pubkey]);
+  }, [pubkey, since]);
 
   const { data: badgeEvents } = useRequestBuilder<NoteCollection>(
     System,
@@ -85,9 +87,5 @@ export function useBadges(pubkey: string, leaveOpen = true): Array<Badge> {
     return [];
   }, [rawBadges]);
 
-  const awards = useMemo(() => {
-    return badgeAwards.filter((e) => e.created_at > since);
-  }, [badgeAwards]);
-
-  return { badges, awards };
+  return { badges, awards: badgeAwards };
 }