-
-
+
);
}
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
- Open thread
-
-
-
-
-
+
+ {data.replies > 0 ? (
+ <>
+
+
+
+
+ {data.users?.map((user, index) => (
+
+ ))}
+
+
+
+
+
·
+
+
+ {compactNumber.format(data.zap)}
+ {' '}
+ zaps
+
+
+
+
+ ) : (
+
+ )}
+
);
}
diff --git a/src/shared/notes/note.tsx b/src/shared/notes/note.tsx
deleted file mode 100644
index 8cdd5dfe..00000000
--- a/src/shared/notes/note.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { useMemo } from 'react';
-
-import { Kind1 } from '@shared/notes/contents/kind1';
-import { Kind1063 } from '@shared/notes/contents/kind1063';
-import { NoteMetadata } from '@shared/notes/metadata';
-import { NoteParent } from '@shared/notes/parent';
-import { Repost } from '@shared/notes/repost';
-import { User } from '@shared/user';
-
-import { parser } from '@utils/parser';
-import { LumeEvent } from '@utils/types';
-
-interface Note {
- event: LumeEvent;
- skipMetadata?: boolean;
-}
-
-export function Note({ event, skipMetadata = false }: Note) {
- const isRepost = event.kind === 6;
-
- const renderParent = useMemo(() => {
- if (!isRepost && event.parent_id && event.parent_id !== event.event_id) {
- return
;
- } else {
- return null;
- }
- }, [event.parent_id]);
-
- const renderRepost = useMemo(() => {
- if (isRepost) {
- return
;
- } else {
- return null;
- }
- }, [event.kind]);
-
- const renderContent = useMemo(() => {
- switch (event.kind) {
- case 1: {
- const content = parser(event);
- return
;
- }
- case 6:
- return null;
- case 1063:
- return
;
- default:
- return (
-
-
-
- Kind: {event.kind}
-
-
- Lume isn't fully support this kind in newsfeed
-
-
-
-
- );
- }
- }, [event.kind]);
-
- return (
-
-
- {renderParent}
-
-
-
- {renderContent}
- {!isRepost && !skipMetadata ? (
-
- ) : (
-
- )}
-
-
- {renderRepost}
-
-
- );
-}
diff --git a/src/shared/notes/parent.tsx b/src/shared/notes/parent.tsx
deleted file mode 100644
index ac9eb95b..00000000
--- a/src/shared/notes/parent.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Kind1 } from '@shared/notes/contents/kind1';
-import { Kind1063 } from '@shared/notes/contents/kind1063';
-import { NoteMetadata } from '@shared/notes/metadata';
-import { NoteSkeleton } from '@shared/notes/skeleton';
-import { User } from '@shared/user';
-
-import { useEvent } from '@utils/hooks/useEvent';
-
-export function NoteParent({ id }: { id: string }) {
- const { status, data } = useEvent(id);
-
- return (
-
-
- {status === 'loading' ? (
-
- ) : status === 'success' ? (
- <>
-
-
- {data.kind === 1 &&
}
- {data.kind === 1063 &&
}
- {data.kind !== 1 && data.kind !== 1063 && (
-
-
-
- Kind: {data.kind}
-
-
- Lume isn't fully support this kind in newsfeed
-
-
-
-
{data.content || data.toString()}
-
-
- )}
-
-
-
- ) : (
-
Failed to fetch event
- )}
-
- );
-}
diff --git a/src/shared/notes/replies/item.tsx b/src/shared/notes/replies/item.tsx
index 22d12af3..c6718bd8 100644
--- a/src/shared/notes/replies/item.tsx
+++ b/src/shared/notes/replies/item.tsx
@@ -1,4 +1,3 @@
-import { Kind1 } from '@shared/notes/contents/kind1';
import { NoteMetadata } from '@shared/notes/metadata';
import { User } from '@shared/user';
@@ -12,7 +11,6 @@ export function Reply({ data }: { data: any }) {
diff --git a/src/shared/notes/repost.tsx b/src/shared/notes/repost.tsx
deleted file mode 100644
index 7e0a685e..00000000
--- a/src/shared/notes/repost.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Kind1 } from '@shared/notes/contents/kind1';
-import { Kind1063 } from '@shared/notes/contents/kind1063';
-import { NoteMetadata } from '@shared/notes/metadata';
-import { NoteSkeleton } from '@shared/notes/skeleton';
-import { User } from '@shared/user';
-
-import { useEvent } from '@utils/hooks/useEvent';
-import { getRepostID } from '@utils/transform';
-import { LumeEvent } from '@utils/types';
-
-export function Repost({ event }: { event: LumeEvent }) {
- const repostID = getRepostID(event.tags);
- const { status, data } = useEvent(repostID);
-
- return (
-
-
- {status === 'loading' ? (
-
- ) : status === 'success' ? (
- <>
-
-
- {data.kind === 1 &&
}
- {data.kind === 1063 &&
}
- {data.kind !== 1 && data.kind !== 1063 && (
-
-
-
- Kind: {data.kind}
-
-
- Lume isn't fully support this kind in newsfeed
-
-
-
-
{data.content || data.toString()}
-
-
- )}
-
-
-
- ) : (
-
Failed to fetch event
- )}
-
- );
-}
diff --git a/src/shared/notes/users/mini.tsx b/src/shared/notes/users/mini.tsx
new file mode 100644
index 00000000..ad3860f4
--- /dev/null
+++ b/src/shared/notes/users/mini.tsx
@@ -0,0 +1,22 @@
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR } from '@stores/constants';
+
+import { useProfile } from '@utils/hooks/useProfile';
+
+export function MiniUser({ pubkey }: { pubkey: string }) {
+ const { status, user } = useProfile(pubkey);
+
+ if (status === 'loading') {
+ return
;
+ }
+
+ return (
+
+ );
+}
diff --git a/src/shared/notes/users/repost.tsx b/src/shared/notes/users/repost.tsx
new file mode 100644
index 00000000..d0dd220d
--- /dev/null
+++ b/src/shared/notes/users/repost.tsx
@@ -0,0 +1,34 @@
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR } from '@stores/constants';
+
+import { useProfile } from '@utils/hooks/useProfile';
+import { shortenKey } from '@utils/shortenKey';
+
+export function RepostUser({ pubkey }: { pubkey: string }) {
+ const { status, user } = useProfile(pubkey);
+
+ if (status === 'loading') {
+ return
;
+ }
+
+ return (
+
+
+
+
+ {user?.nip05?.toLowerCase() ||
+ user?.name ||
+ user?.display_name ||
+ shortenKey(pubkey)}
+
+ reposted
+
+
+ );
+}
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index cd76290c..1ca52c5a 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -14,13 +14,13 @@ export function User({
pubkey,
time,
size,
- repost,
+ isRepost = false,
isChat = false,
}: {
pubkey: string;
time: number;
size?: string;
- repost?: boolean;
+ isRepost?: boolean;
isChat?: boolean;
}) {
const { status, user } = useProfile(pubkey);
@@ -50,9 +50,7 @@ export function User({
return (
-
+
- {user?.nip05 || user?.name || user?.displayName || shortenKey(pubkey)}
+ {user?.nip05?.toLowerCase() ||
+ user?.name ||
+ user?.display_name ||
+ shortenKey(pubkey)}
- {repost && (
- reposted
- )}
- ·
{createdAt}
{
const result = await getNoteByID(id);
if (result) {
- if (result.kind === 1 || result.kind === 1063) {
+ if (result.kind === 1) {
result['content'] = parser(result);
}
return result;
} else {
+ if (fallback) {
+ const embed = JSON.parse(fallback);
+ await createNote(
+ embed.id,
+ embed.pubkey,
+ embed.kind,
+ embed.tags,
+ embed.content,
+ embed.created_at
+ );
+ }
const event = await ndk.fetchEvent(id);
await createNote(
event.id,
@@ -27,7 +38,7 @@ export function useEvent(id: string) {
event.created_at
);
event['event_id'] = event.id;
- if (event.kind === 1 || event.kind === 1063) {
+ if (event.kind === 1) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
event['content'] = parser(event);
diff --git a/src/utils/hooks/useProfile.tsx b/src/utils/hooks/useProfile.tsx
index 8ecce2b0..4b1363f6 100644
--- a/src/utils/hooks/useProfile.tsx
+++ b/src/utils/hooks/useProfile.tsx
@@ -24,9 +24,6 @@ export function useProfile(pubkey: string, fallback?: string) {
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 {
diff --git a/src/utils/parser.tsx b/src/utils/parser.tsx
index 54a46621..e3c7b5d4 100644
--- a/src/utils/parser.tsx
+++ b/src/utils/parser.tsx
@@ -1,4 +1,3 @@
-import destr from 'destr';
import getUrls from 'get-urls';
import { Event, parseReferences } from 'nostr-tools';
import { ReactNode } from 'react';
@@ -9,20 +8,7 @@ import { MentionUser } from '@shared/notes/mentions/user';
import { LumeEvent } from '@utils/types';
-function isJsonString(str: string[][] | string) {
- try {
- if (typeof str === 'string') JSON.parse(str);
- } catch (e) {
- return false;
- }
- return true;
-}
-
export function parser(event: LumeEvent) {
- if (isJsonString(event.tags)) {
- event['tags'] = destr(event.tags);
- }
-
const references = parseReferences(event as Event);
const urls = getUrls(event.content);