diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/features/messages.js | 26 | ||||
| -rw-r--r-- | src/recipient-search.js | 26 |
2 files changed, 50 insertions, 2 deletions
diff --git a/src/features/messages.js b/src/features/messages.js index d5d286a..95fcde8 100644 --- a/src/features/messages.js +++ b/src/features/messages.js @@ -39,7 +39,7 @@ import { createThreadPrefetch } from '../thread-prefetch.js'; import { makeImageThumbnails } from '../image-thumbnails.js'; import { createFeedCache, FEED_CACHE_POSTS, FEED_SEED_POSTS } from '../feed-cache.js'; import { POPULAR_RELAYS, FIREHOSE_RELAYS, popularCandidates } from '../popular-feed.js'; -import { makeSearcher, resultRows, fallbackAvatar, warmSearch, punkImageUrl, punkSmallUrl, primalCache, searchRecipients, searchable } from '../recipient-search.js'; +import { makeSearcher, resultRows, fallbackAvatar, warmSearch, punkImageUrl, punkSmallUrl, primalCache, searchRecipients, searchable, setLocalPeople } from '../recipient-search.js'; import { getNetwork } from '../api.js'; import { decodeBolt11 } from '../ark/lightning.js'; import { hexToBytes, bytesToHex } from '@noble/hashes/utils'; @@ -17186,6 +17186,30 @@ export function messagesFeature(ctx) { e.id && !e.isNew ? h('button', { class: 'btn-ghost btn-block', onClick: () => deleteFeed(e.id) }, t('feedDelete')) : null); } + // People search looks among your follows first (recipient-search.js). Their + // names come from the profiles this device holds; the ones it has never + // seen are fetched once a session, the first time a search asks. + let followFacesAsked = false, followFacesPending = false; + setLocalPeople(() => { + const set = follows && follows.set; + if (!set || !set.size) return []; + if (!followFacesAsked) { + followFacesAsked = true; + const missing = [...set].filter((pk) => !profiles.get(pk)?.name && !profInFlight.has(pk)); + if (missing.length) { + followFacesPending = true; + fetchProfiles(missing.slice(0, 2000)).catch(() => {}).finally(() => { followFacesPending = false; }); + } + } + const out = []; + out.partial = followFacesPending; + for (const pk of set) { + const p = profiles.get(pk); + if (p && (p.name || p.nip05)) out.push({ pk, name: p.name, nip05: p.nip05, picture: p.picture }); + } + return out; + }); + // ---- user search: the header magnifier ---------------------------------- // Same engine the Send form and DMs use (registrar names + Primal cache + // NIP-50 relays); tapping a result opens their profile, and profile-Back diff --git a/src/recipient-search.js b/src/recipient-search.js index 4853c66..285221c 100644 --- a/src/recipient-search.js +++ b/src/recipient-search.js @@ -114,7 +114,8 @@ export function warmSearch() { // Profiles cap at 200 by recency; whole-query results keep for 12 hours. const PROF_KEY = 'btc-wallet-search-profiles'; // Discard old results that identified migrated accounts by their wallet key. -const QUERY_KEY = 'btc-wallet-search-queries-v2'; +// v3: results from before the people-you-follow source came in +const QUERY_KEY = 'btc-wallet-search-queries-v3'; const QUERY_TTL = 12 * 3600_000; const profileCache = new Map(); // pk -> { name, picture } const queryCache = new Map(); // q -> rows @@ -150,6 +151,15 @@ function persistCaches() { }, 800); } +// The people this account follows, as the chat feature knows them +// ([{ pk, name, nip05, picture }], profiles it already holds). A match among +// them outranks the search indexes: Primal ranks by its own trust score and +// doesn't index a brand-new key for a while, so someone you follow who just +// moved to a new npub (Derek Ross, 2026-11-17: an empty impostor came up +// instead) is found where you'd look first. +let localPeople = null; +export function setLocalPeople(fn) { localPeople = fn; } + // Worth searching? A partial username or npub — never an address, invoice, // or key the Send form knows how to handle whole. Known payment prefixes are // excluded so typing an address never triggers a search. @@ -214,6 +224,19 @@ export async function searchRecipients(qRaw, onPartial = null) { const exact = parseNostrPubkey(q); if (exact) { add(exact, {}, 0); emit(); } + let partial = false; // follows' names still loading: don't keep these rows + if (!exact && localPeople) { + const joined = q.replace(/ /g, ''); + const hit = (v) => { const x = String(v || '').toLowerCase().replace(/\s+/g, ' '); return x.includes(q) || (joined !== q && x.replace(/ /g, '').includes(joined)); }; + let people = []; + try { people = localPeople() || []; } catch {} + if (people.partial) partial = true; + for (const p of people) { + const nip05 = typeof p.nip05 === 'string' ? p.nip05.replace(/^_@/, '') : undefined; + if (hit(p.name) || hit(nip05)) add(p.pk, { name: p.name, picture: p.picture, nip05 }, 1); + } + emit(); + } await Promise.allSettled([ fetch(`${REGISTRAR}/search?q=${encodeURIComponent(q)}`) @@ -243,6 +266,7 @@ export async function searchRecipients(qRaw, onPartial = null) { const rows = snapshot(); await fillProfiles(rows).catch(() => {}); for (const r of rows) r.known = true; // looked: no picture now means none + if (partial) return rows; if (queryCache.size > 200) { queryCache.clear(); queryAt.clear(); } queryCache.set(q, rows); queryAt.set(q, Date.now()); |
