aljaz/ditto
1
0
Fork 0
mirror of https://github.com/aljazceru/ditto.git synced 2025-12-21 15:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

hydrateEvent -> purifyEvent (it sounds cooler)

Browse Source
This commit is contained in:
Alex Gleason
2024-03-16 13:19:11 -05:00
parent 0df4ac7331
commit 09369a0122
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pipeline.ts
View File

@@ -5,7 +5,7 @@ import { Debug, LNURL, type NostrEvent } from '@/deps.ts';
import { DittoEvent } from '@/interfaces/DittoEvent.ts'; import { DittoEvent } from '@/interfaces/DittoEvent.ts';
import { isEphemeralKind } from '@/kinds.ts'; import { isEphemeralKind } from '@/kinds.ts';
import { updateStats } from '@/stats.ts'; import { updateStats } from '@/stats.ts';
import { dehydrateEvent } from '@/storages/hydrate.ts'; import { purifyEvent } from '@/storages/hydrate.ts';
import { cache, client, eventsDB, reqmeister } from '@/storages.ts'; import { cache, client, eventsDB, reqmeister } from '@/storages.ts';
import { Sub } from '@/subs.ts'; import { Sub } from '@/subs.ts';
import { getTagSet } from '@/tags.ts'; import { getTagSet } from '@/tags.ts';
@@ -225,7 +225,7 @@ async function payZap(event: DittoEvent, signal: AbortSignal) {
const { pr } = await LNURL.callback( const { pr } = await LNURL.callback(
details.callback, details.callback,
{ amount, nostr: dehydrateEvent(event), lnurl }, { amount, nostr: purifyEvent(event), lnurl },
{ fetch: fetchWorker, signal }, { fetch: fetchWorker, signal },
); );

4
src/storages/events-db.ts
View File

@@ -6,7 +6,7 @@ import { DittoEvent } from '@/interfaces/DittoEvent.ts';
import { type DittoFilter } from '@/interfaces/DittoFilter.ts'; import { type DittoFilter } from '@/interfaces/DittoFilter.ts';
import { isDittoInternalKind, isParameterizedReplaceableKind, isReplaceableKind } from '@/kinds.ts'; import { isDittoInternalKind, isParameterizedReplaceableKind, isReplaceableKind } from '@/kinds.ts';
import { jsonMetaContentSchema } from '@/schemas/nostr.ts'; import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
import { dehydrateEvent } from '@/storages/hydrate.ts'; import { purifyEvent } from '@/storages/hydrate.ts';
import { isNostrId, isURL } from '@/utils.ts'; import { isNostrId, isURL } from '@/utils.ts';
import { abortError } from '@/utils/abort.ts'; import { abortError } from '@/utils/abort.ts';
@@ -67,7 +67,7 @@ class EventsDB implements NStore {
/** Insert an event (and its tags) into the database. */ /** Insert an event (and its tags) into the database. */
async event(event: NostrEvent, _opts?: NStoreOpts): Promise<void> { async event(event: NostrEvent, _opts?: NStoreOpts): Promise<void> {
event = dehydrateEvent(event); event = purifyEvent(event);
this.#debug('EVENT', JSON.stringify(event)); this.#debug('EVENT', JSON.stringify(event));
if (isDittoInternalKind(event.kind) && event.pubkey !== Conf.pubkey) { if (isDittoInternalKind(event.kind) && event.pubkey !== Conf.pubkey) {

4
src/storages/hydrate.ts
View File

@@ -30,7 +30,7 @@ async function hydrateEvents(opts: HydrateEventOpts): Promise<DittoEvent[]> {
} }
/** Return a normalized event without any non-standard keys. */ /** Return a normalized event without any non-standard keys. */
function dehydrateEvent(event: DittoEvent): NostrEvent { function purifyEvent(event: DittoEvent): NostrEvent {
return { return {
id: event.id, id: event.id,
pubkey: event.pubkey, pubkey: event.pubkey,
@@ -42,4 +42,4 @@ function dehydrateEvent(event: DittoEvent): NostrEvent {
}; };
} }
export { dehydrateEvent, hydrateEvents }; export { hydrateEvents, purifyEvent };

4
src/storages/pool-store.ts
View File

@@ -9,7 +9,7 @@ import {
type RelayPoolWorker, type RelayPoolWorker,
} from '@/deps.ts'; } from '@/deps.ts';
import { normalizeFilters } from '@/filter.ts'; import { normalizeFilters } from '@/filter.ts';
import { dehydrateEvent } from '@/storages/hydrate.ts'; import { purifyEvent } from '@/storages/hydrate.ts';
import { abortError } from '@/utils/abort.ts'; import { abortError } from '@/utils/abort.ts';
interface PoolStoreOpts { interface PoolStoreOpts {
@@ -38,7 +38,7 @@ class PoolStore implements NStore {
if (opts.signal?.aborted) return Promise.reject(abortError()); if (opts.signal?.aborted) return Promise.reject(abortError());
const { relays = this.#relays } = opts; const { relays = this.#relays } = opts;
event = dehydrateEvent(event); event = purifyEvent(event);
this.#debug('EVENT', event); this.#debug('EVENT', event);
this.#pool.publish(event, relays); this.#pool.publish(event, relays);