From faf75eba69368a98e072ff060c2b74eb8e3c1c70 Mon Sep 17 00:00:00 2001
From: Alejandro Gomez <alejandro@strike.me>
Date: Tue, 4 Jul 2023 19:30:41 +0200
Subject: [PATCH] refactor: address review comments

---
 src/element/live-chat.tsx | 13 +------------
 src/hooks/profile.ts      | 18 ++++++++----------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/element/live-chat.tsx b/src/element/live-chat.tsx
index ecf6211..f684b0e 100644
--- a/src/element/live-chat.tsx
+++ b/src/element/live-chat.tsx
@@ -264,13 +264,7 @@ function ChatMessage({
     setShowZapDialog(false);
     try {
       const pub = await EventPublisher.nip7();
-      const reply = await pub?.generic((eb) => {
-        eb.kind(EventKind.Reaction)
-          .content(emoji.native || "+1")
-          .tag(["e", ev.id])
-          .tag(["p", ev.pubkey]);
-        return eb;
-      });
+      const reply = await pub?.react(ev, emoji.native || "+1");
       if (reply) {
         console.debug(reply);
         System.BroadcastEvent(reply);
@@ -333,11 +327,6 @@ function ChatMessage({
             {zapTarget && (
               <SendZapsDialog
                 lnurl={zapTarget}
-                aTag={
-                  streamer === ev.pubkey
-                    ? `${link.kind}:${link.author}:${link.id}`
-                    : undefined
-                }
                 eTag={ev.id}
                 pubkey={ev.pubkey}
                 button={
diff --git a/src/hooks/profile.ts b/src/hooks/profile.ts
index b83970f..34aa8c0 100644
--- a/src/hooks/profile.ts
+++ b/src/hooks/profile.ts
@@ -22,15 +22,7 @@ export function useProfile(link: NostrLink, leaveOpen = false) {
       .kinds([LIVE_STREAM])
       .authors([link.id]);
 
-    const b2 = new RequestBuilder(`profile-host:${link.id.slice(0, 12)}`);
-    b2.withOptions({
-      leaveOpen,
-    })
-      .withFilter()
-      .kinds([LIVE_STREAM])
-      .tag("p", [link.id]);
-
-    b.add(b2);
+    b.withFilter().kinds([LIVE_STREAM]).tag("p", [link.id]);
 
     return b;
   }, [link, leaveOpen]);
@@ -70,8 +62,14 @@ export function useProfile(link: NostrLink, leaveOpen = false) {
     .map((ev) => parseZap(ev, System.ProfileLoader.Cache))
     .filter((z) => z && z.valid && z.receiver === link.id);
 
+  const sortedStreams = useMemo(() => {
+    const sorted = [...streams];
+    sorted.sort((a, b) => b.created_at - a.created_at);
+    return sorted;
+  }, [streams]);
+
   return {
-    streams,
+    streams: sortedStreams,
     zaps,
   };
 }