mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-zap-sender-missing-kind-0' into 'main'

Browse source 
Fix zap sender missing kind 0

Closes #237 and #254

See merge request soapbox-pub/ditto!558
This commit is contained in:
Alex Gleason 2024-10-18 18:55:06 +00:00
commit 10e1967ad3
1 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/storages/hydrate.ts
View file

@ -66,10 +66,6 @@ async function hydrateEvents(opts: HydrateOpts): Promise<DittoEvent[]> {
cache.push(event); cache.push(event);
} }
for (const event of await gatherZapSender({ events: cache, store, signal })) {
cache.push(event);
}
const stats = { const stats = {
authors: await gatherAuthorStats(cache, kysely as Kysely<DittoTables>), authors: await gatherAuthorStats(cache, kysely as Kysely<DittoTables>),
events: await gatherEventStats(cache, kysely as Kysely<DittoTables>), events: await gatherEventStats(cache, kysely as Kysely<DittoTables>),
@ -231,13 +227,26 @@ function gatherQuotes({ events, store, signal }: HydrateOpts): Promise<DittoEven
/** Collect authors from the events. */ /** Collect authors from the events. */
async function gatherAuthors({ events, store, signal }: HydrateOpts): Promise<DittoEvent[]> { async function gatherAuthors({ events, store, signal }: HydrateOpts): Promise<DittoEvent[]> {
const pubkeys = new Set(events.map((event) => { const pubkeys = new Set<string>();
if (event.kind === 9735) { // FIXME: This code doesn't belong in this function.
const pubkey = event.tags.find(([name]) => name === 'p')?.[1]; for (const event of events) {
if (pubkey) return pubkey; if (event.kind === 9735) {
const zapReceiver = event.tags.find(([name]) => name === 'p')?.[1];
if (zapReceiver) {
pubkeys.add(zapReceiver);
}
const zapRequestString = event?.tags?.find(([name]) => name === 'description')?.[1];
const zapRequest = n.json().pipe(n.event()).optional().catch(undefined).parse(zapRequestString);
// By getting the pubkey from the zap request we guarantee who is the sender
// some clients don't put the P tag in the zap receipt...
const zapSender = zapRequest?.pubkey;
if (zapSender) {
pubkeys.add(zapSender);
}
} }
return event.pubkey; pubkeys.add(event.pubkey);
})); }
const authors = await store.query( const authors = await store.query(
[{ kinds: [0], authors: [...pubkeys], limit: pubkeys.size }], [{ kinds: [0], authors: [...pubkeys], limit: pubkeys.size }],
@ -347,29 +356,6 @@ function gatherZapped({ events, store, signal }: HydrateOpts): Promise<DittoEven
); );
} }
/** Collect author that zapped. */
function gatherZapSender({ events, store, signal }: HydrateOpts): Promise<DittoEvent[]> {
const pubkeys = new Set<string>();
for (const event of events) {
if (event.kind === 9735) {
const zapRequestString = event?.tags?.find(([name]) => name === 'description')?.[1];
const zapRequest = n.json().pipe(n.event()).optional().catch(undefined).parse(zapRequestString);
// By getting the pubkey from the zap request we guarantee who is the sender
// some clients don't put the P tag in the zap receipt...
const zapSender = zapRequest?.pubkey;
if (zapSender) {
pubkeys.add(zapSender);
}
}
}
return store.query(
[{ kinds: [0], limit: pubkeys.size }],
{ signal },
);
}
/** Collect author stats from the events. */ /** Collect author stats from the events. */
async function gatherAuthorStats( async function gatherAuthorStats(
events: DittoEvent[], events: DittoEvent[],