Merge pull request #173 from v0l/main

[pull] master from v0l:main

Author: pull[bot]

packages/app/config/default.json

@@ -21,9 +21,7 @@
   },
   "signUp": {
     "quickStart": false,
-    "defaultFollows": [
-      "npub1sn0rtcjcf543gj4wsg7fa59s700d5ztys5ctj0g69g2x6802npjqhjjtws"
-    ]
+    "defaultFollows": ["npub1sn0rtcjcf543gj4wsg7fa59s700d5ztys5ctj0g69g2x6802npjqhjjtws"]
   },
   "defaultPreferences": {
     "hideMutedNotes": false,
@@ -65,4 +63,4 @@
     "clientSecret": "GAl1YKLA3FveK1gLBYok"
   },
   "chatChannels": []
-}
+}

packages/app/src/Components/Event/Note/Note.tsx

@@ -39,7 +39,7 @@ export function Note(props: NoteProps) {
   const { data: ev, highlight, options: opt, ignoreModeration = false, className, waitUntilInView } = props;
   const baseClassName = classNames("note min-h-[110px] flex flex-col gap-4 card", className ?? "");
   const { isEventMuted } = useModeration();
-  const { ref, inView } = useInView({ triggerOnce: true, rootMargin: "2000px" });
+  const { ref, inView } = useInView({ triggerOnce: true });
   const { ref: setSeenAtRef, inView: setSeenAtInView } = useInView({ rootMargin: "0px", threshold: 1 });
   const [showTranslation, setShowTranslation] = useState(true);
   const [translated, setTranslated] = useState<NoteTranslation | null>(translationCache.get(ev.id));

packages/app/src/Components/SearchBox/SearchBox.tsx

@@ -1,7 +1,7 @@
 import "./SearchBox.css";
 
 import { NostrLink, tryParseNostrLink } from "@snort/system";
-import { ChangeEvent, useEffect, useRef, useState } from "react";
+import { ChangeEvent, useEffect, useMemo, useRef, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useLocation, useNavigate } from "react-router-dom";
 
@@ -25,7 +25,8 @@ export default function SearchBox() {
   const [activeIndex, setActiveIndex] = useState<number>(-1);
   const resultListRef = useRef<HTMLDivElement | null>(null);
 
-  const results = useProfileSearch(search);
+  const searchFn = useProfileSearch();
+  const results = useMemo(() => searchFn(search), [search, searchFn]);
 
   useEffect(() => {
     const handleGlobalKeyDown = (e: KeyboardEvent) => {

packages/app/src/Feed/LoginFeed.ts

@@ -22,7 +22,7 @@ export default function useLoginFeed() {
   const { publisher, system } = useEventPublisher();
 
   useEffect(() => {
-    //system.checkSigs = checkSigs;
+    system.checkSigs = checkSigs;
   }, [system, checkSigs]);
 
   useEffect(() => {

packages/app/src/Pages/SearchPage.tsx

@@ -15,7 +15,8 @@ const NOTES = 0;
 const PROFILES = 1;
 
 const Profiles = ({ keyword }: { keyword: string }) => {
-  const results = useProfileSearch(keyword);
+  const searchFn = useProfileSearch();
+  const results = useMemo(() => searchFn(keyword), [keyword, searchFn]);
   const ids = useMemo(() => results.map(r => r.pubkey), [results]);
   const content = keyword ? (
     <FollowListBase

packages/app/src/index.tsx

@@ -2,16 +2,17 @@ import "./index.css";
 import "@szhsin/react-menu/dist/index.css";
 import "@/assets/fonts/inter.css";
 
-import { unixNowMs } from "@snort/shared";
+import { unixNow, unixNowMs } from "@snort/shared";
 import { EventBuilder } from "@snort/system";
 import { SnortContext } from "@snort/system-react";
 import { StrictMode } from "react";
 import * as ReactDOM from "react-dom/client";
 import { createBrowserRouter, RouteObject, RouterProvider } from "react-router-dom";
 
-import { preload, UserCache } from "@/Cache";
+import { initRelayWorker, preload, Relay, UserCache } from "@/Cache";
 import { ThreadRoute } from "@/Components/Event/Thread/ThreadRoute";
 import { IntlProvider } from "@/Components/IntlProvider/IntlProvider";
+import { db } from "@/Db";
 import { addCachedMetadataToFuzzySearch } from "@/Db/FuzzySearch";
 import { AboutPage } from "@/Pages/About";
 import { DebugPage } from "@/Pages/CacheDebug";
@@ -39,9 +40,11 @@ import { WalletSendPage } from "@/Pages/wallet/send";
 import ZapPoolPage from "@/Pages/ZapPool/ZapPool";
 import { System } from "@/system";
 import { storeRefCode, unwrap } from "@/Utils";
+import { hasWasm, wasmInit, WasmPath } from "@/Utils/wasm";
 import { Wallets } from "@/Wallet";
 import { setupWebLNWalletConfig } from "@/Wallet";
 
+import { Day } from "./Utils/Const";
 import { LoginStore } from "./Utils/Login";
 
 async function initSite() {
@@ -51,10 +54,14 @@ async function initSite() {
     "31990:84de35e2584d2b144aae823c9ed0b0f3deda09648530b93d1a2a146d1dea9864:app-profile",
   ];
   storeRefCode();
+  if (hasWasm) {
+    await wasmInit(WasmPath);
+    await initRelayWorker();
+  }
 
   setupWebLNWalletConfig(Wallets);
 
-  //db.ready = await db.isAvailable();
+  db.ready = await db.isAvailable();
 
   const login = LoginStore.snapshot();
   preload(login.state.follows).then(async () => {
@@ -77,7 +84,7 @@ async function initSite() {
   });
 
   // cleanup
-  //Relay.delete(["REQ", "cleanup", { kinds: [1, 7, 9735], until: unixNow() - Day * 30 }]);
+  Relay.delete(["REQ", "cleanup", { kinds: [1, 7, 9735], until: unixNow() - Day * 30 }]);
 
   return null;
 }

packages/app/src/system.ts

@@ -1,24 +1,25 @@
 import { removeUndefined, throwIfOffline } from "@snort/shared";
 import { mapEventToProfile, NostrEvent, NostrSystem } from "@snort/system";
 
+import { EventsCache, Relay, RelayMetrics, SystemDb, UserCache, UserFollows, UserRelays } from "@/Cache";
 import { addEventToFuzzySearch } from "@/Db/FuzzySearch";
 import { LoginStore } from "@/Utils/Login";
+import { hasWasm, WasmOptimizer } from "@/Utils/wasm";
 
 /**
  * Singleton nostr system
  */
 export const System = new NostrSystem({
-  //relays: UserRelays,
-  //events: EventsCache,
-  //profiles: UserCache,
-  //relayMetrics: RelayMetrics,
-  //cachingRelay: Relay,
-  //contactLists: UserFollows,
-  //optimizer: hasWasm ? WasmOptimizer : undefined,
-  //db: SystemDb,
+  relays: UserRelays,
+  events: EventsCache,
+  profiles: UserCache,
+  relayMetrics: RelayMetrics,
+  cachingRelay: Relay,
+  contactLists: UserFollows,
+  optimizer: hasWasm ? WasmOptimizer : undefined,
+  db: SystemDb,
   buildFollowGraph: true,
   automaticOutboxModel: true,
-  checkSigs: false,
 });
 
 System.on("auth", async (c, r, cb) => {
@@ -30,8 +31,8 @@ System.on("auth", async (c, r, cb) => {
 });
 
 System.on("event", (_, ev) => {
-  //EventsCache.discover(ev);
-  //UserCache.discover(ev);
+  EventsCache.discover(ev);
+  UserCache.discover(ev);
   addEventToFuzzySearch(ev);
 });
 

packages/system-react/src/useReactions.ts

@@ -31,7 +31,7 @@ export function useReactions(
     }
     others?.(rb);
     return rb;
-  }, [ids]);
+  }, [ids, others]);
 
   return useRequestBuilder(sub);
 }