fix profile query

2 files changed, 31 insertions, 15 deletions

diff --git a/config.ts.sample b/config.ts.sample
index 253232b5..b28c6b6b 100644
--- a/config.ts.sample
+++ b/config.ts.sample
@@ -13,6 +13,8 @@ export default {
   nostr: "ws://nostr:8080",
   relays: [
     "ws://nostr:8080",
+    "wss://relay.primal.net",
+    "wss://relay.damus.io",
     "wss://nostr-pub.wellorder.net",
     "wss://brb.io",
     "wss://nostr.v0l.io",
diff --git a/lib/nostr.ts b/lib/nostr.ts
index 7ed41f36..e98e56a8 100644
--- a/lib/nostr.ts
+++ b/lib/nostr.ts
@@ -215,25 +215,39 @@ export const getNostrUser = async (key) => {
 
 export const q = async (f) => {
   let events = (await scan(f)) as Event[];
+  if (events.length) return events;
+
   const k = JSON.stringify(f).replace(/[^a-zA-Z0-9]/g, "");
-  const since = await g(`${k}:since}`);
+  const since = await g(`${k}:since`);
   if (since) f.since = since;
 
-  const p = new Promise((resolve) => {
-    const r = [];
-    (pool as any).subscribeMany(["wss://relay.primal.net"], [f], {
-      onevent(e) {
-        r.push(e);
-        coinos.publish(e);
-      },
-      oneose() {
-        resolve(r);
-      },
-    });
-  });
+  const externalRelays = config.relays.filter((r) => r.startsWith("wss://"));
+
+  events = (
+    await Promise.all(
+      externalRelays.map(
+        (url) =>
+          new Promise<Event[]>((resolve) => {
+            const found: Event[] = [];
+            Relay.connect(url)
+              .then((r) => {
+                r.subscribe([f], {
+                  onevent(e) {
+                    found.push(e);
+                    coinos.publish(e).catch(() => {});
+                  },
+                  oneose() {
+                    r.close();
+                    resolve(found);
+                  },
+                });
+              })
+              .catch(() => resolve([]));
+          }),
+      ),
+    )
+  ).flat();
 
-  if (events.length) return events;
-  events = (await p) as Event[];
   if (events.length) db.set(`${k}:since`, events[events.length - 1].created_at);
   return events;
 };