From f83925331af56f284adccbfcef3554aa3cef112a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 20 Feb 2025 20:04:57 -0600
Subject: [PATCH] Apply the UserStore to the userMiddleware

---
 packages/mastoapi/middleware/userMiddleware.ts          | 1 +
 packages/{ditto => mastoapi}/storages/UserStore.test.ts | 4 ++--
 packages/{ditto => mastoapi}/storages/UserStore.ts      | 9 ++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)
 rename packages/{ditto => mastoapi}/storages/UserStore.test.ts (96%)
 rename packages/{ditto => mastoapi}/storages/UserStore.ts (92%)

diff --git a/packages/mastoapi/middleware/userMiddleware.ts b/packages/mastoapi/middleware/userMiddleware.ts
index a86fecc5..71a375eb 100644
--- a/packages/mastoapi/middleware/userMiddleware.ts
+++ b/packages/mastoapi/middleware/userMiddleware.ts
@@ -6,6 +6,7 @@ import { aesDecrypt } from '../auth/aes.ts';
 import { getTokenHash } from '../auth/token.ts';
 import { ConnectSigner } from '../signers/ConnectSigner.ts';
 import { ReadOnlySigner } from '../signers/ReadOnlySigner.ts';
+import { UserStore } from '../storages/UserStore.ts';
 
 import type { DittoConf } from '@ditto/conf';
 import type { DittoDB } from '@ditto/db';
diff --git a/packages/ditto/storages/UserStore.test.ts b/packages/mastoapi/storages/UserStore.test.ts
similarity index 96%
rename from packages/ditto/storages/UserStore.test.ts
rename to packages/mastoapi/storages/UserStore.test.ts
index 56ec1254..c9aa3329 100644
--- a/packages/ditto/storages/UserStore.test.ts
+++ b/packages/mastoapi/storages/UserStore.test.ts
@@ -1,7 +1,7 @@
 import { MockRelay } from '@nostrify/nostrify/test';
-
 import { assertEquals } from '@std/assert';
-import { UserStore } from '@/storages/UserStore.ts';
+
+import { UserStore } from './UserStore.ts';
 
 import userBlack from '~/fixtures/events/kind-0-black.json' with { type: 'json' };
 import userMe from '~/fixtures/events/event-0-makes-repost-with-quote-repost.json' with { type: 'json' };
diff --git a/packages/ditto/storages/UserStore.ts b/packages/mastoapi/storages/UserStore.ts
similarity index 92%
rename from packages/ditto/storages/UserStore.ts
rename to packages/mastoapi/storages/UserStore.ts
index 0533917c..dec77916 100644
--- a/packages/ditto/storages/UserStore.ts
+++ b/packages/mastoapi/storages/UserStore.ts
@@ -1,4 +1,11 @@
-import { NostrEvent, NostrFilter, NostrRelayCLOSED, NostrRelayEOSE, NostrRelayEVENT, NRelay } from '@nostrify/nostrify';
+import type {
+  NostrEvent,
+  NostrFilter,
+  NostrRelayCLOSED,
+  NostrRelayEOSE,
+  NostrRelayEVENT,
+  NRelay,
+} from '@nostrify/nostrify';
 
 interface UserStoreOpts {
   relay: NRelay;