update urls and user page

src/app.tsx

@@ -15,7 +15,7 @@ import { OnboardingScreen } from '@app/auth/onboarding';
 import { UnlockScreen } from '@app/auth/unlock';
 import { WelcomeScreen } from '@app/auth/welcome';
 import { ChannelScreen } from '@app/channel';
-import { ChatScreen } from '@app/chat';
+import { ChatScreen } from '@app/chats';
 import { ErrorScreen } from '@app/error';
 import { NoteScreen } from '@app/note';
 import { Root } from '@app/root';
@@ -24,7 +24,7 @@ import { GeneralSettingsScreen } from '@app/settings/general';
 import { ShortcutsSettingsScreen } from '@app/settings/shortcuts';
 import { SpaceScreen } from '@app/space';
 import { TrendingScreen } from '@app/trending';
-import { UserScreen } from '@app/user';
+import { UserScreen } from '@app/users';
 
 import { AppLayout } from '@shared/appLayout';
 import { AuthLayout } from '@shared/authLayout';
@@ -84,8 +84,8 @@ const router = createBrowserRouter([
       { path: 'space', element: <SpaceScreen /> },
       { path: 'trending', element: <TrendingScreen /> },
       { path: 'note/:id', element: <NoteScreen /> },
-      { path: 'user/:pubkey', element: <UserScreen /> },
-      { path: 'chat/:pubkey', element: <ChatScreen /> },
+      { path: 'users/:pubkey', element: <UserScreen /> },
+      { path: 'chats/:pubkey', element: <ChatScreen /> },
       { path: 'channel/:id', element: <ChannelScreen /> },
     ],
   },

src/app/chats/components/item.tsx

@@ -22,7 +22,7 @@ export function ChatsListItem({ data }: { data: any }) {
 
   return (
     <NavLink
-      to={`/app/chat/${data.sender_pubkey}`}
+      to={`/app/chats/${data.sender_pubkey}`}
       preventScrollReset={true}
       className={({ isActive }) =>
         twMerge(

src/app/chats/components/list.tsx

@@ -1,8 +1,8 @@
 import { useQuery } from '@tanstack/react-query';
 
-import { ChatsListItem } from '@app/chat/components/item';
-import { NewMessageModal } from '@app/chat/components/modal';
-import { ChatsListSelfItem } from '@app/chat/components/self';
+import { ChatsListItem } from '@app/chats/components/item';
+import { NewMessageModal } from '@app/chats/components/modal';
+import { ChatsListSelfItem } from '@app/chats/components/self';
 
 import { getChats } from '@libs/storage';
 

src/app/chats/components/messages/item.tsx

@@ -1,4 +1,4 @@
-import { useDecryptMessage } from '@app/chat/hooks/useDecryptMessage';
+import { useDecryptMessage } from '@app/chats/hooks/useDecryptMessage';
 
 import { MentionNote } from '@shared/notes/mentions/note';
 import { ImagePreview } from '@shared/notes/preview/image';

src/app/chats/components/modal.tsx

@@ -13,7 +13,7 @@ export function NewMessageModal() {
   const [isOpen, setIsOpen] = useState(false);
 
   const { status, account } = useAccount();
-  const follows = account ? JSON.parse(account.follows) : [];
+  const follows = account ? JSON.parse(account.follows as string) : [];
 
   const closeModal = () => {
     setIsOpen(false);
@@ -25,7 +25,7 @@ export function NewMessageModal() {
 
   const openChat = (pubkey: string) => {
     closeModal();
-    navigate(`/app/chat/${pubkey}`);
+    navigate(`/app/chats/${pubkey}`);
   };
 
   return (

src/app/chats/components/self.tsx

@@ -8,7 +8,7 @@ import { DEFAULT_AVATAR } from '@stores/constants';
 import { useProfile } from '@utils/hooks/useProfile';
 import { shortenKey } from '@utils/shortenKey';
 
-export function ChatsListSelfItem({ data }: { data: any }) {
+export function ChatsListSelfItem({ data }: { data: { pubkey: string } }) {
   const { status, user } = useProfile(data.pubkey);
 
   if (status === 'loading') {
@@ -24,7 +24,7 @@ export function ChatsListSelfItem({ data }: { data: any }) {
 
   return (
     <NavLink
-      to={`/app/chat/${data.pubkey}`}
+      to={`/app/chats/${data.pubkey}`}
       preventScrollReset={true}
       className={({ isActive }) =>
         twMerge(

src/app/chats/components/sidebar.tsx

@@ -33,7 +33,7 @@ export function ChatSidebar({ pubkey }: { pubkey: string }) {
           <div>
             <p className="leading-tight">{user?.bio || user?.about}</p>
             <Link
-              to={`/app/user/${pubkey}`}
+              to={`/app/users/${pubkey}`}
               className="mt-3 inline-flex h-10 w-full items-center justify-center rounded-md bg-zinc-900 text-sm font-medium text-zinc-300 hover:bg-zinc-800 hover:text-zinc-100"
             >
               View full profile

src/app/chats/index.tsx

@@ -4,9 +4,9 @@ import { useCallback, useEffect, useRef } from 'react';
 import { useParams } from 'react-router-dom';
 import { Virtuoso } from 'react-virtuoso';
 
-import { ChatMessageForm } from '@app/chat/components/messages/form';
-import { ChatMessageItem } from '@app/chat/components/messages/item';
-import { ChatSidebar } from '@app/chat/components/sidebar';
+import { ChatMessageForm } from '@app/chats/components/messages/form';
+import { ChatMessageItem } from '@app/chats/components/messages/item';
+import { ChatSidebar } from '@app/chats/components/sidebar';
 
 import { useNDK } from '@libs/ndk/provider';
 import { createChat, getChatMessages } from '@libs/storage';

src/app/user/index.tsx

@@ -1,147 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Link, useParams } from 'react-router-dom';
-
-import { UserFeed } from '@app/user/components/feed';
-import { UserMetadata } from '@app/user/components/metadata';
-
-import { EditProfileModal } from '@shared/editProfileModal';
-import { ZapIcon } from '@shared/icons';
-import { Image } from '@shared/image';
-
-import { DEFAULT_AVATAR } from '@stores/constants';
-
-import { useAccount } from '@utils/hooks/useAccount';
-import { useProfile } from '@utils/hooks/useProfile';
-import { useSocial } from '@utils/hooks/useSocial';
-import { shortenKey } from '@utils/shortenKey';
-
-export function UserScreen() {
-  const { pubkey } = useParams();
-  const { user } = useProfile(pubkey);
-  const { account } = useAccount();
-  const { status, userFollows, follow, unfollow } = useSocial();
-
-  const [followed, setFollowed] = useState(false);
-
-  const followUser = (pubkey: string) => {
-    try {
-      follow(pubkey);
-
-      // update state
-      setFollowed(true);
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  const unfollowUser = (pubkey: string) => {
-    try {
-      unfollow(pubkey);
-
-      // update state
-      setFollowed(false);
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  useEffect(() => {
-    if (status === 'success' && userFollows) {
-      if (userFollows.includes(pubkey)) {
-        setFollowed(true);
-      }
-    }
-  }, [status]);
-
-  return (
-    <div className="h-full w-full overflow-y-auto">
-      <div
-        data-tauri-drag-region
-        className="flex h-11 w-full items-center border-b border-zinc-900 px-3"
-      />
-      <div className="h-56 w-full bg-zinc-100">
-        <Image
-          src={user?.banner}
-          fallback="https://void.cat/d/QY1myro5tkHVs2nY7dy74b.jpg"
-          alt={'banner'}
-          className="h-full w-full object-cover"
-        />
-      </div>
-      <div className="-mt-7 w-full">
-        <div className="px-5">
-          <Image
-            src={user?.picture || user?.image}
-            fallback={DEFAULT_AVATAR}
-            alt={pubkey}
-            className="h-14 w-14 rounded-md ring-2 ring-black"
-          />
-          <div className="mt-2 flex flex-1 flex-col gap-4">
-            <div className="flex items-center gap-16">
-              <div className="inline-flex flex-col gap-1.5">
-                <h5 className="text-lg font-semibold leading-none">
-                  {user?.displayName || user?.name || 'No name'}
-                </h5>
-                <span className="max-w-[15rem] truncate text-sm leading-none text-zinc-500">
-                  {user?.nip05 || shortenKey(pubkey)}
-                </span>
-              </div>
-              <div className="inline-flex items-center gap-2">
-                {status === 'loading' ? (
-                  <button
-                    type="button"
-                    className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                  >
-                    Loading...
-                  </button>
-                ) : followed ? (
-                  <button
-                    type="button"
-                    onClick={() => unfollowUser(pubkey)}
-                    className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                  >
-                    Unfollow
-                  </button>
-                ) : (
-                  <button
-                    type="button"
-                    onClick={() => followUser(pubkey)}
-                    className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                  >
-                    Follow
-                  </button>
-                )}
-                <Link
-                  to={`/app/chat/${pubkey}`}
-                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                >
-                  Message
-                </Link>
-                <button
-                  type="button"
-                  className="group inline-flex h-10 w-10 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-orange-500"
-                >
-                  <ZapIcon className="h-5 w-5" />
-                </button>
-                <span className="mx-2 inline-flex h-4 w-px bg-zinc-900" />
-                {account && account.pubkey === pubkey && <EditProfileModal />}
-              </div>
-            </div>
-            <div className="flex flex-col gap-8">
-              <p className="mt-2 max-w-[500px] select-text break-words text-zinc-100">
-                {user?.about}
-              </p>
-              <UserMetadata pubkey={pubkey} />
-            </div>
-          </div>
-        </div>
-        <div className="mt-8 w-full border-t border-zinc-900">
-          <div className="flex flex-col justify-start gap-0.5 text-start">
-            <p className="text-sm font-medium leading-none text-zinc-200">Latest posts</p>
-            <span className="text-sm leading-none text-zinc-500">48 hours ago</span>
-          </div>
-          <UserFeed pubkey={pubkey} />
-        </div>
-      </div>
-    </div>
-  );
-}

src/app/users/components/profile.tsx

@@ -0,0 +1,125 @@
+import { useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
+
+import { UserMetadata } from '@app/users/components/metadata';
+
+import { EditProfileModal } from '@shared/editProfileModal';
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR } from '@stores/constants';
+
+import { useAccount } from '@utils/hooks/useAccount';
+import { useProfile } from '@utils/hooks/useProfile';
+import { useSocial } from '@utils/hooks/useSocial';
+import { shortenKey } from '@utils/shortenKey';
+
+export function UserProfile({ pubkey }: { pubkey: string }) {
+  const { user } = useProfile(pubkey);
+  const { account } = useAccount();
+  const { status, userFollows, follow, unfollow } = useSocial();
+
+  const [followed, setFollowed] = useState(false);
+
+  const followUser = (pubkey: string) => {
+    try {
+      follow(pubkey);
+
+      // update state
+      setFollowed(true);
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const unfollowUser = (pubkey: string) => {
+    try {
+      unfollow(pubkey);
+
+      // update state
+      setFollowed(false);
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  useEffect(() => {
+    if (status === 'success' && userFollows) {
+      if (userFollows.includes(pubkey)) {
+        setFollowed(true);
+      }
+    }
+  }, [status]);
+
+  return (
+    <>
+      <div className="h-56 w-full bg-zinc-100">
+        <Image
+          src={user?.banner}
+          fallback="https://void.cat/d/QY1myro5tkHVs2nY7dy74b.jpg"
+          alt={'banner'}
+          className="h-full w-full object-cover"
+        />
+      </div>
+      <div className="-mt-7 w-full px-5">
+        <Image
+          src={user?.picture || user?.image}
+          fallback={DEFAULT_AVATAR}
+          alt={pubkey}
+          className="h-14 w-14 rounded-md ring-2 ring-black"
+        />
+        <div className="mt-2 flex flex-1 flex-col gap-4">
+          <div className="flex items-center gap-16">
+            <div className="inline-flex flex-col gap-1.5">
+              <h5 className="text-lg font-semibold leading-none">
+                {user?.displayName || user?.name || 'No name'}
+              </h5>
+              <span className="max-w-[15rem] truncate text-sm leading-none text-zinc-500">
+                {user?.nip05 || shortenKey(pubkey)}
+              </span>
+            </div>
+            <div className="inline-flex items-center gap-2">
+              {status === 'loading' ? (
+                <button
+                  type="button"
+                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+                >
+                  Loading...
+                </button>
+              ) : followed ? (
+                <button
+                  type="button"
+                  onClick={() => unfollowUser(pubkey)}
+                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+                >
+                  Unfollow
+                </button>
+              ) : (
+                <button
+                  type="button"
+                  onClick={() => followUser(pubkey)}
+                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+                >
+                  Follow
+                </button>
+              )}
+              <Link
+                to={`/app/chats/${pubkey}`}
+                className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+              >
+                Message
+              </Link>
+              <span className="mx-2 inline-flex h-4 w-px bg-zinc-900" />
+              {account && account.pubkey === pubkey && <EditProfileModal />}
+            </div>
+          </div>
+          <div className="flex flex-col gap-8">
+            <p className="mt-2 max-w-[500px] select-text break-words text-zinc-100">
+              {user?.about || user?.bio}
+            </p>
+            <UserMetadata pubkey={pubkey} />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+}

src/app/users/index.tsx

@@ -0,0 +1,98 @@
+import { useQuery } from '@tanstack/react-query';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { useRef } from 'react';
+import { useParams } from 'react-router-dom';
+
+import { useNDK } from '@libs/ndk/provider';
+
+import { NoteKind_1, NoteSkeleton } from '@shared/notes';
+
+import { nHoursAgo } from '@utils/date';
+import { LumeEvent } from '@utils/types';
+
+import { UserProfile } from './components/profile';
+
+export function UserScreen() {
+  const parentRef = useRef();
+
+  const { pubkey } = useParams();
+  const { fetcher, relayUrls } = useNDK();
+  const { status, data } = useQuery(['user-feed', pubkey], async () => {
+    const events = await fetcher.fetchAllEvents(
+      relayUrls,
+      { kinds: [1], authors: [pubkey] },
+      { since: nHoursAgo(48) },
+      { sort: true }
+    );
+    return events as unknown as LumeEvent[];
+  });
+
+  const rowVirtualizer = useVirtualizer({
+    count: data ? data.length : 0,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 400,
+  });
+
+  const itemsVirtualizer = rowVirtualizer.getVirtualItems();
+
+  return (
+    <div ref={parentRef} className="scrollbar-hide h-full w-full overflow-y-auto">
+      <div
+        data-tauri-drag-region
+        className="flex h-11 w-full items-center border-b border-zinc-900 px-3"
+      />
+      <UserProfile pubkey={pubkey} />
+      <div className="mt-8 h-full w-full border-t border-zinc-900">
+        <div className="flex flex-col justify-start gap-1 px-3 pt-4 text-start">
+          <p className="text-lg font-semibold leading-none text-zinc-200">Latest posts</p>
+          <span className="text-sm leading-none text-zinc-500">48 hours ago</span>
+        </div>
+        <div className="flex h-full max-w-[400px] flex-col justify-between gap-1.5 pb-4 pt-1.5">
+          {status === 'loading' ? (
+            <div className="px-3 py-1.5">
+              <div className="shadow-input rounded-md bg-zinc-900 px-3 py-3 shadow-black/20">
+                <NoteSkeleton />
+              </div>
+            </div>
+          ) : itemsVirtualizer.length === 0 ? (
+            <div className="px-3 py-1.5">
+              <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-6">
+                <div className="flex flex-col items-center gap-4">
+                  <p className="text-center text-sm text-zinc-300">
+                    No new posts about this hashtag in 48 hours ago
+                  </p>
+                </div>
+              </div>
+            </div>
+          ) : (
+            <div
+              className="relative w-full"
+              style={{
+                height: `${rowVirtualizer.getTotalSize()}px`,
+              }}
+            >
+              <div
+                className="absolute left-0 top-0 w-full"
+                style={{
+                  transform: `translateY(${
+                    itemsVirtualizer[0].start - rowVirtualizer.options.scrollMargin
+                  }px)`,
+                }}
+              >
+                {itemsVirtualizer.map((virtualRow) => (
+                  <div
+                    key={virtualRow.key}
+                    data-index={virtualRow.index}
+                    ref={rowVirtualizer.measureElement}
+                  >
+                    <NoteKind_1 event={data[virtualRow.index]} />
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}

src/shared/accounts/active.tsx

@@ -92,7 +92,7 @@ export function ActiveAccount({ data }: { data: any }) {
   }
 
   return (
-    <Link to={`/app/user/${data.pubkey}`} className="relative inline-block h-9 w-9">
+    <Link to={`/app/users/${data.pubkey}`} className="relative inline-block h-9 w-9">
       <Image
         src={user?.picture || user?.image}
         fallback={DEFAULT_AVATAR}

src/shared/navigation.tsx

@@ -2,7 +2,7 @@ import { Disclosure } from '@headlessui/react';
 import { NavLink } from 'react-router-dom';
 import { twMerge } from 'tailwind-merge';
 
-import { ChatsList } from '@app/chat/components/list';
+import { ChatsList } from '@app/chats/components/list';
 
 import { AppHeader } from '@shared/appHeader';
 import { ComposerModal } from '@shared/composer/modal';

src/shared/user.tsx

@@ -128,13 +128,13 @@ export function User({
             </div>
             <div className="flex items-center gap-2 px-3 py-3">
               <Link
-                to={`/app/user/${pubkey}`}
+                to={`/app/users/${pubkey}`}
                 className="inline-flex h-10 flex-1 items-center justify-center rounded-md bg-zinc-700 text-sm font-medium hover:bg-fuchsia-500"
               >
                 View profile
               </Link>
               <Link
-                to={`/app/chat/${pubkey}`}
+                to={`/app/chats/${pubkey}`}
                 className="inline-flex h-10 flex-1 items-center justify-center rounded-md bg-zinc-700 text-sm font-medium hover:bg-fuchsia-500"
               >
                 Message

src/shared/userProfile.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 
-import { UserMetadata } from '@app/user/components/metadata';
+import { UserMetadata } from '@app/users/components/metadata';
 
 import { ZapIcon } from '@shared/icons';
 import { Image } from '@shared/image';
@@ -97,7 +97,7 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
             </button>
           )}
           <Link
-            to={`/app/chat/${pubkey}`}
+            to={`/app/chats/${pubkey}`}
             className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
           >
             Message