diff --git a/src/app/space/components/add.tsx b/src/app/space/components/add.tsx
deleted file mode 100644
index 557e3628..00000000
--- a/src/app/space/components/add.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AddFeedBlock } from '@app/space/components/addFeed';
-import { AddHashTagBlock } from '@app/space/components/addHashtag';
-import { AddImageBlock } from '@app/space/components/addImage';
-
-export function AddBlock() {
- return (
-
- );
-}
diff --git a/src/app/space/components/addFeed.tsx b/src/app/space/components/addFeed.tsx
deleted file mode 100644
index 33720a93..00000000
--- a/src/app/space/components/addFeed.tsx
+++ /dev/null
@@ -1,252 +0,0 @@
-import { Dialog, Transition } from '@headlessui/react';
-import { Combobox } from '@headlessui/react';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { nip19 } from 'nostr-tools';
-import { Fragment, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { useHotkeys } from 'react-hotkeys-hook';
-
-import { User } from '@app/auth/components/user';
-
-import { createBlock } from '@libs/storage';
-
-import { CancelIcon, CheckCircleIcon, CommandIcon, LoaderIcon } from '@shared/icons';
-
-import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
-import { ADD_FEEDBLOCK_SHORTCUT } from '@stores/shortcuts';
-
-import { useAccount } from '@utils/hooks/useAccount';
-
-export function AddFeedBlock() {
- const queryClient = useQueryClient();
-
- const [loading, setLoading] = useState(false);
- const [isOpen, setIsOpen] = useState(false);
- const [selected, setSelected] = useState([]);
- const [query, setQuery] = useState('');
-
- const { status, account } = useAccount();
-
- const openModal = () => {
- setIsOpen(true);
- };
-
- const closeModal = () => {
- setIsOpen(false);
- };
-
- useHotkeys(ADD_FEEDBLOCK_SHORTCUT, () => openModal());
-
- const block = useMutation({
- mutationFn: (data: { kind: number; title: string; content: string }) => {
- return createBlock(data.kind, data.title, data.content);
- },
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ['blocks'] });
- },
- });
-
- const {
- register,
- handleSubmit,
- reset,
- formState: { isDirty, isValid },
- } = useForm();
-
- const onSubmit = (data: { kind: number; title: string; content: string }) => {
- setLoading(true);
-
- selected.forEach((item, index) => {
- if (item.substring(0, 4) === 'npub') {
- selected[index] = nip19.decode(item).data;
- }
- });
-
- // insert to database
- block.mutate({
- kind: BLOCK_KINDS.feed,
- title: data.title,
- content: JSON.stringify(selected),
- });
-
- setLoading(false);
- // reset form
- reset();
- // close modal
- closeModal();
- };
-
- return (
- <>
-
-
-
-
-
- );
-}
diff --git a/src/app/space/components/addHashtag.tsx b/src/app/space/components/addHashtag.tsx
deleted file mode 100644
index 59119fe2..00000000
--- a/src/app/space/components/addHashtag.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-import { Dialog, Transition } from '@headlessui/react';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { Fragment, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { useHotkeys } from 'react-hotkeys-hook';
-
-import { createBlock } from '@libs/storage';
-
-import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
-
-import { BLOCK_KINDS } from '@stores/constants';
-import { ADD_HASHTAGBLOCK_SHORTCUT } from '@stores/shortcuts';
-
-export function AddHashTagBlock() {
- const queryClient = useQueryClient();
-
- const [loading, setLoading] = useState(false);
- const [isOpen, setIsOpen] = useState(false);
-
- const openModal = () => {
- setIsOpen(true);
- };
-
- const closeModal = () => {
- setIsOpen(false);
- };
-
- useHotkeys(ADD_HASHTAGBLOCK_SHORTCUT, () => openModal());
-
- const {
- register,
- handleSubmit,
- reset,
- formState: { isDirty, isValid },
- } = useForm();
-
- const block = useMutation({
- mutationFn: (data: { kind: number; title: string; content: string }) => {
- return createBlock(data.kind, data.title, data.content);
- },
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ['blocks'] });
- },
- });
-
- const onSubmit = async (data: { hashtag: string }) => {
- setLoading(true);
-
- // mutate
- block.mutate({
- kind: BLOCK_KINDS.hashtag,
- title: data.hashtag,
- content: data.hashtag.replace('#', ''),
- });
-
- setLoading(false);
- // reset form
- reset();
- // close modal
- closeModal();
- };
-
- return (
- <>
-
-
-
-
-
- );
-}
diff --git a/src/app/space/components/addImage.tsx b/src/app/space/components/addImage.tsx
deleted file mode 100644
index 35eb61ba..00000000
--- a/src/app/space/components/addImage.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import { Dialog, Transition } from '@headlessui/react';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { Fragment, useEffect, useRef, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { useHotkeys } from 'react-hotkeys-hook';
-
-import { createBlock } from '@libs/storage';
-
-import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
-import { Image } from '@shared/image';
-
-import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
-import { ADD_IMAGEBLOCK_SHORTCUT } from '@stores/shortcuts';
-
-import { usePublish } from '@utils/hooks/usePublish';
-import { useImageUploader } from '@utils/hooks/useUploader';
-
-export function AddImageBlock() {
- const queryClient = useQueryClient();
- const upload = useImageUploader();
-
- const { publish } = usePublish();
-
- const [loading, setLoading] = useState(false);
- const [isOpen, setIsOpen] = useState(false);
- const [image, setImage] = useState('');
-
- const tags = useRef(null);
-
- const openModal = () => {
- setIsOpen(true);
- };
-
- const closeModal = () => {
- setIsOpen(false);
- };
-
- useHotkeys(ADD_IMAGEBLOCK_SHORTCUT, () => openModal());
-
- const {
- register,
- handleSubmit,
- reset,
- setValue,
- formState: { isDirty, isValid },
- } = useForm();
-
- const block = useMutation({
- mutationFn: (data: { kind: number; title: string; content: string }) => {
- return createBlock(data.kind, data.title, data.content);
- },
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ['blocks'] });
- },
- });
-
- const uploadImage = async () => {
- const image = await upload(null);
- if (image.url) {
- setImage(image.url);
- }
- };
-
- const onSubmit = async (data: { kind: number; title: string; content: string }) => {
- setLoading(true);
-
- // publish file metedata
- await publish({ content: data.title, kind: 1063, tags: tags.current });
-
- // mutate
- block.mutate({ kind: BLOCK_KINDS.image, title: data.title, content: data.content });
-
- setLoading(false);
- // reset form
- reset();
- // close modal
- closeModal();
- };
-
- useEffect(() => {
- setValue('content', image);
- }, [setValue, image]);
-
- return (
- <>
-
-
-
-
-
- );
-}
diff --git a/src/app/space/components/blocks/feed.tsx b/src/app/space/components/blocks/feed.tsx
index 3b3f10ad..aaedb74e 100644
--- a/src/app/space/components/blocks/feed.tsx
+++ b/src/app/space/components/blocks/feed.tsx
@@ -121,15 +121,15 @@ export function FeedBlock({ params }: { params: Block }) {
{status === 'loading' ? (
-
) : itemsVirtualizer.length === 0 ? (
-
+
-
+
Not found any posts from last 48 hours
diff --git a/src/app/space/components/blocks/following.tsx b/src/app/space/components/blocks/following.tsx
index b8fa409a..2a95988e 100644
--- a/src/app/space/components/blocks/following.tsx
+++ b/src/app/space/components/blocks/following.tsx
@@ -133,15 +133,15 @@ export function FollowingBlock() {
{status === 'loading' ? (
-
) : itemsVirtualizer.length === 0 ? (
-
+
-
+
You not have any posts to see yet
Follow more people to have more fun.
diff --git a/src/app/space/components/blocks/hashtag.tsx b/src/app/space/components/blocks/hashtag.tsx
index dd8c9751..62f2308b 100644
--- a/src/app/space/components/blocks/hashtag.tsx
+++ b/src/app/space/components/blocks/hashtag.tsx
@@ -39,15 +39,15 @@ export function HashtagBlock({ params }: { params: Block }) {
{status === 'loading' ? (
-
) : itemsVirtualizer.length === 0 ? (
-
+
-
+
No new posts about this hashtag in 48 hours ago
diff --git a/src/app/space/components/modals/feed.tsx b/src/app/space/components/modals/feed.tsx
new file mode 100644
index 00000000..4da36727
--- /dev/null
+++ b/src/app/space/components/modals/feed.tsx
@@ -0,0 +1,212 @@
+import { Combobox } from '@headlessui/react';
+import * as Dialog from '@radix-ui/react-dialog';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { nip19 } from 'nostr-tools';
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { useHotkeys } from 'react-hotkeys-hook';
+
+import { User } from '@app/auth/components/user';
+
+import { createBlock } from '@libs/storage';
+
+import { CancelIcon, CheckCircleIcon, CommandIcon, LoaderIcon } from '@shared/icons';
+
+import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
+import { ADD_FEEDBLOCK_SHORTCUT } from '@stores/shortcuts';
+
+import { useAccount } from '@utils/hooks/useAccount';
+
+export function FeedModal() {
+ const queryClient = useQueryClient();
+
+ const [open, setOpen] = useState(false);
+ const [loading, setLoading] = useState(false);
+ const [selected, setSelected] = useState([]);
+ const [query, setQuery] = useState('');
+
+ const { status, account } = useAccount();
+
+ useHotkeys(ADD_FEEDBLOCK_SHORTCUT, () => setOpen(true));
+
+ const block = useMutation({
+ mutationFn: (data: { kind: number; title: string; content: string }) => {
+ return createBlock(data.kind, data.title, data.content);
+ },
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['blocks'] });
+ },
+ });
+
+ const {
+ register,
+ handleSubmit,
+ reset,
+ formState: { isDirty, isValid },
+ } = useForm();
+
+ const onSubmit = (data: { kind: number; title: string; content: string }) => {
+ setLoading(true);
+
+ selected.forEach((item, index) => {
+ if (item.substring(0, 4) === 'npub') {
+ selected[index] = nip19.decode(item).data;
+ }
+ });
+
+ // insert to database
+ block.mutate({
+ kind: BLOCK_KINDS.feed,
+ title: data.title,
+ content: JSON.stringify(selected),
+ });
+
+ setLoading(false);
+ // reset form
+ reset();
+ // close modal
+ setOpen(false);
+ };
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ Create feed block
+
+
+
+
+
+
+ Specific newsfeed space for people you want to keep up to date
+
+
+
+
+
+ );
+}
diff --git a/src/app/space/components/modals/hashtag.tsx b/src/app/space/components/modals/hashtag.tsx
new file mode 100644
index 00000000..98e45e61
--- /dev/null
+++ b/src/app/space/components/modals/hashtag.tsx
@@ -0,0 +1,132 @@
+import * as Dialog from '@radix-ui/react-dialog';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { useHotkeys } from 'react-hotkeys-hook';
+
+import { createBlock } from '@libs/storage';
+
+import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
+
+import { BLOCK_KINDS } from '@stores/constants';
+import { ADD_HASHTAGBLOCK_SHORTCUT } from '@stores/shortcuts';
+
+export function HashtagModal() {
+ const queryClient = useQueryClient();
+
+ const [loading, setLoading] = useState(false);
+ const [open, setOpen] = useState(false);
+
+ useHotkeys(ADD_HASHTAGBLOCK_SHORTCUT, () => setOpen(false));
+
+ const {
+ register,
+ handleSubmit,
+ reset,
+ formState: { isDirty, isValid },
+ } = useForm();
+
+ const block = useMutation({
+ mutationFn: (data: { kind: number; title: string; content: string }) => {
+ return createBlock(data.kind, data.title, data.content);
+ },
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['blocks'] });
+ },
+ });
+
+ const onSubmit = async (data: { hashtag: string }) => {
+ setLoading(true);
+
+ // mutate
+ block.mutate({
+ kind: BLOCK_KINDS.hashtag,
+ title: data.hashtag,
+ content: data.hashtag.replace('#', ''),
+ });
+
+ setLoading(false);
+ // reset form
+ reset();
+ // close modal
+ setOpen(false);
+ };
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ Create hashtag block
+
+
+
+
+
+
+ Pin the hashtag you want to keep follow up
+
+
+
+
+
+ );
+}
diff --git a/src/app/space/components/modals/image.tsx b/src/app/space/components/modals/image.tsx
new file mode 100644
index 00000000..06a8dc99
--- /dev/null
+++ b/src/app/space/components/modals/image.tsx
@@ -0,0 +1,184 @@
+import * as Dialog from '@radix-ui/react-dialog';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useEffect, useRef, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { useHotkeys } from 'react-hotkeys-hook';
+
+import { createBlock } from '@libs/storage';
+
+import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
+import { Image } from '@shared/image';
+
+import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
+import { ADD_IMAGEBLOCK_SHORTCUT } from '@stores/shortcuts';
+
+import { usePublish } from '@utils/hooks/usePublish';
+import { useImageUploader } from '@utils/hooks/useUploader';
+
+export function ImageModal() {
+ const queryClient = useQueryClient();
+ const upload = useImageUploader();
+
+ const { publish } = usePublish();
+
+ const [open, setOpen] = useState(false);
+ const [loading, setLoading] = useState(false);
+ const [image, setImage] = useState('');
+
+ const tags = useRef(null);
+
+ useHotkeys(ADD_IMAGEBLOCK_SHORTCUT, () => setOpen(false));
+
+ const {
+ register,
+ handleSubmit,
+ reset,
+ setValue,
+ formState: { isDirty, isValid },
+ } = useForm();
+
+ const block = useMutation({
+ mutationFn: (data: { kind: number; title: string; content: string }) => {
+ return createBlock(data.kind, data.title, data.content);
+ },
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['blocks'] });
+ },
+ });
+
+ const uploadImage = async () => {
+ const image = await upload(null);
+ if (image.url) {
+ setImage(image.url);
+ }
+ };
+
+ const onSubmit = async (data: { kind: number; title: string; content: string }) => {
+ setLoading(true);
+
+ // publish file metedata
+ await publish({ content: data.title, kind: 1063, tags: tags.current });
+
+ // mutate
+ block.mutate({ kind: BLOCK_KINDS.image, title: data.title, content: data.content });
+
+ setLoading(false);
+ // reset form
+ reset();
+ // close modal
+ setOpen(false);
+ };
+
+ useEffect(() => {
+ setValue('content', image);
+ }, [setValue, image]);
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ Create image block
+
+
+
+
+
+
+ Pin your favorite image to Space then you can view every time that you
+ use Lume, your image will be broadcast to Nostr Relay as well
+
+
+
+
+
+ );
+}
diff --git a/src/app/space/index.tsx b/src/app/space/index.tsx
index 7c38de10..625c4535 100644
--- a/src/app/space/index.tsx
+++ b/src/app/space/index.tsx
@@ -1,13 +1,15 @@
import { useQuery } from '@tanstack/react-query';
import { useCallback } from 'react';
-import { AddBlock } from '@app/space/components/add';
import { FeedBlock } from '@app/space/components/blocks/feed';
import { FollowingBlock } from '@app/space/components/blocks/following';
import { HashtagBlock } from '@app/space/components/blocks/hashtag';
import { ImageBlock } from '@app/space/components/blocks/image';
import { ThreadBlock } from '@app/space/components/blocks/thread';
import { UserBlock } from '@app/space/components/blocks/user';
+import { FeedModal } from '@app/space/components/modals/feed';
+import { HashtagModal } from '@app/space/components/modals/hashtag';
+import { ImageModal } from '@app/space/components/modals/image';
import { getBlocks } from '@libs/storage';
@@ -76,13 +78,15 @@ export function SpaceScreen() {
className="group flex h-11 w-full items-center justify-between overflow-hidden px-3"
/>
-
+
)}
-
diff --git a/src/app/users/components/profile.tsx b/src/app/users/components/profile.tsx
index 916ce9b2..42a58a3b 100644
--- a/src/app/users/components/profile.tsx
+++ b/src/app/users/components/profile.tsx
@@ -113,7 +113,7 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
-
+
{user?.about || user?.bio}
diff --git a/src/shared/avatarUploader.tsx b/src/shared/avatarUploader.tsx
index f77e5c90..2ed03595 100644
--- a/src/shared/avatarUploader.tsx
+++ b/src/shared/avatarUploader.tsx
@@ -26,9 +26,9 @@ export function AvatarUploader({ setPicture }: { setPicture: any }) {
className="inline-flex h-full w-full items-center justify-center bg-zinc-900/40"
>
{loading ? (
-
+
) : (
-
+
)}
);
diff --git a/src/shared/bannerUploader.tsx b/src/shared/bannerUploader.tsx
index 57644ec0..59b32256 100644
--- a/src/shared/bannerUploader.tsx
+++ b/src/shared/bannerUploader.tsx
@@ -26,9 +26,9 @@ export function BannerUploader({ setBanner }: { setBanner: any }) {
className="inline-flex h-full w-full items-center justify-center bg-zinc-900/40"
>
{loading ? (
-
+
) : (
-
+
)}
);
diff --git a/src/shared/button.tsx b/src/shared/button.tsx
index cd54f6a3..9843aedc 100644
--- a/src/shared/button.tsx
+++ b/src/shared/button.tsx
@@ -20,15 +20,15 @@ export function Button({
break;
case 'publish':
preClass =
- 'w-min h-9 px-4 bg-fuchsia-500 rounded-md text-sm font-medium text-zinc-100 hover:bg-fuchsia-600';
+ 'w-min h-9 px-4 bg-fuchsia-500 rounded-md text-sm font-medium text-white hover:bg-fuchsia-600';
break;
case 'large':
preClass =
- 'h-11 w-full bg-fuchsia-500 rounded-md font-medium text-zinc-100 hover:bg-fuchsia-600';
+ 'h-11 w-full bg-fuchsia-500 rounded-md font-medium text-white hover:bg-fuchsia-600';
break;
case 'large-alt':
preClass =
- 'h-11 w-full bg-zinc-800 rounded-md font-medium text-zinc-300 border-t border-zinc-700/50 hover:bg-zinc-900';
+ 'h-11 w-full bg-zinc-800 rounded-md font-medium text-white border-t border-zinc-700/50 hover:bg-zinc-900';
break;
default:
break;
diff --git a/src/shared/composer/mention/item.tsx b/src/shared/composer/mention/item.tsx
index adea39fc..a97a52a3 100644
--- a/src/shared/composer/mention/item.tsx
+++ b/src/shared/composer/mention/item.tsx
@@ -17,12 +17,12 @@ export function MentionItem({ profile }: { profile: Profile }) {
/>
-
+
{profile.ident || (
)}
-
+
{displayNpub(profile.pubkey, 16)}
diff --git a/src/shared/editProfileModal.tsx b/src/shared/editProfileModal.tsx
index 633b3733..9f738850 100644
--- a/src/shared/editProfileModal.tsx
+++ b/src/shared/editProfileModal.tsx
@@ -178,7 +178,7 @@ export function EditProfileModal() {
Edit profile
@@ -197,13 +197,13 @@ export function EditProfileModal() {
type={'hidden'}
{...register('picture')}
value={picture}
- className="shadow-input relative h-10 w-full rounded-lg border border-black/5 px-3 py-2 shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-100 dark:shadow-black/10 dark:placeholder:text-zinc-500"
+ className="shadow-input relative h-10 w-full rounded-lg border border-black/5 px-3 py-2 shadow-black/5 !outline-none placeholder:text-white/50 dark:bg-zinc-800 dark:text-white dark:shadow-black/10 dark:placeholder:text-zinc-500"
/>
@@ -235,7 +235,7 @@ export function EditProfileModal() {
@@ -246,13 +246,13 @@ export function EditProfileModal() {
minLength: 4,
})}
spellCheck={false}
- className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
+ className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-white !outline-none placeholder:text-zinc-500"
/>
@@ -263,7 +263,7 @@ export function EditProfileModal() {
minLength: 4,
})}
spellCheck={false}
- className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
+ className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-white !outline-none placeholder:text-zinc-500"
/>
{nip05.verified ? (
@@ -288,20 +288,20 @@ export function EditProfileModal() {
@@ -309,13 +309,13 @@ export function EditProfileModal() {
type={'text'}
{...register('website', { required: false })}
spellCheck={false}
- className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
+ className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-white !outline-none placeholder:text-zinc-500"
/>
@@ -323,17 +323,17 @@ export function EditProfileModal() {
type={'text'}
{...register('lud16', { required: false })}
spellCheck={false}
- className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
+ className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-white !outline-none placeholder:text-zinc-500"
/>
Upload media
diff --git a/src/shared/notes/actions/zap.tsx b/src/shared/notes/actions/zap.tsx
index 8a0cc708..512bed6e 100644
--- a/src/shared/notes/actions/zap.tsx
+++ b/src/shared/notes/actions/zap.tsx
@@ -43,10 +43,10 @@ export function NoteZap({ id }: { id: string }) {
-
+
Zap (Beta)
-
+
Send tip with Bitcoin via Lightning
@@ -178,10 +178,10 @@ export function NoteZap({ id }: { id: string }) {
-
+
Scan to pay
-
+
You must use Bitcoin wallet which support Lightning
such as: Blue Wallet, Bitkit, Phoenix,...
diff --git a/src/shared/notes/kinds/repost.tsx b/src/shared/notes/kinds/repost.tsx
index c3017643..0a27c115 100644
--- a/src/shared/notes/kinds/repost.tsx
+++ b/src/shared/notes/kinds/repost.tsx
@@ -26,7 +26,7 @@ export function Repost({ event }: { event: LumeEvent }) {
if (status === 'error') {
return (
-
Failed to fetch
+
Failed to fetch
-
Failed to fetch
+
Failed to fetch
+
{event.content.toString()}
👋
-
Share your thought on it...
+
Share your thought on it...
diff --git a/src/shared/notes/stats.tsx b/src/shared/notes/stats.tsx
index beb103ac..ea7f4e42 100644
--- a/src/shared/notes/stats.tsx
+++ b/src/shared/notes/stats.tsx
@@ -54,7 +54,7 @@ export function NoteStats({ id }: { id: string }) {
if (status === 'loading') {
return (
-
+
);
}
diff --git a/src/shared/notes/users/repost.tsx b/src/shared/notes/users/repost.tsx
index d0dd220d..144d672c 100644
--- a/src/shared/notes/users/repost.tsx
+++ b/src/shared/notes/users/repost.tsx
@@ -21,13 +21,13 @@ export function RepostUser({ pubkey }: { pubkey: string }) {
className="relative z-20 inline-block h-6 w-6 rounded bg-white ring-1 ring-zinc-800"
/>
-
+
{user?.nip05?.toLowerCase() ||
user?.name ||
user?.display_name ||
shortenKey(pubkey)}
- reposted
+ reposted
);
diff --git a/src/shared/notification/modal.tsx b/src/shared/notification/modal.tsx
index 2d4eb319..e9eb7504 100644
--- a/src/shared/notification/modal.tsx
+++ b/src/shared/notification/modal.tsx
@@ -63,7 +63,7 @@ export function NotificationModal({ pubkey }: { pubkey: string }) {
-
+
Notification
@@ -75,7 +75,7 @@ export function NotificationModal({ pubkey }: { pubkey: string }) {
-
+
All things happen when you rest in 24 hours ago
@@ -83,7 +83,7 @@ export function NotificationModal({ pubkey }: { pubkey: string }) {
{status === 'loading' ? (
-
+
) : data.length < 1 ? (
diff --git a/src/shared/notification/types/mention.tsx b/src/shared/notification/types/mention.tsx
index 7f730e97..03e6bb3b 100644
--- a/src/shared/notification/types/mention.tsx
+++ b/src/shared/notification/types/mention.tsx
@@ -17,7 +17,7 @@ export function NotiMention({ event }: { event: NDKEvent }) {
-
reply your post
+
reply your post
{createdAt}
diff --git a/src/shared/notification/types/reaction.tsx b/src/shared/notification/types/reaction.tsx
index 26b962e2..2d589988 100644
--- a/src/shared/notification/types/reaction.tsx
+++ b/src/shared/notification/types/reaction.tsx
@@ -14,7 +14,7 @@ export function NotiReaction({ event }: { event: NDKEvent }) {
-
reacted {event.content}
+
reacted {event.content}
{createdAt}
diff --git a/src/shared/notification/types/repost.tsx b/src/shared/notification/types/repost.tsx
index 22a20063..4c6e9f3f 100644
--- a/src/shared/notification/types/repost.tsx
+++ b/src/shared/notification/types/repost.tsx
@@ -14,7 +14,7 @@ export function NotiRepost({ event }: { event: NDKEvent }) {
-
repost your post
+
repost your post
{createdAt}
diff --git a/src/shared/protected.tsx b/src/shared/protected.tsx
index 947814e8..b52a4e26 100644
--- a/src/shared/protected.tsx
+++ b/src/shared/protected.tsx
@@ -14,7 +14,7 @@ export function Protected({ children }: { children: ReactNode }) {
if (status === 'loading') {
return (
-
+
);
}
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 98da8f94..698e6084 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -75,10 +75,7 @@ export function User({
+ ·
{createdAt}
diff --git a/src/utils/hooks/useProfile.tsx b/src/utils/hooks/useProfile.tsx
index b2126ad5..e18f4a31 100644
--- a/src/utils/hooks/useProfile.tsx
+++ b/src/utils/hooks/useProfile.tsx
@@ -2,7 +2,7 @@ import { NDKFilter } from '@nostr-dev-kit/ndk';
import { useQuery } from '@tanstack/react-query';
import { useNDK } from '@libs/ndk/provider';
-import { createMetadata, getUserMetadata } from '@libs/storage';
+import { createMetadata } from '@libs/storage';
export function useProfile(pubkey: string, fallback?: string) {
const { ndk } = useNDK();
@@ -15,20 +15,14 @@ export function useProfile(pubkey: string, fallback?: string) {
['user', pubkey],
async () => {
if (!fallback) {
- const current = Math.floor(Date.now() / 1000);
- const cache = await getUserMetadata(pubkey);
- if (cache && parseInt(cache.created_at) + 86400 >= current) {
- return JSON.parse(cache.content);
+ const filter: NDKFilter = { kinds: [0], authors: [pubkey] };
+ const events = await ndk.fetchEvents(filter);
+ const latest = [...events].sort((a, b) => b.created_at - a.created_at).pop();
+ if (latest) {
+ await createMetadata(latest.id, latest.pubkey, latest.content);
+ return JSON.parse(latest.content);
} else {
- const filter: NDKFilter = { kinds: [0], authors: [pubkey] };
- const events = await ndk.fetchEvents(filter);
- const latest = [...events].sort((a, b) => b.created_at - a.created_at).pop();
- if (latest) {
- await createMetadata(latest.id, latest.pubkey, latest.content);
- return JSON.parse(latest.content);
- } else {
- throw new Error('User not found');
- }
+ throw new Error('User not found');
}
} else {
const profile = JSON.parse(fallback);