From b4735d1dd3db4cb23be227f363b691415da93b4c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Jan 2024 15:46:45 -0600
Subject: [PATCH] cleanEvent -> dehydrateEvent

---
 src/events.ts              | 16 ----------------
 src/storages/events-db.ts  |  4 ++--
 src/storages/hydrate.ts    | 17 +++++++++++++++--
 src/storages/pool-store.ts |  4 ++--
 4 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 src/events.ts

diff --git a/src/events.ts b/src/events.ts
deleted file mode 100644
index 6bdb404d..00000000
--- a/src/events.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { type NostrEvent } from '@/deps.ts';
-
-/** Return a normalized event without any non-standard keys. */
-function cleanEvent(event: NostrEvent): NostrEvent {
-  return {
-    id: event.id,
-    pubkey: event.pubkey,
-    kind: event.kind,
-    content: event.content,
-    tags: event.tags,
-    sig: event.sig,
-    created_at: event.created_at,
-  };
-}
-
-export { cleanEvent };
diff --git a/src/storages/events-db.ts b/src/storages/events-db.ts
index c85841d1..11dbdf76 100644
--- a/src/storages/events-db.ts
+++ b/src/storages/events-db.ts
@@ -1,12 +1,12 @@
 import { Conf } from '@/config.ts';
 import { type DittoDB } from '@/db.ts';
 import { Debug, Kysely, type NostrEvent, type NStore, type NStoreOpts, type SelectQueryBuilder } from '@/deps.ts';
-import { cleanEvent } from '@/events.ts';
 import { normalizeFilters } from '@/filter.ts';
 import { DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { type DittoFilter } from '@/interfaces/DittoFilter.ts';
 import { isDittoInternalKind, isParameterizedReplaceableKind, isReplaceableKind } from '@/kinds.ts';
 import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
+import { dehydrateEvent } from '@/storages/hydrate.ts';
 import { isNostrId, isURL } from '@/utils.ts';
 import { abortError } from '@/utils/abort.ts';
 
@@ -65,7 +65,7 @@ class EventsDB implements NStore {
 
   /** Insert an event (and its tags) into the database. */
   async event(event: NostrEvent, _opts?: NStoreOpts): Promise<void> {
-    event = cleanEvent(event);
+    event = dehydrateEvent(event);
     this.#debug('EVENT', JSON.stringify(event));
 
     if (isDittoInternalKind(event.kind) && event.pubkey !== Conf.pubkey) {
diff --git a/src/storages/hydrate.ts b/src/storages/hydrate.ts
index db172f34..40430248 100644
--- a/src/storages/hydrate.ts
+++ b/src/storages/hydrate.ts
@@ -1,4 +1,4 @@
-import { type NStore } from '@/deps.ts';
+import { type NostrEvent, type NStore } from '@/deps.ts';
 import { type DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { type DittoFilter } from '@/interfaces/DittoFilter.ts';
 
@@ -25,4 +25,17 @@ async function hydrateEvents(opts: HydrateEventOpts): Promise<DittoEvent[]> {
   return events;
 }
 
-export { hydrateEvents };
+/** Return a normalized event without any non-standard keys. */
+function dehydrateEvent(event: DittoEvent): NostrEvent {
+  return {
+    id: event.id,
+    pubkey: event.pubkey,
+    kind: event.kind,
+    content: event.content,
+    tags: event.tags,
+    sig: event.sig,
+    created_at: event.created_at,
+  };
+}
+
+export { dehydrateEvent, hydrateEvents };
diff --git a/src/storages/pool-store.ts b/src/storages/pool-store.ts
index 07810352..2fe9e562 100644
--- a/src/storages/pool-store.ts
+++ b/src/storages/pool-store.ts
@@ -8,8 +8,8 @@ import {
   type NStoreOpts,
   type RelayPoolWorker,
 } from '@/deps.ts';
-import { cleanEvent } from '@/events.ts';
 import { normalizeFilters } from '@/filter.ts';
+import { dehydrateEvent } from '@/storages/hydrate.ts';
 import { abortError } from '@/utils/abort.ts';
 
 interface PoolStoreOpts {
@@ -38,7 +38,7 @@ class PoolStore implements NStore {
     if (opts.signal?.aborted) return Promise.reject(abortError());
     const { relays = this.#relays } = opts;
 
-    event = cleanEvent(event);
+    event = dehydrateEvent(event);
     this.#debug('EVENT', event);
 
     this.#pool.publish(event, relays);