completed migrate to prisma-rust-client

2023-04-05 09:20:33 +07:00
parent 3f87d510ab
commit fc8dc8fd0d
25 changed files with 342 additions and 213 deletions
--- a/src/components/note/base.tsx
+++ b/src/components/note/base.tsx
@@ -63,13 +63,13 @@ export const NoteBase = memo(function NoteBase({ event }: { event: any }) {

  const getParent = useMemo(() => {
    if (event.parent_id) {
-      if (event.parent_id !== event.id && !event.content.includes('#[0]')) {
+      if (event.parent_id !== event.eventId && !event.content.includes('#[0]')) {
        return <NoteParent id={event.parent_id} />;
      }
    }

    return;
-  }, [event.content, event.id, event.parent_id]);
+  }, [event.content, event.eventId, event.parent_id]);

  const openThread = (e) => {
    const selection = window.getSelection();
@@ -87,7 +87,7 @@ export const NoteBase = memo(function NoteBase({ event }: { event: any }) {
    >
      <>{getParent}</>
      <div className="relative z-10 flex flex-col">
-        <UserExtend pubkey={event.pubkey} time={event.created_at} />
+        <UserExtend pubkey={event.pubkey} time={event.createdAt || event.created_at} />
        <div className="-mt-5 pl-[52px]">
          <div className="flex flex-col gap-2">
            <div className="prose prose-zinc max-w-none break-words text-[15px] leading-tight dark:prose-invert prose-p:m-0 prose-p:text-[15px] prose-p:leading-tight prose-a:font-normal prose-a:text-fuchsia-500 prose-a:no-underline prose-img:m-0 prose-video:m-0">
@@ -97,10 +97,10 @@ export const NoteBase = memo(function NoteBase({ event }: { event: any }) {
        </div>
        <div onClick={(e) => e.stopPropagation()} className="mt-5 pl-[52px]">
          <NoteMetadata
-            eventID={event.id}
+            eventID={event.eventId}
            eventPubkey={event.pubkey}
            eventContent={event.content}
-            eventTime={event.created_at}
+            eventTime={event.createdAt || event.created_at}
          />
        </div>
      </div>
--- a/src/components/note/comment.tsx
+++ b/src/components/note/comment.tsx
@@ -60,7 +60,7 @@ export const NoteComment = memo(function NoteComment({ event }: { event: any })
  return (
    <div className="relative z-10 flex h-min min-h-min w-full select-text flex-col border-b border-zinc-800 px-3 py-5 hover:bg-black/20">
      <div className="relative z-10 flex flex-col">
-        <UserExtend pubkey={event.pubkey} time={event.created_at} />
+        <UserExtend pubkey={event.pubkey} time={event.createdAt || event.created_at} />
        <div className="-mt-5 pl-[52px]">
          <div className="flex flex-col gap-2">
            <div className="prose prose-zinc max-w-none break-words text-[15px] leading-tight dark:prose-invert prose-p:m-0 prose-p:text-[15px] prose-p:leading-tight prose-a:font-normal prose-a:text-fuchsia-500 prose-a:no-underline prose-img:m-0 prose-video:m-0">
@@ -70,10 +70,10 @@ export const NoteComment = memo(function NoteComment({ event }: { event: any })
        </div>
        <div onClick={(e) => e.stopPropagation()} className="mt-5 pl-[52px]">
          <NoteMetadata
-            eventID={event.id}
+            eventID={event.eventId}
            eventPubkey={event.pubkey}
            eventContent={event.content}
-            eventTime={event.created_at}
+            eventTime={event.createdAt || event.created_at}
          />
        </div>
      </div>
--- a/src/components/note/connector.tsx
+++ b/src/components/note/connector.tsx
@@ -1,15 +1,14 @@
 import { RelayContext } from '@components/relaysProvider';

-import { activeAccountAtom, lastLoginAtom } from '@stores/account';
+import { lastLoginAtom } from '@stores/account';
 import { hasNewerNoteAtom } from '@stores/note';

 import { dateToUnix } from '@utils/getDate';
-import { createCacheNote, getAllFollowsByID } from '@utils/storage';
-import { pubkeyArray } from '@utils/transform';
+import { getParentID, pubkeyArray } from '@utils/transform';

 import { TauriEvent } from '@tauri-apps/api/event';
 import { appWindow, getCurrent } from '@tauri-apps/api/window';
-import { useAtomValue, useSetAtom } from 'jotai';
+import { useSetAtom } from 'jotai';
 import { useCallback, useContext, useEffect, useRef, useState } from 'react';

 export default function NoteConnector() {
@@ -17,30 +16,45 @@ export default function NoteConnector() {

  const setLastLoginAtom = useSetAtom(lastLoginAtom);
  const setHasNewerNote = useSetAtom(hasNewerNoteAtom);
-  const activeAccount: any = useAtomValue(activeAccountAtom);

  const [isOnline] = useState(true);
-  const now = useRef(new Date());

-  const subscribe = useCallback(() => {
-    getAllFollowsByID(activeAccount.id).then((follows) => {
-      pool.subscribe(
-        [
-          {
-            kinds: [1],
-            authors: pubkeyArray(follows),
-            since: dateToUnix(now.current),
-          },
-        ],
-        relays,
-        (event: any) => {
-          // insert event to local database
-          createCacheNote(event);
-          setHasNewerNote(true);
-        }
-      );
-    });
-  }, [activeAccount.id, pool, relays, setHasNewerNote]);
+  const now = useRef(new Date());
+  const unsubscribe = useRef(null);
+
+  const subscribe = useCallback(async () => {
+    const { createNote } = await import('@utils/bindings');
+    const activeAccount = JSON.parse(localStorage.getItem('activeAccount'));
+    const follows = JSON.parse(localStorage.getItem('activeAccountFollows'));
+
+    unsubscribe.current = pool.subscribe(
+      [
+        {
+          kinds: [1],
+          authors: pubkeyArray(follows),
+          since: dateToUnix(now.current),
+        },
+      ],
+      relays,
+      (event) => {
+        const parentID = getParentID(event.tags, event.id);
+        // insert event to local database
+        createNote({
+          event_id: event.id,
+          pubkey: event.pubkey,
+          kind: event.kind,
+          tags: JSON.stringify(event.tags),
+          content: event.content,
+          parent_id: parentID,
+          parent_comment_id: '',
+          created_at: event.created_at,
+          account_id: activeAccount.id,
+        }).catch(console.error);
+        // notify user reload to get newer note
+        setHasNewerNote(true);
+      }
+    );
+  }, [pool, relays, setHasNewerNote]);

  useEffect(() => {
    subscribe();
@@ -48,23 +62,25 @@ export default function NoteConnector() {
      setLastLoginAtom(now.current);
      appWindow.close();
    });
-  }, [activeAccount.id, pool, relays, setHasNewerNote, subscribe]);
+
+    return () => {
+      unsubscribe.current;
+    };
+  }, [setHasNewerNote, setLastLoginAtom, subscribe]);

  return (
-    <>
-      <div className="inline-flex items-center gap-1 rounded-md px-1.5 py-1 hover:bg-zinc-900">
-        <span className="relative flex h-1.5 w-1.5">
-          <span
-            className={`absolute inline-flex h-full w-full animate-ping rounded-full opacity-75 ${
-              isOnline ? 'bg-green-400' : 'bg-red-400'
-            }`}
-          ></span>
-          <span
-            className={`relative inline-flex h-1.5 w-1.5 rounded-full ${isOnline ? 'bg-green-400' : 'bg-amber-400'}`}
-          ></span>
-        </span>
-        <p className="text-xs font-medium text-zinc-500">{isOnline ? 'Online' : 'Offline'}</p>
-      </div>
-    </>
+    <div className="inline-flex items-center gap-1 rounded-md px-1.5 py-1 hover:bg-zinc-900">
+      <span className="relative flex h-1.5 w-1.5">
+        <span
+          className={`absolute inline-flex h-full w-full animate-ping rounded-full opacity-75 ${
+            isOnline ? 'bg-green-400' : 'bg-red-400'
+          }`}
+        ></span>
+        <span
+          className={`relative inline-flex h-1.5 w-1.5 rounded-full ${isOnline ? 'bg-green-400' : 'bg-amber-400'}`}
+        ></span>
+      </span>
+      <p className="text-xs font-medium text-zinc-500">{isOnline ? 'Online' : 'Offline'}</p>
+    </div>
  );
 }
--- a/src/components/note/extend.tsx
+++ b/src/components/note/extend.tsx
@@ -60,7 +60,7 @@ export const NoteExtend = memo(function NoteExtend({ event }: { event: any }) {
  return (
    <div className="relative z-10 flex h-min min-h-min w-full select-text flex-col">
      <div className="relative z-10 flex flex-col">
-        <UserLarge pubkey={event.pubkey} time={event.created_at} />
+        <UserLarge pubkey={event.pubkey} time={event.createdAt || event.created_at} />
        <div className="mt-2">
          <div className="flex flex-col gap-2">
            <div className="prose prose-zinc max-w-none break-words text-[15px] leading-tight dark:prose-invert prose-p:m-0 prose-p:text-[15px] prose-p:leading-tight prose-a:font-normal prose-a:text-fuchsia-500 prose-a:no-underline prose-img:m-0 prose-video:m-0">
@@ -70,10 +70,10 @@ export const NoteExtend = memo(function NoteExtend({ event }: { event: any }) {
        </div>
        <div className="mt-5 flex items-center border-b border-t border-zinc-800 py-2">
          <NoteMetadata
-            eventID={event.id}
+            eventID={event.eventId}
            eventPubkey={event.pubkey}
            eventContent={event.content}
-            eventTime={event.created_at}
+            eventTime={event.createdAt || event.created_at}
          />
        </div>
      </div>
--- a/src/components/note/parent.tsx
+++ b/src/components/note/parent.tsx
@@ -6,7 +6,7 @@ import { RelayContext } from '@components/relaysProvider';
 import { UserExtend } from '@components/user/extend';
 import { UserMention } from '@components/user/mention';

-import { createCacheNote, getNoteByID } from '@utils/storage';
+import { getParentID } from '@utils/transform';

 import destr from 'destr';
 import { memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
@@ -18,7 +18,10 @@ export const NoteParent = memo(function NoteParent({ id }: { id: string }) {
  const [event, setEvent] = useState(null);
  const unsubscribe = useRef(null);

-  const fetchEvent = useCallback(() => {
+  const fetchEvent = useCallback(async () => {
+    const { createNote } = await import('@utils/bindings');
+    const activeAccount = JSON.parse(localStorage.getItem('activeAccount'));
+
    unsubscribe.current = pool.subscribe(
      [
        {
@@ -31,7 +34,19 @@ export const NoteParent = memo(function NoteParent({ id }: { id: string }) {
        // update state
        setEvent(event);
        // insert to database
-        createCacheNote(event);
+        const parentID = getParentID(event.tags, event.id);
+        // insert event to local database
+        createNote({
+          event_id: event.id,
+          pubkey: event.pubkey,
+          kind: event.kind,
+          tags: JSON.stringify(event.tags),
+          content: event.content,
+          parent_id: parentID,
+          parent_comment_id: '',
+          created_at: event.created_at,
+          account_id: activeAccount.id,
+        }).catch(console.error);
      },
      undefined,
      undefined,
@@ -41,19 +56,26 @@ export const NoteParent = memo(function NoteParent({ id }: { id: string }) {
    );
  }, [id, pool, relays]);

+  const checkNoteExist = useCallback(async () => {
+    const { getNoteById } = await import('@utils/bindings');
+    getNoteById({ event_id: id })
+      .then((res) => {
+        if (res) {
+          setEvent(res);
+        } else {
+          fetchEvent();
+        }
+      })
+      .catch(console.error);
+  }, [fetchEvent, id]);
+
  useEffect(() => {
-    getNoteByID(id).then((res) => {
-      if (res) {
-        setEvent(res);
-      } else {
-        fetchEvent();
-      }
-    });
+    checkNoteExist();

    return () => {
      unsubscribe.current;
    };
-  }, [fetchEvent, id]);
+  }, [checkNoteExist]);

  const content = useMemo(() => {
    let parsedContent = event ? event.content : null;
@@ -110,7 +132,7 @@ export const NoteParent = memo(function NoteParent({ id }: { id: string }) {
      <div className="relative pb-5">
        <div className="absolute left-[21px] top-0 h-full w-0.5 bg-gradient-to-t from-zinc-800 to-zinc-600"></div>
        <div className="relative z-10 flex flex-col">
-          <UserExtend pubkey={event.pubkey} time={event.created_at} />
+          <UserExtend pubkey={event.pubkey} time={event.createdAt || event.created_at} />
          <div className="-mt-5 pl-[52px]">
            <div className="flex flex-col gap-2">
              <div className="prose prose-zinc max-w-none break-words text-[15px] leading-tight dark:prose-invert prose-p:m-0 prose-p:text-[15px] prose-p:leading-tight prose-a:font-normal prose-a:text-fuchsia-500 prose-a:no-underline prose-img:m-0 prose-video:m-0">
@@ -120,10 +142,10 @@ export const NoteParent = memo(function NoteParent({ id }: { id: string }) {
          </div>
          <div onClick={(e) => e.stopPropagation()} className="mt-5 pl-[52px]">
            <NoteMetadata
-              eventID={event.id}
+              eventID={event.eventId}
              eventPubkey={event.pubkey}
              eventContent={event.content}
-              eventTime={event.created_at}
+              eventTime={event.createdAt || event.created_at}
            />
          </div>
        </div>
--- a/src/components/note/repost.tsx
+++ b/src/components/note/repost.tsx
@@ -2,7 +2,7 @@ import { RelayContext } from '@components/relaysProvider';
 import { UserExtend } from '@components/user/extend';
 import { UserMention } from '@components/user/mention';

-import { createCacheNote, getNoteByID } from '@utils/storage';
+import { getParentID } from '@utils/transform';

 import destr from 'destr';
 import { memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
@@ -14,7 +14,10 @@ export const NoteRepost = memo(function NoteRepost({ id }: { id: string }) {
  const [event, setEvent] = useState(null);
  const unsubscribe = useRef(null);

-  const fetchEvent = useCallback(() => {
+  const fetchEvent = useCallback(async () => {
+    const { createNote } = await import('@utils/bindings');
+    const activeAccount = JSON.parse(localStorage.getItem('activeAccount'));
+
    unsubscribe.current = pool.subscribe(
      [
        {
@@ -27,7 +30,19 @@ export const NoteRepost = memo(function NoteRepost({ id }: { id: string }) {
        // update state
        setEvent(event);
        // insert to database
-        createCacheNote(event);
+        const parentID = getParentID(event.tags, event.id);
+        // insert event to local database
+        createNote({
+          event_id: event.id,
+          pubkey: event.pubkey,
+          kind: event.kind,
+          tags: JSON.stringify(event.tags),
+          content: event.content,
+          parent_id: parentID,
+          parent_comment_id: '',
+          created_at: event.created_at,
+          account_id: activeAccount.id,
+        }).catch(console.error);
      },
      undefined,
      undefined,
@@ -37,19 +52,26 @@ export const NoteRepost = memo(function NoteRepost({ id }: { id: string }) {
    );
  }, [id, pool, relays]);

+  const checkNoteExist = useCallback(async () => {
+    const { getNoteById } = await import('@utils/bindings');
+    getNoteById({ event_id: id })
+      .then((res) => {
+        if (res) {
+          setEvent(res);
+        } else {
+          fetchEvent();
+        }
+      })
+      .catch(console.error);
+  }, [fetchEvent, id]);
+
  useEffect(() => {
-    getNoteByID(id).then((res) => {
-      if (res) {
-        setEvent(res);
-      } else {
-        fetchEvent();
-      }
-    });
+    checkNoteExist();

    return () => {
      unsubscribe.current;
    };
-  }, [fetchEvent, id]);
+  }, [checkNoteExist]);

  const content = useMemo(() => {
    let parsedContent = event ? event.content : null;
@@ -89,7 +111,7 @@ export const NoteRepost = memo(function NoteRepost({ id }: { id: string }) {
    return (
      <div className="relative mb-2 mt-3 rounded-lg border border-zinc-700 bg-zinc-800 p-2 py-3">
        <div className="relative z-10 flex flex-col">
-          <UserExtend pubkey={event.pubkey} time={event.created_at} />
+          <UserExtend pubkey={event.pubkey} time={event.createdAt || event.created_at} />
          <div className="-mt-5 pl-[52px]">
            <div className="flex flex-col gap-2">
              <div className="prose prose-zinc max-w-none break-words text-[15px] leading-tight dark:prose-invert prose-p:m-0 prose-p:text-[15px] prose-p:leading-tight prose-a:font-normal prose-a:text-fuchsia-500 prose-a:no-underline prose-img:m-0 prose-video:m-0">