diff --git a/src/app/channel/components/messages/user.tsx b/src/app/channel/components/messages/user.tsx index 3ed19362..46754437 100644 --- a/src/app/channel/components/messages/user.tsx +++ b/src/app/channel/components/messages/user.tsx @@ -29,7 +29,7 @@ export function ChannelMessageUser({ ) : ( <> -
+
{pubkey}
- + {user?.nip05 || user?.name || shortenKey(pubkey)} · diff --git a/src/app/channel/components/messages/userReply.tsx b/src/app/channel/components/messages/userReply.tsx index 99d77bbb..51e6e6c0 100644 --- a/src/app/channel/components/messages/userReply.tsx +++ b/src/app/channel/components/messages/userReply.tsx @@ -22,7 +22,7 @@ export function UserReply({ pubkey }: { pubkey: string }) { className="h-9 w-9 rounded object-cover" />
- + Replying to {user?.name || shortenKey(pubkey)} diff --git a/src/app/note/components/replies/form.tsx b/src/app/note/components/replies/form.tsx index 589a01fe..2940efcb 100644 --- a/src/app/note/components/replies/form.tsx +++ b/src/app/note/components/replies/form.tsx @@ -3,6 +3,7 @@ import { RelayContext } from "@shared/relayProvider"; import { useActiveAccount } from "@stores/accounts"; import { WRITEONLY_RELAYS } from "@stores/constants"; import { dateToUnix } from "@utils/date"; +import { useProfile } from "@utils/hooks/useProfile"; import { getEventHash, getSignature } from "nostr-tools"; import { useContext, useState } from "react"; @@ -10,6 +11,7 @@ export function NoteReplyForm({ id }: { id: string }) { const pool: any = useContext(RelayContext); const account = useActiveAccount((state: any) => state.account); + const { user } = useProfile(account.pubkey); const [value, setValue] = useState(""); const submitEvent = () => { @@ -32,12 +34,12 @@ export function NoteReplyForm({ id }: { id: string }) { }; return ( -
+
{account?.pubkey}
diff --git a/src/app/note/components/replies/item.tsx b/src/app/note/components/replies/item.tsx index c9bdd517..af1b86a6 100644 --- a/src/app/note/components/replies/item.tsx +++ b/src/app/note/components/replies/item.tsx @@ -1,4 +1,5 @@ import { Kind1 } from "@app/note/components/kind1"; +import { NoteMetadata } from "@app/note/components/metadata"; import { NoteReplyUser } from "@app/note/components/user/reply"; import { noteParser } from "@utils/parser"; @@ -6,11 +7,12 @@ export function Reply({ data }: { data: any }) { const content = noteParser(data); return ( -
+
+
diff --git a/src/app/note/components/replies/list.tsx b/src/app/note/components/replies/list.tsx index 0d756c9d..99adcc55 100644 --- a/src/app/note/components/replies/list.tsx +++ b/src/app/note/components/replies/list.tsx @@ -17,8 +17,7 @@ export function RepliesList({ id }: { id: string }) { [ { "#e": [key], - since: 0, - kinds: [1, 1063], + kinds: [1], limit: 20, }, ], @@ -39,26 +38,24 @@ export function RepliesList({ id }: { id: string }) {
Replies
-
-
- - {error &&
failed to load
} - {!data ? ( -
-
-
-
-
-
-
+
+ + {error &&
failed to load
} + {!data ? ( +
+
+
+
+
+
- ) : ( - sortEvents(data).map((event: any) => { - return ; - }) - )} -
+
+ ) : ( + sortEvents(data).map((event: any) => { + return ; + }) + )}
); diff --git a/src/app/note/components/user/quote.tsx b/src/app/note/components/user/quote.tsx index 867ce64f..bd3bc47c 100644 --- a/src/app/note/components/user/quote.tsx +++ b/src/app/note/components/user/quote.tsx @@ -27,7 +27,7 @@ export function NoteQuoteUser({
- + {user?.nip05 || user?.name || shortenKey(pubkey)} · diff --git a/src/app/note/components/user/reply.tsx b/src/app/note/components/user/reply.tsx index cf9f9069..ce5b5d2d 100644 --- a/src/app/note/components/user/reply.tsx +++ b/src/app/note/components/user/reply.tsx @@ -27,7 +27,7 @@ export function NoteReplyUser({
- + {user?.nip05 || user?.name || shortenKey(pubkey)} · diff --git a/src/shared/accounts/active.tsx b/src/shared/accounts/active.tsx index ab02835f..b49dd120 100644 --- a/src/shared/accounts/active.tsx +++ b/src/shared/accounts/active.tsx @@ -17,7 +17,7 @@ export function ActiveAccount({ data }: { data: any }) { const notChatPage = pathnames.includes("/chat") ? false : true; const notChannelPage = pathnames.includes("/channel") ? false : true; - const notSpacePage = pathnames.includes("/space") ? false : true; + // const notSpacePage = pathnames.includes("/space") ? false : true; const lastLogin = useActiveAccount((state: any) => state.lastLogin); const notifyChat = useChats((state: any) => state.add); diff --git a/src/shared/composer/types/post.tsx b/src/shared/composer/types/post.tsx index 4e16977d..1a0ae46b 100644 --- a/src/shared/composer/types/post.tsx +++ b/src/shared/composer/types/post.tsx @@ -116,7 +116,7 @@ export function Post({ pubkey, privkey }: { pubkey: string; privkey: string }) {
-
+
b.id === id, ); - if (target) { - state.blocks.splice(target, 1); - } + state.blocks.splice(target, 1); }); }, updateFollows: (list: any) => {