Loading...
-
-
- {userStats.stats[pubkey].followers_pubkey_count ?? 0}
-
-
- Followers
+
+
+
+
+ {user?.displayName || user?.name || "No name"}
+
+
+ {user?.nip05 || shortenKey(pubkey)}
-
-
- {userStats.stats[pubkey].pub_following_pubkey_count ?? 0}
-
-
- Following
-
-
-
-
- {userStats.stats[pubkey].zaps_received
- ? compactNumber.format(
- userStats.stats[pubkey].zaps_received.msats / 1000,
- )
- : 0}
-
-
- Zaps received
-
-
-
-
- {userStats.stats[pubkey].zaps_sent
- ? compactNumber.format(
- userStats.stats[pubkey].zaps_sent.msats / 1000,
- )
- : 0}
-
-
- Zaps sent
-
+
+ {status === "loading" ? (
+
+ ) : followed ? (
+
+ ) : (
+
+ )}
+
+ Message
+
+
- )}
-
- {followsStatus === "loading" ? (
-
- ) : followed ? (
-
- ) : (
-
- )}
-
- Message
-
+
+
+
+
+
+ {({ selected }) => (
+
+ )}
+
+
+
+
+
+
+
+
+
);
diff --git a/src/libs/storage.tsx b/src/libs/storage.tsx
index ab49ab39..2d18fd25 100644
--- a/src/libs/storage.tsx
+++ b/src/libs/storage.tsx
@@ -157,26 +157,13 @@ export async function getNotes(time: number, limit: number, offset: number) {
}
// get all notes by pubkey
-export async function getNotesByPubkey(
- pubkey: string,
- time: number,
- limit: number,
- offset: number,
-) {
+export async function getNotesByPubkey(pubkey: string) {
const db = await connect();
- const totalNotes = await countTotalNotes();
- const nextCursor = offset + limit;
-
- const notes: any = { data: null, nextCursor: 0 };
- const query: any = await db.select(
- `SELECT * FROM notes WHERE created_at <= "${time}" AND pubkey == "${pubkey}" AND kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC LIMIT "${limit}" OFFSET "${offset}";`,
+ const res: any = await db.select(
+ `SELECT * FROM notes WHERE pubkey == "${pubkey}" AND kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC;`,
);
- notes["data"] = query;
- notes["nextCursor"] =
- Math.round(totalNotes / nextCursor) > 1 ? nextCursor : undefined;
-
- return notes;
+ return res;
}
// get all notes by authors
diff --git a/src/main.tsx b/src/main.tsx
index c4849826..1ec94619 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,7 +1,6 @@
import App from "./app";
import { RelayProvider } from "@shared/relayProvider";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import { createRoot } from "react-dom/client";
const queryClient = new QueryClient({
@@ -20,6 +19,5 @@ root.render(
-
,
);
diff --git a/src/shared/composer/types/post.tsx b/src/shared/composer/types/post.tsx
index f15b81d5..039ef952 100644
--- a/src/shared/composer/types/post.tsx
+++ b/src/shared/composer/types/post.tsx
@@ -61,15 +61,16 @@ const ImagePreview = ({
export function Post() {
const publish = usePublish();
- const [repost, toggle] = useComposer((state) => [
- state.repost,
- state.toggleModal,
- ]);
const editor = useMemo(
() => withReact(withImages(withHistory(createEditor()))),
[],
);
+ const [repost, reply, toggle] = useComposer((state) => [
+ state.repost,
+ state.reply,
+ state.toggleModal,
+ ]);
const [content, setContent] = useState
([
{
children: [
@@ -84,6 +85,18 @@ export function Post() {
return nodes.map((n) => Node.string(n)).join("\n");
}, []);
+ const getRef = () => {
+ if (repost.id) {
+ return repost.id;
+ } else if (reply.id) {
+ return reply.id;
+ } else {
+ return null;
+ }
+ };
+
+ const refID = getRef();
+
const submit = () => {
let tags: string[][] = [];
let kind: number;
@@ -94,6 +107,20 @@ export function Post() {
["e", repost.id, FULL_RELAYS[0], "root"],
["p", repost.pubkey],
];
+ } else if (reply.id && reply.pubkey) {
+ kind = 1;
+ if (reply.root && reply.root !== reply.id) {
+ tags = [
+ ["e", reply.id, FULL_RELAYS[0], "root"],
+ ["e", reply.root, FULL_RELAYS[0], "reply"],
+ ["p", reply.pubkey],
+ ];
+ } else {
+ tags = [
+ ["e", reply.id, FULL_RELAYS[0], "root"],
+ ["p", reply.pubkey],
+ ];
+ }
} else {
kind = 1;
tags = [];
@@ -130,14 +157,14 @@ export function Post() {
- {repost.id && }
+ {refID && }
diff --git a/src/shared/notes/contents/kind1.tsx b/src/shared/notes/contents/kind1.tsx
index 881d03fc..ab9a1abe 100644
--- a/src/shared/notes/contents/kind1.tsx
+++ b/src/shared/notes/contents/kind1.tsx
@@ -2,11 +2,22 @@ import { MentionNote } from "@shared/notes/mentions/note";
import { ImagePreview } from "@shared/notes/preview/image";
import { LinkPreview } from "@shared/notes/preview/link";
import { VideoPreview } from "@shared/notes/preview/video";
+import { ReactNode } from "react";
export function Kind1({
content,
truncate = false,
-}: { content: any; truncate?: boolean }) {
+}: {
+ content: {
+ original: string;
+ parsed: ReactNode[];
+ notes: string[];
+ images: string[];
+ videos: string[];
+ links: string[];
+ };
+ truncate?: boolean;
+}) {
return (
<>
{content.parsed}
- {Array.isArray(content.images) && content.images.length ? (
+ {content.images.length > 0 && (
- ) : (
- <>
)}
- {Array.isArray(content.videos) && content.videos.length ? (
-
- ) : (
- <>
- )}
- {Array.isArray(content.links) && content.links.length ? (
-
- ) : (
- <>
- )}
- {Array.isArray(content.notes) && content.notes.length ? (
+ {content.videos.length > 0 &&
}
+ {content.links.length > 0 &&
}
+ {content.notes.length > 0 &&
content.notes.map((note: string) => (
- ))
- ) : (
- <>
- )}
+ ))}
);
}
diff --git a/src/shared/notes/mentions/note.tsx b/src/shared/notes/mentions/note.tsx
index 82e1ce50..32d177a7 100644
--- a/src/shared/notes/mentions/note.tsx
+++ b/src/shared/notes/mentions/note.tsx
@@ -8,12 +8,8 @@ import { useEvent } from "@utils/hooks/useEvent";
import { memo } from "react";
export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
- const { status, data } = useEvent(id);
-
- const kind1 = data?.kind === 1 ? data.content : null;
- const kind1063 = data?.kind === 1063 ? data.tags : null;
-
const queryClient = useQueryClient();
+ const { status, data } = useEvent(id);
const block = useMutation({
mutationFn: (data: any) => {
@@ -37,17 +33,19 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
openThread(e, id)}
onKeyDown={(e) => openThread(e, id)}
- className="mt-3 rounded-lg bg-zinc-800 border-t border-zinc-700/50 px-3 py-3"
+ className="mt-3 rounded-lg bg-zinc-800/50 border-t border-zinc-700/50 px-3 py-3"
>
{status === "loading" ? (
- ) : (
+ ) : status === "success" ? (
<>
- {kind1 &&
}
- {kind1063 &&
}
- {!kind1 && !kind1063 && (
+ {data.kind === 1 && (
+
+ )}
+ {data.kind === 1063 &&
}
+ {data.kind !== 1 && data.kind !== 1063 && (
@@ -64,6 +62,8 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
)}
+ ) : (
+
Failed to fetch event
)}
);
diff --git a/src/shared/notes/metadata.tsx b/src/shared/notes/metadata.tsx
index 6a7c73ba..a6af71cd 100644
--- a/src/shared/notes/metadata.tsx
+++ b/src/shared/notes/metadata.tsx
@@ -11,12 +11,12 @@ import { useContext } from "react";
export function NoteMetadata({
id,
+ rootID,
eventPubkey,
- currentBlock,
}: {
id: string;
+ rootID?: string;
eventPubkey: string;
- currentBlock?: number;
}) {
const ndk = useContext(RelayContext);
const { status, data } = useQuery(["note-metadata", id], async () => {
@@ -112,8 +112,9 @@ export function NoteMetadata({
<>
diff --git a/src/shared/notes/metadata/reply.tsx b/src/shared/notes/metadata/reply.tsx
index 3df2437d..3445e804 100644
--- a/src/shared/notes/metadata/reply.tsx
+++ b/src/shared/notes/metadata/reply.tsx
@@ -1,36 +1,19 @@
-import { createBlock } from "@libs/storage";
import { ReplyIcon } from "@shared/icons";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useComposer } from "@stores/composer";
import { compactNumber } from "@utils/number";
export function NoteReply({
id,
+ rootID,
+ pubkey,
replies,
-}: { id: string; replies: number; currentBlock?: number }) {
- const queryClient = useQueryClient();
-
- const block = useMutation({
- mutationFn: (data: any) => {
- return createBlock(data.kind, data.title, data.content);
- },
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ["blocks"] });
- },
- });
-
- const openThread = (event: any, thread: string) => {
- const selection = window.getSelection();
- if (selection.toString().length === 0) {
- block.mutate({ kind: 2, title: "Thread", content: thread });
- } else {
- event.stopPropagation();
- }
- };
+}: { id: string; rootID?: string; pubkey: string; replies: number }) {
+ const setReply = useComposer((state) => state.setReply);
return (