From 27fe32d7483f5d7444207c0723ecd87e4fa7fc3b Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:57:12 +0700
Subject: [PATCH] fixed note

---
 src/components/note/connector.tsx     |  2 +-
 src/components/note/content/index.tsx |  9 ++++-----
 src/components/note/index.tsx         | 15 +++++++--------
 src/components/note/root.tsx          |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/note/connector.tsx b/src/components/note/connector.tsx
index 16735a17..5f2ff1cb 100644
--- a/src/components/note/connector.tsx
+++ b/src/components/note/connector.tsx
@@ -25,7 +25,7 @@ export const NoteConnector = memo(function NoteConnector() {
       // insert to local database
       await db.execute(
         'INSERT OR IGNORE INTO cache_notes (id, pubkey, created_at, kind, content, tags) VALUES (?, ?, ?, ?, ?, ?);',
-        [event.id, event.pubkey, event.created_at, event.kind, event.content, String(event.tags)]
+        [event.id, event.pubkey, event.created_at, event.kind, event.content, JSON.stringify(event.tags)]
       );
     },
     [db]
diff --git a/src/components/note/content/index.tsx b/src/components/note/content/index.tsx
index 2dec501c..6f84a640 100644
--- a/src/components/note/content/index.tsx
+++ b/src/components/note/content/index.tsx
@@ -10,8 +10,7 @@ export const Content = memo(function Content({ data }: { data: any }) {
   const content = useMemo(() => {
     let parsedContent;
     // get data tags
-    const tags = String(data.tags).replaceAll("'", '"');
-    const parseTags = JSON.parse(tags);
+    const tags = JSON.parse(data.tags);
     // remove all image urls
     parsedContent = data.content.replace(/(https?:\/\/.*\.(jpg|jpeg|gif|png|webp|mp4|webm)((\?.*)$|$))/gim, '');
     // handle urls
@@ -27,10 +26,10 @@ export const Content = memo(function Content({ data }: { data: any }) {
       </span>
     ));
     // handle mentions
-    if (parseTags.length > 0) {
+    if (tags.length > 0) {
       parsedContent = reactStringReplace(parsedContent, /\#\[(\d+)\]/gm, (match, i) => {
-        if (parseTags[match][0] === 'p') {
-          return <UserMention key={match + i} pubkey={parseTags[match][1]} />;
+        if (tags[match][0] === 'p') {
+          return <UserMention key={match + i} pubkey={tags[match][1]} />;
         } else {
           // #TODO: handle mention other note
           // console.log(tags[match]);
diff --git a/src/components/note/index.tsx b/src/components/note/index.tsx
index e9c1fc46..d069646c 100644
--- a/src/components/note/index.tsx
+++ b/src/components/note/index.tsx
@@ -4,17 +4,16 @@ import { RootNote } from '@components/note/root';
 import { memo, useMemo } from 'react';
 
 export const Note = memo(function Note({ event }: { event: any }) {
-  const tags = event.tags.replaceAll("'", '"');
-  const parseTags = JSON.parse(tags);
+  const tags = JSON.parse(event.tags);
 
   const fetchRootEvent = useMemo(() => {
-    if (parseTags.length > 0) {
-      if (parseTags[0][0] === 'e' || parseTags[0][2] === 'root') {
-        return <RootNote id={parseTags[0][1]} />;
+    if (tags.length > 0) {
+      if (tags[0][0] === 'e' || tags[0][2] === 'root') {
+        return <RootNote id={tags[0][1]} />;
       } else {
-        parseTags.every((tag) => {
+        tags.every((tag) => {
           if (tag[0] === 'e' && tag[2] === 'root') {
-            return <RootNote id={parseTags[1]} />;
+            return <RootNote id={tags[1]} />;
           }
           return <></>;
         });
@@ -22,7 +21,7 @@ export const Note = memo(function Note({ event }: { event: any }) {
     } else {
       return <></>;
     }
-  }, [parseTags]);
+  }, [tags]);
 
   return (
     <div className="relative z-10 flex h-min min-h-min w-full cursor-pointer select-text flex-col border-b border-zinc-800 py-5 px-3 hover:bg-black/20">
diff --git a/src/components/note/root.tsx b/src/components/note/root.tsx
index 94f21bf5..92d75818 100644
--- a/src/components/note/root.tsx
+++ b/src/components/note/root.tsx
@@ -17,7 +17,7 @@ export const RootNote = memo(function RootNote({ id }: { id: string }) {
       // insert to local database
       await db.execute(
         'INSERT OR IGNORE INTO cache_notes (id, pubkey, created_at, kind, content, tags, is_root) VALUES (?, ?, ?, ?, ?, ?, ?);',
-        [event.id, event.pubkey, event.created_at, event.kind, event.content, String(event.tags), 1]
+        [event.id, event.pubkey, event.created_at, event.kind, event.content, JSON.stringify(event.tags), 1]
       );
     },
     [db]