1 files changed, 24 insertions, 9 deletions

diff --git a/src/features/messages.js b/src/features/messages.js
index 79526b8..b7982c6 100644
--- a/src/features/messages.js
+++ b/src/features/messages.js
@@ -8584,20 +8584,35 @@ export function messagesFeature(ctx) {
       }
     }
   }
-  // All at once, first answer wins: asked in turn, a note on a far relay
-  // took longer than the feed waits for a row.
+  // The near relays first — the reference's hints, ours, the author's own
+  // — and the wide net only once those have come back empty, or after a
+  // moment if they are slow about it (asked in turn, a note on a far relay
+  // took longer than the feed waits for a row; asked all at once, every
+  // quoted note and every reply's parent went to a dozen relays, and the
+  // Conversations view spent half its REQs — three hundred in twenty
+  // seconds — on notes our own relays answered in the first beat).
+  const WIDE_AFTER_MS = 1200;
   function findNote(ref) {
     const ask = (relays) => askNote(relays, ref.id);
     const near = [...new Set([...(ref.relays || []), ...zapRelays()])];
     const authors = [...new Set([ref.author, ...(ref.authors || [])].filter(Boolean))];
-    const asks = [
-      askNote(near, ref.id, ref.relays || []),
-      ...authors.map((a) => relaysOf(a).catch(() => []).then((rs) => ask(rs.filter((r) => !near.includes(r))))),
-      ask(WIDE_RELAYS.filter((r) => !near.includes(r))),
-    ];
     return new Promise((resolve) => {
-      let left = asks.length;
-      for (const a of asks) a.then((ev) => { if (ev) resolve(ev); else if (--left === 0) resolve(null); });
+      let done = false;
+      const found = (ev) => { if (!done && ev) { done = true; resolve(ev); } };
+      const nearAsks = [
+        askNote(near, ref.id, ref.relays || []),
+        ...authors.map((a) => relaysOf(a).catch(() => []).then((rs) => ask(rs.filter((r) => !near.includes(r))))),
+      ];
+      for (const a of nearAsks) a.then(found);
+      const nearDone = Promise.all(nearAsks);
+      let wide = null;
+      const goWide = () => {
+        if (done || wide) return;
+        wide = ask(WIDE_RELAYS.filter((r) => !near.includes(r)));
+        wide.then(found);
+      };
+      const timer = setTimeout(goWide, WIDE_AFTER_MS);
+      nearDone.then(() => { clearTimeout(timer); if (done) return; goWide(); wide.then((ev) => { if (!done) { done = true; resolve(ev || null); } }); });
     });
   }
   function quotedNote(ref) {