From 2a4c3dd7c81e6569089984cee4ca81cd5752a485 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:20:36 +0700
Subject: [PATCH] update useProfile hook

---
 src/app/auth/import/step-2.tsx      |  2 +-
 src/app/chat/components/item.tsx    |  2 +-
 src/app/chat/components/self.tsx    |  2 +-
 src/app/chat/components/sidebar.tsx |  2 +-
 src/app/user/index.tsx              |  2 +-
 src/shared/composer/user.tsx        |  2 +-
 src/shared/user.tsx                 |  4 ++--
 src/utils/hooks/useProfile.tsx      | 15 +++++++++++----
 8 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx
index f3ae5127..6a65cc0d 100644
--- a/src/app/auth/import/step-2.tsx
+++ b/src/app/auth/import/step-2.tsx
@@ -60,7 +60,7 @@ export function ImportStep2Screen() {
       setPassword(data.password);
 
       // save privkey to secure storage
-      await save(pubkey, privkey);
+      await save(pubkey, privkey, data.password);
 
       // redirect to next step
       navigate('/auth/import/step-3', { replace: true });
diff --git a/src/app/chat/components/item.tsx b/src/app/chat/components/item.tsx
index 71d0e9e6..f75015a8 100644
--- a/src/app/chat/components/item.tsx
+++ b/src/app/chat/components/item.tsx
@@ -33,7 +33,7 @@ export function ChatsListItem({ data }: { data: any }) {
     >
       <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
         <Image
-          src={user?.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={data.sender_pubkey}
           className="h-6 w-6 rounded object-cover"
diff --git a/src/app/chat/components/self.tsx b/src/app/chat/components/self.tsx
index 1cd03707..f1a29ac2 100644
--- a/src/app/chat/components/self.tsx
+++ b/src/app/chat/components/self.tsx
@@ -35,7 +35,7 @@ export function ChatsListSelfItem({ data }: { data: any }) {
     >
       <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
         <Image
-          src={user?.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={data.pubkey}
           className="h-6 w-6 rounded bg-white object-cover"
diff --git a/src/app/chat/components/sidebar.tsx b/src/app/chat/components/sidebar.tsx
index 0f14b440..56f9cb7a 100644
--- a/src/app/chat/components/sidebar.tsx
+++ b/src/app/chat/components/sidebar.tsx
@@ -15,7 +15,7 @@ export function ChatSidebar({ pubkey }: { pubkey: string }) {
       <div className="flex flex-col gap-3">
         <div className="relative h-11 w-11 shrink rounded-md">
           <Image
-            src={user?.image}
+            src={user?.picture || user?.image}
             fallback={DEFAULT_AVATAR}
             alt={pubkey}
             className="h-11 w-11 rounded-md object-cover"
diff --git a/src/app/user/index.tsx b/src/app/user/index.tsx
index 71e13a2b..e05d8627 100644
--- a/src/app/user/index.tsx
+++ b/src/app/user/index.tsx
@@ -71,7 +71,7 @@ export function UserScreen() {
       <div className="-mt-7 w-full">
         <div className="px-5">
           <Image
-            src={user?.image}
+            src={user?.picture || user?.image}
             fallback={DEFAULT_AVATAR}
             alt={pubkey}
             className="h-14 w-14 rounded-md ring-2 ring-black"
diff --git a/src/shared/composer/user.tsx b/src/shared/composer/user.tsx
index efc86814..b8f3a85b 100644
--- a/src/shared/composer/user.tsx
+++ b/src/shared/composer/user.tsx
@@ -11,7 +11,7 @@ export function User({ pubkey }: { pubkey: string }) {
     <div className="flex items-center gap-2">
       <div className="h-8 w-8 shrink-0 overflow-hidden rounded bg-zinc-900">
         <Image
-          src={user?.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={pubkey}
           className="h-8 w-8 object-cover"
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 0e15c89f..cd76290c 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -58,7 +58,7 @@ export function User({
         className={`${avatarWidth} ${avatarHeight} relative z-10 shrink-0 overflow-hidden bg-zinc-900`}
       >
         <Image
-          src={user?.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={pubkey}
           className={`${avatarWidth} ${avatarHeight} ${
@@ -93,7 +93,7 @@ export function User({
           <div className="w-[250px] overflow-hidden rounded-md border border-zinc-800/50 bg-zinc-900/90 backdrop-blur-lg">
             <div className="flex gap-2.5 border-b border-zinc-800 px-3 py-3">
               <Image
-                src={user?.image}
+                src={user?.picture || user?.image}
                 fallback={DEFAULT_AVATAR}
                 alt={pubkey}
                 className="h-11 w-11 shrink-0 rounded-lg object-cover"
diff --git a/src/utils/hooks/useProfile.tsx b/src/utils/hooks/useProfile.tsx
index dbb077fd..8ecce2b0 100644
--- a/src/utils/hooks/useProfile.tsx
+++ b/src/utils/hooks/useProfile.tsx
@@ -1,3 +1,4 @@
+import { NDKFilter } from '@nostr-dev-kit/ndk';
 import { useQuery } from '@tanstack/react-query';
 
 import { useNDK } from '@libs/ndk/provider';
@@ -17,10 +18,16 @@ export function useProfile(pubkey: string, fallback?: string) {
       if (cache && parseInt(cache.created_at) + 86400 >= current) {
         return cache;
       } else {
-        const user = ndk.getUser({ hexpubkey: pubkey });
-        await user.fetchProfile();
-        await createMetadata(pubkey, pubkey, JSON.stringify(user.profile));
-        return user.profile;
+        const filter: NDKFilter = { kinds: [0], authors: [pubkey] };
+        const events = await ndk.fetchEvents(filter);
+        const latest = [...events].slice(-1)[0];
+        if (latest) {
+          await createMetadata(pubkey, pubkey, latest.content);
+          return JSON.parse(latest.content);
+        } else {
+          await createMetadata(pubkey, pubkey, [...events][0].content);
+          return JSON.parse([...events][0].content);
+        }
       }
     } else {
       const profile = JSON.parse(fallback);