From 3fae9ad263c06f10f9d3f3ddc6856be33532c24e Mon Sep 17 00:00:00 2001
From: hzrd149 <github@hzrd149.com>
Date: Fri, 12 Jan 2024 21:12:55 +0000
Subject: [PATCH] small fix

---
 src/classes/timeline-loader.ts                            | 8 ++++----
 .../embed-event/event-types/embedded-article.tsx          | 6 +++---
 src/helpers/embeds.ts                                     | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/classes/timeline-loader.ts b/src/classes/timeline-loader.ts
index 7d123c32c..1d1ce3937 100644
--- a/src/classes/timeline-loader.ts
+++ b/src/classes/timeline-loader.ts
@@ -1,5 +1,6 @@
 import dayjs from "dayjs";
 import { Debugger } from "debug";
+import { Filter } from "nostr-tools";
 
 import { NostrEvent, isATag, isETag } from "../types/nostr-event";
 import { NostrRequestFilter, RelayQueryMap } from "../types/nostr-query";
@@ -14,7 +15,7 @@ import deleteEventService from "../services/delete-events";
 import { addQueryToFilter, isFilterEqual, mapQueryMap, stringifyFilter } from "../helpers/nostr/filter";
 import { localCacheRelay } from "../services/local-cache-relay";
 import { SimpleSubscription } from "nostr-idb";
-import { Filter } from "nostr-tools";
+import { relayRequest } from "../helpers/relay";
 
 const BLOCK_SIZE = 100;
 
@@ -170,9 +171,8 @@ export default class TimelineLoader {
     }
 
     for (const filters of Object.values(queries)) {
-      const sub: SimpleSubscription = localCacheRelay.subscribe(filters, {
-        onevent: (e) => this.handleEvent(e, false),
-        oneose: () => sub.close(),
+      relayRequest(localCacheRelay, filters).then((events) => {
+        for (const e of events) this.handleEvent(e, false);
       });
     }
   }
diff --git a/src/components/embed-event/event-types/embedded-article.tsx b/src/components/embed-event/event-types/embedded-article.tsx
index 46204fccb..912d620b7 100644
--- a/src/components/embed-event/event-types/embedded-article.tsx
+++ b/src/components/embed-event/event-types/embedded-article.tsx
@@ -47,9 +47,9 @@ export default function EmbeddedArticle({ article, ...props }: Omit<CardProps, "
         </LinkOverlay>
         <Text mb="2">{summary}</Text>
         {article.tags
-          .filter((t) => t[0] === "t")
-          .map(([_, hashtag]) => (
-            <Tag mr="2" mb="2">
+          .filter((t) => t[0] === "t" && t[1])
+          .map(([_, hashtag]: string[], i) => (
+            <Tag key={hashtag + i} mr="2" mb="2">
               #{hashtag}
             </Tag>
           ))}
diff --git a/src/helpers/embeds.ts b/src/helpers/embeds.ts
index 7add63f79..7ca5752ba 100644
--- a/src/helpers/embeds.ts
+++ b/src/helpers/embeds.ts
@@ -40,7 +40,7 @@ export function embedJSX(content: EmbedableContent, embed: EmbedType): Embedable
               if (render === null) continue;
 
               if (typeof render !== "string" && !render.props.key) {
-                render = cloneElement(render, { key: embed.name + match[0] });
+                render = cloneElement(render, { key: embed.name + match[0] + match.index });
               }
 
               newContent.push(before, render);