diff options
| -rw-r--r-- | src/features/messages.js | 62 | ||||
| -rw-r--r-- | src/features/nostrlogin.js | 1 | ||||
| -rw-r--r-- | tools/feed-custom-test.js | 26 |
3 files changed, 78 insertions, 11 deletions
diff --git a/src/features/messages.js b/src/features/messages.js index b4f24a5..1d7874f 100644 --- a/src/features/messages.js +++ b/src/features/messages.js @@ -3415,6 +3415,63 @@ export function messagesFeature(ctx) { // Follow or unfollow, on the freshest list the relays will give us — the // local copy alone would quietly drop anyone another client added since. // The button flips immediately and goes back if the publish fails. + // A brand-new identity starts with something to read: the people behind + // coinos, a Bitcoin feed, and one topic as an example of what a feed can + // be. Once per identity; a person who unfollows stays unfollowed. + const STARTER_FOLLOWS = [ + '98ae4da926c471c23fd12d1ebdd5839ba82917baa618e184e0c9916d93dcf4f7', // Adam + '72bdbc57bdd6dfc4e62685051de8041d148c3c68fe42bf301f71aa6cf53e52fb', // coinos + ]; + // The Bitcoin feed's follow pack (NIP-51 kind 39089): { pk, d, relays, title }. + // Until one is chosen the feed reads the #bitcoin topic instead. + const STARTER_BITCOIN_PACK = null; + async function seedNewIdentity({ onlyIfNoFollows = false } = {}) { + const s = st(); + if (s.seeded) return; + s.seeded = Date.now(); + const at = Date.now(); + const feeds = [ + STARTER_BITCOIN_PACK + ? { id: 'starter-bitcoin', name: 'Bitcoin', follows: false, authors: [], packs: [STARTER_BITCOIN_PACK], topics: [], at } + : { id: 'starter-bitcoin', name: 'Bitcoin', follows: false, authors: [], packs: [], topics: ['bitcoin'], at }, + { id: 'starter-gardenstr', name: '#gardenstr', follows: false, authors: [], packs: [], topics: ['gardenstr'], at }, + ]; + for (const f of feeds) if (!s.feeds.some((x) => x.id === f.id)) s.feeds.push(f); + save(s); + if (onlyIfNoFollows) { + await syncFollows({ force: true }).catch(() => {}); + if (followsNow().set.size) return; + } + followMany(STARTER_FOLLOWS).catch(() => {}); + } + // Follow several people in one kind-3 update (toggleFollow is one at a time + // and locks while it publishes). + async function followMany(pks) { + if (followsPub) return; + const id = await requireIdentity(); + const want = pks.filter((pk) => pk && pk !== id.pubkey); + if (!want.length) return; + followsPub = true; + const before = followsNow(); + try { + await syncFollows({ force: true }).catch(() => {}); + const fetched = followsNow(); + const base = fetched.at > before.at ? fetched : before; + const add = want.filter((pk) => !base.set.has(pk)); + if (!add.length) return; + const tags = [...base.tags, ...add.map((pk) => ['p', pk])]; + const created_at = Math.max(Math.floor(Date.now() / 1000), base.at + 1); + const partial = { kind: 3, content: base.content || '', created_at, tags }; + const evt = id.signer instanceof Uint8Array ? finalizeEvent(partial, id.signer) : await id.signer.signEvent(partial); + saveFollows({ set: new Set(pTags(tags).map((x) => x[1])), tags, content: base.content || '', at: created_at }); + feedAuthorsChanged(); + publishOn(zapRelays(), evt).catch(() => {}); + syncInbox({ force: true }).catch(() => {}); + } finally { + followsPub = false; + render(); + } + } async function toggleFollow(pk) { if (!pk || followsPub) return; const id = await requireIdentity(); @@ -7198,6 +7255,7 @@ export function messagesFeature(ctx) { // the header sat avatar-less for that beat. A generated seed's pubkey // is right here — paint the punk before the next frame. const pk = (hook('nostrLoginIdentity') || {}).pubkey || (wallet.nostr && wallet.nostr.pk); + setTimeout(seedNewIdentity, 0); // fresh words: something to read from the start if (!pk) return; const entry = { name: null, picture: null, t: Date.now() }; profiles.set(pk, entry); @@ -7331,6 +7389,10 @@ export function messagesFeature(ctx) { }, avatar(pk, 'chat-avatar ' + (big ? 'chip-lg' : 'mini'), false), h('span', { class: big ? '' : 'small' }, displayName(pk))); }, + // A sign-in (Google, passkey, key) that found no wallet on its identity: + // the same start, but only the follows of an identity that follows + // nobody yet — an established nostr user keeps their own list. + identitySignedInNew() { setTimeout(() => seedNewIdentity({ onlyIfNoFollows: true }), 0); return true; }, init() { // this wallet's cached faces, from its own namespace — the keys are // in place now, whatever the header asked for before diff --git a/src/features/nostrlogin.js b/src/features/nostrlogin.js index 1d78b39..fef054b 100644 --- a/src/features/nostrlogin.js +++ b/src/features/nostrlogin.js @@ -157,6 +157,7 @@ export function nostrLoginFeature(ctx) { // them); anyone signing in wants a wallet, and the backup mechanics // stay spelled out in the nostr settings card. await createForSigner({ signer }); + ctx.hook('identitySignedInNew'); return; } // Same wallet however you log in: a key-derived seed is published too, diff --git a/tools/feed-custom-test.js b/tools/feed-custom-test.js index b989d87..4fe8f19 100644 --- a/tools/feed-custom-test.js +++ b/tools/feed-custom-test.js @@ -85,14 +85,17 @@ try { await page.evaluate(() => localStorage.setItem('btc-wallet-network', 'regtest')); await page.reload({ waitUntil: 'domcontentloaded' }); await sleep(400); - await click('create a new wallet'); await sleep(500); - await click('to import'); await sleep(400); - await page.waitForSelector('textarea'); - const mn = generateMnemonic(wordlist); - await page.type('textarea', mn); - await click('open wallet'); + // through the real first run: the wizard's own words, read off the screen + await click('create a new wallet'); await sleep(600); + await page.waitForSelector('.words .w .t'); + const mn = (await page.$$eval('.words .w .t', (l) => l.map((e) => e.textContent.trim()))).join(' '); + await click('skip verification'); await waitText('receive', 20000); const base = cacheKeyFor(mn + '\n'); + // the starter follows land once the current list has been asked for + let starter = false; + for (let i = 0; i < 60 && !starter; i++) { starter = await page.evaluate((k) => { const f = JSON.parse(localStorage.getItem(k + ':follows') || '{}'); const set = new Set((f.tags || []).filter((t) => t[0] === 'p').map((t) => t[1])); return set.has('98ae4da926c471c23fd12d1ebdd5839ba82917baa618e184e0c9916d93dcf4f7') && set.has('72bdbc57bdd6dfc4e62685051de8041d148c3c68fe42bf301f71aa6cf53e52fb'); }, base); if (!starter) await sleep(500); } + check('a new identity follows the coinos people', starter); await page.evaluate(([k, pk, ns]) => { localStorage.setItem(k + ':follows', JSON.stringify({ tags: [['p', pk]], c: '', at: Math.floor(Date.now() / 1000) })); localStorage.setItem(k + ':feedNotes', JSON.stringify(ns)); @@ -103,7 +106,7 @@ try { await sleep(800); await page.evaluate(() => { const e = [...document.querySelectorAll('.item')].find((n) => /feed/i.test(n.textContent)); if (e) e.click(); }); await sleep(1200); - check('the feed opens on Following, with a + chip', JSON.stringify(await chips()) === JSON.stringify(['*Following', '+']), JSON.stringify(await chips())); + check('the feed opens on Following, with a + chip', JSON.stringify(await chips()) === JSON.stringify(['*Following', 'Bitcoin', '#gardenstr', '+']), JSON.stringify(await chips())); console.log('\n[a new feed: everyone I follow, on one topic]'); await page.click('.feed-chip.add'); await sleep(300); @@ -112,7 +115,7 @@ try { await page.click('input[type=checkbox]'); await type('input[placeholder="#bitcoin #nostr"]', '#Bitcoin, lightning'); await click('save'); await sleep(1500); - check('the new feed is on screen and selected', JSON.stringify(await chips()) === JSON.stringify(['Following', '*Coin talk', '+']), JSON.stringify(await chips())); + check('the new feed is on screen and selected', JSON.stringify(await chips()) === JSON.stringify(['Following', 'Bitcoin', '#gardenstr', '*Coin talk', '+']), JSON.stringify(await chips())); const req = (await page.evaluate(() => window.__reqs)).find((f) => f['#t']); check('it asks relays for the follows AND the topics', !!req && req.authors?.includes(AUTHOR) && JSON.stringify(req['#t']) === JSON.stringify(['bitcoin', 'lightning']), JSON.stringify(req || null)); const tagged = signed('fresh #bitcoin post', 0, [['t', 'bitcoin']]); @@ -127,7 +130,8 @@ try { await page.evaluate(() => [...document.querySelectorAll('.feed-chip')].find((c) => c.textContent.trim() === 'Following').click()); await sleep(1200); check('Following again, with its own posts', (await chips())[0] === '*Following' && await waitText('plain post', 4000)); await page.evaluate(() => { const a = [...document.querySelectorAll('.notes-feed a')].find((x) => x.textContent === '#bitcoin'); if (a) a.click(); }); await sleep(1200); - check('a #tag opens a topic feed of its own', JSON.stringify(await chips()) === JSON.stringify(['Following', 'Coin talk', '*#bitcoin', '+']) && await page.evaluate(() => !![...document.querySelectorAll('button')].find((b) => /save feed/i.test(b.textContent))), JSON.stringify(await chips())); + // a saved single-topic feed with that tag (the starter Bitcoin feed) is reused rather than a session one + check('a #tag opens the saved feed for that topic', JSON.stringify(await chips()) === JSON.stringify(['Following', '*Bitcoin', '#gardenstr', 'Coin talk', '+']) && await page.evaluate(() => ![...document.querySelectorAll('button')].find((b) => /save feed/i.test(b.textContent))), JSON.stringify(await chips())); const treq = (await page.evaluate(() => window.__reqs)).filter((f) => f['#t'] && !f.authors).pop(); check('...asked for by topic alone', !!treq && JSON.stringify(treq['#t']) === JSON.stringify(['bitcoin']), JSON.stringify(treq || null)); @@ -156,14 +160,14 @@ try { await waitText('receive', 20000); await page.evaluate(() => { const b = [...document.querySelectorAll('button')].find((e) => /message/i.test(e.getAttribute('aria-label') || '')); if (b) b.click(); }); await sleep(800); await page.evaluate(() => { const e = [...document.querySelectorAll('.item')].find((n) => /feed/i.test(n.textContent)); if (e) e.click(); }); await sleep(1200); - check('the saved feeds are still there; the session topic is not', JSON.stringify(await chips()) === JSON.stringify(['*Following', 'Coin talk', 'Pack feed', '+']), JSON.stringify(await chips())); + check('the saved feeds are still there; the session topic is not', JSON.stringify(await chips()) === JSON.stringify(['*Following', 'Bitcoin', '#gardenstr', 'Coin talk', 'Pack feed', '+']), JSON.stringify(await chips())); check('the home list shows the pack feed with its pack', await page.evaluate(() => { const b = document.querySelector('.chat-back'); if (b) b.click(); return !!b; }) && await waitText('test pack', 3000)); await page.evaluate(() => { const e = [...document.querySelectorAll('.item')].find((n) => (n.querySelector('.chat-name') || {}).textContent === 'Feed'); if (e) e.click(); }); await sleep(800); await page.evaluate(() => [...document.querySelectorAll('.feed-chip')].find((c) => c.textContent.trim() === 'Coin talk').click()); await sleep(800); await page.evaluate(() => [...document.querySelectorAll('button')].find((b) => /edit feed/i.test(b.getAttribute('aria-label') || '')).click()); await sleep(400); check('the editor shows what was saved', await page.evaluate(() => document.querySelector('input[placeholder="#bitcoin #nostr"]').value === '#bitcoin #lightning' && document.querySelector('input[type=checkbox]').checked)); await click('delete feed'); await sleep(1000); - check('deleting it lands back on Following', JSON.stringify(await chips()) === JSON.stringify(['*Following', 'Pack feed', '+']), JSON.stringify(await chips())); + check('deleting it lands back on Following', JSON.stringify(await chips()) === JSON.stringify(['*Following', 'Bitcoin', '#gardenstr', 'Pack feed', '+']), JSON.stringify(await chips())); check('no page errors', errs.length === 0, errs.slice(0, 2).join(' | ')); } finally { await browser.close(); server.stop(true); } console.log(ok ? '\n✅ feeds: Following is one of many' : '\n❌ failed'); |