From 8726e22b387fbdb3ad5bda302116cfe0b69751de Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Sun, 17 Sep 2023 08:03:29 +0700
Subject: [PATCH] replace nostr.com with njump.me

---
 src/app/auth/unlock.tsx                 |  2 +-
 src/app/notes/article.tsx               |  2 +-
 src/app/notes/text.tsx                  |  2 +-
 src/shared/notes/actions/more.tsx       |  3 +--
 src/shared/notes/child.tsx              |  4 +--
 src/shared/notes/kinds/repost.tsx       |  6 ++---
 src/shared/notes/mentions/note.tsx      |  4 +--
 src/shared/widgets/other/learnNostr.tsx | 11 ++++----
 src/stores/resources.ts                 | 34 ++++++++++++++++++++-----
 9 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/app/auth/unlock.tsx b/src/app/auth/unlock.tsx
index 84d770b2..38169a5e 100644
--- a/src/app/auth/unlock.tsx
+++ b/src/app/auth/unlock.tsx
@@ -89,7 +89,7 @@ export function UnlockScreen() {
                 {...register('password', { required: true, minLength: 4 })}
                 type={showPassword ? 'text' : 'password'}
                 placeholder="Password"
-                className="relative h-12 w-full rounded-b-lg bg-white/10 py-1 text-center tracking-widest text-white !outline-none backdrop-blur-xl placeholder:text-white/50"
+                className="relative h-12 w-full rounded-b-lg bg-white/10 py-1 text-center tracking-widest text-white !outline-none backdrop-blur-xl placeholder:tracking-normal placeholder:text-white/50"
               />
               <button
                 type="button"
diff --git a/src/app/notes/article.tsx b/src/app/notes/article.tsx
index 5ca80f82..9e7d0a31 100644
--- a/src/app/notes/article.tsx
+++ b/src/app/notes/article.tsx
@@ -35,7 +35,7 @@ export function ArticleNoteScreen() {
 
   const share = async () => {
     await writeText(
-      'https://nostr.com/' +
+      'https://njump.me/' +
         nip19.neventEncode({ id: data.id, author: data.pubkey } as EventPointer)
     );
     // update state
diff --git a/src/app/notes/text.tsx b/src/app/notes/text.tsx
index 7f3055e3..897c1696 100644
--- a/src/app/notes/text.tsx
+++ b/src/app/notes/text.tsx
@@ -35,7 +35,7 @@ export function TextNoteScreen() {
 
   const share = async () => {
     await writeText(
-      'https://nostr.com/' +
+      'https://njump.me/' +
         nip19.neventEncode({ id: data.id, author: data.pubkey } as EventPointer)
     );
     // update state
diff --git a/src/shared/notes/actions/more.tsx b/src/shared/notes/actions/more.tsx
index 5fad097d..e17d8f93 100644
--- a/src/shared/notes/actions/more.tsx
+++ b/src/shared/notes/actions/more.tsx
@@ -18,8 +18,7 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
 
   const copyLink = async () => {
     await writeText(
-      'https://nostr.com/' +
-        nip19.neventEncode({ id: id, author: pubkey } as EventPointer)
+      'https://njump.me/' + nip19.neventEncode({ id: id, author: pubkey } as EventPointer)
     );
     setOpen(false);
   };
diff --git a/src/shared/notes/child.tsx b/src/shared/notes/child.tsx
index 1160f5a9..64094616 100644
--- a/src/shared/notes/child.tsx
+++ b/src/shared/notes/child.tsx
@@ -43,7 +43,7 @@ export function ChildNote({ id, root }: { id: string; root?: string }) {
   }
 
   if (status === 'error') {
-    const noteLink = `https://nostr.com/${nip19.noteEncode(id)}`;
+    const noteLink = `https://njump.me/${nip19.noteEncode(id)}`;
     return (
       <>
         <div className="absolute bottom-0 left-[18px] h-[calc(100%-3.4rem)] w-0.5 bg-gradient-to-t from-white/20 to-white/10" />
@@ -62,7 +62,7 @@ export function ChildNote({ id, root }: { id: string; root?: string }) {
               <div className="relative z-20 mt-1 flex-1 select-text">
                 <div className="mb-1 select-text rounded-lg bg-white/5 p-1.5 text-sm">
                   Lume cannot find this post with your current relays, but you can view it
-                  via nostr.com.{' '}
+                  via njump.me.{' '}
                   <Link to={noteLink} className="text-fuchsia-500">
                     Learn more
                   </Link>
diff --git a/src/shared/notes/kinds/repost.tsx b/src/shared/notes/kinds/repost.tsx
index 413e4308..5f1ae1e3 100644
--- a/src/shared/notes/kinds/repost.tsx
+++ b/src/shared/notes/kinds/repost.tsx
@@ -19,7 +19,7 @@ import { useEvent } from '@utils/hooks/useEvent';
 
 export function Repost({ event, root }: { event: NDKEvent; root?: string }) {
   const rootPost = root ?? event.tags.find((el) => el[0] === 'e')?.[1];
-  const { status, data } = useEvent(rootPost, event.content);
+  const { status, data } = useEvent(rootPost, null, event.content);
 
   const renderKind = useCallback(
     (repostEvent: NDKEvent) => {
@@ -49,7 +49,7 @@ export function Repost({ event, root }: { event: NDKEvent; root?: string }) {
 
   if (status === 'error') {
     // @ts-expect-error, root_id isn't exist on NDKEvent
-    const noteLink = `https://nostr.com/${nip19.noteEncode(event.root_id)}`;
+    const noteLink = `https://njump.me/${nip19.noteEncode(event.root_id)}`;
     return (
       <div className="relative mb-5 flex flex-col">
         <div className="relative z-10 flex items-start gap-3">
@@ -66,7 +66,7 @@ export function Repost({ event, root }: { event: NDKEvent; root?: string }) {
             <div className="relative z-20 mt-1 flex-1 select-text">
               <div className="mb-1 select-text rounded-lg bg-white/5 p-1.5 text-sm">
                 Lume cannot find this post with your current relays, but you can view it
-                via nostr.com.{' '}
+                via njump.me.{' '}
                 <Link to={noteLink} className="text-fuchsia-500">
                   Learn more
                 </Link>
diff --git a/src/shared/notes/mentions/note.tsx b/src/shared/notes/mentions/note.tsx
index a663db79..227fc0b0 100644
--- a/src/shared/notes/mentions/note.tsx
+++ b/src/shared/notes/mentions/note.tsx
@@ -56,7 +56,7 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
   }
 
   if (status === 'error') {
-    const noteLink = `https://nostr.com/${nip19.noteEncode(id)}`;
+    const noteLink = `https://njump.me/${nip19.noteEncode(id)}`;
     return (
       <div className="relative mt-3 flex flex-col">
         <div className="relative z-10 flex items-center gap-3">
@@ -70,7 +70,7 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
         <div className="mt-1">
           <div className="mb-1 select-text rounded-lg bg-white/5 p-1.5 text-sm">
             Lume cannot find this post with your current relays, but you can view it via
-            nostr.com.{' '}
+            njump.me.{' '}
             <Link to={noteLink} className="text-fuchsia-500">
               Learn more
             </Link>
diff --git a/src/shared/widgets/other/learnNostr.tsx b/src/shared/widgets/other/learnNostr.tsx
index 73a34e8e..6d8d5e1c 100644
--- a/src/shared/widgets/other/learnNostr.tsx
+++ b/src/shared/widgets/other/learnNostr.tsx
@@ -9,13 +9,14 @@ import { Widget } from '@utils/types';
 
 export function LearnNostrWidget({ params }: { params: Widget }) {
   const navigate = useNavigate();
-  const readResource = useResources((state) => state.readResource);
-
+  const openResource = useResources((state) => state.openResource);
   const resources = useResources((state) => state.resources);
-  const readed = useResources((state) => state.readed);
+  const seens = useResources((state) => state.seens);
 
   const open = (naddr: string) => {
-    readResource(naddr);
+    // add resource to seen list
+    openResource(naddr);
+    // redirect
     navigate(`/notes/article/${naddr}`);
   };
 
@@ -39,7 +40,7 @@ export function LearnNostrWidget({ params }: { params: Widget }) {
                       <div className="h-10 w-10 shrink-0 rounded-md bg-white/10" />
                       <div className="flex flex-col items-start gap-1">
                         <h5 className="font-semibold leading-none">{item.title}</h5>
-                        {readed.has(item.id) ? (
+                        {seens.has(item.id) ? (
                           <p className="text-sm leading-none text-green-500">Readed</p>
                         ) : (
                           <p className="text-sm leading-none text-white/70">Unread</p>
diff --git a/src/stores/resources.ts b/src/stores/resources.ts
index 30d69aa9..2a9aec81 100644
--- a/src/stores/resources.ts
+++ b/src/stores/resources.ts
@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import { createJSONStorage, persist } from 'zustand/middleware';
+import { persist } from 'zustand/middleware';
 
 import { Resources } from '@utils/types';
 
@@ -47,22 +47,42 @@ const DEFAULT_RESOURCES: Array<Resources> = [
 
 interface ResourceState {
   resources: Array<Resources>;
-  readed: Set<string>;
-  readResource: (id: string) => void;
+  seens: Set<string>;
+  openResource: (id: string) => void;
 }
 
 export const useResources = create<ResourceState>()(
   persist(
     (set) => ({
       resources: DEFAULT_RESOURCES,
-      readed: new Set(),
-      readResource: (id: string) => {
-        set((state) => ({ readed: new Set(state.readed).add(id) }));
+      seens: new Set(),
+      openResource: (id: string) => {
+        set((state) => ({ seens: new Set(state.seens).add(id) }));
       },
     }),
     {
       name: 'resources',
-      storage: createJSONStorage(() => localStorage),
+      storage: {
+        getItem: (name) => {
+          const str = localStorage.getItem(name);
+          return {
+            state: {
+              ...JSON.parse(str).state,
+              seens: new Set(JSON.parse(str).state.seens),
+            },
+          };
+        },
+        setItem: (name, newValue) => {
+          const str = JSON.stringify({
+            state: {
+              ...newValue.state,
+              seens: Array.from(newValue.state.seens),
+            },
+          });
+          localStorage.setItem(name, str);
+        },
+        removeItem: (name) => localStorage.removeItem(name),
+      },
     }
   )
 );