src/Feed/LoginFeed.ts

@@ -8,7 +8,7 @@ import { Subscriptions } from "Nostr/Subscriptions";
 import { addDirectMessage, addNotifications, setFollows, setRelays } from "State/Login";
 import { RootState } from "State/Store";
 import { mapEventToProfile, MetadataCache  } from "State/Users";
-import db from "State/Users/Db";
+import { getDb } from "State/Users/Db";
 import useSubscription from "Feed/Subscription";
 import { getDisplayName } from "Element/ProfileImage";
 import { MentionRegex } from "Const";
@@ -87,6 +87,7 @@ export default function useLoginFeed() {
                 return acc;
             }, { created: 0, profile: <MetadataCache | null>null });
             if (maxProfile.profile) {
+                const db = getDb()
                 let existing = await db.find(maxProfile.profile.pubkey);
                 if ((existing?.created ?? 0) < maxProfile.created) {
                     await db.put(maxProfile.profile);
@@ -115,6 +116,7 @@ export default function useLoginFeed() {
 }
 
 async function makeNotification(ev: TaggedRawEvent) {
+    const db = getDb()
     switch (ev.kind) {
         case EventKind.TextNote: {
             const pubkeys = new Set([ev.pubkey, ...ev.tags.filter(a => a[0] === "p").map(a => a[1]!)]);

src/Nostr/System.ts

@@ -1,7 +1,7 @@
 import { HexKey, TaggedRawEvent } from "Nostr";
 import { ProfileCacheExpire } from "Const";
 import { mapEventToProfile, MetadataCache, } from "State/Users";
-import db from "State/Users/Db";
+import { getDb } from "State/Users/Db";
 import Connection, { RelaySettings } from "Nostr/Connection";
 import Event from "Nostr/Event";
 import EventKind from "Nostr/EventKind";
@@ -167,6 +167,7 @@ export class NostrSystem {
 
     async _FetchMetadata() {
         let missing = new Set<HexKey>();
+        const db = getDb()
         let meta = await db.bulkGet(Array.from(this.WantsMetadata));
         let expire = new Date().getTime() - ProfileCacheExpire;
         for (let pk of this.WantsMetadata) {

src/State/Users/Db.ts

@@ -144,4 +144,6 @@ indexedDb.isAvailable().then((available) => {
   }
 })
 
-export default db
+export function getDb() {
+  return db
+}

src/State/Users/Hooks.ts

@@ -1,11 +1,13 @@
 import { useSelector } from "react-redux"
 import { useLiveQuery } from "dexie-react-hooks";
 import { MetadataCache } from "State/Users";
-import db, { inMemoryDb } from "State/Users/Db";
+import { getDb, inMemoryDb } from "State/Users/Db";
 import type { RootState } from "State/Store"
 import { HexKey } from "Nostr";
 
 export function useQuery(query: string, limit: number = 5) {
+  const db = getDb()
+
   const allUsers = useLiveQuery(
     () => db.query(query)
           .catch((err) => {
@@ -20,6 +22,7 @@ export function useQuery(query: string, limit: number = 5) {
 }
 
 export function useKey(pubKey: HexKey) {
+  const db = getDb()
   const { users } = useSelector((state: RootState) => state.users)
   const defaultUser = users[pubKey]
 
@@ -38,6 +41,7 @@ export function useKey(pubKey: HexKey) {
 }
 
 export function useKeys(pubKeys: HexKey[]): Map<HexKey, MetadataCache> {
+  const db = getDb()
   const dbUsers = useLiveQuery(async () => {
       if (pubKeys) {
         try {