diff --git a/src/apps/feed/index.tsx b/src/apps/feed/index.tsx index dc25322..bfca4ed 100644 --- a/src/apps/feed/index.tsx +++ b/src/apps/feed/index.tsx @@ -11,6 +11,7 @@ import { Skeleton } from '@/components/ui/skeleton'; import { useCurrentUser } from '@/hooks/useCurrentUser'; import { useMyFollows } from '@/hooks/useFollows'; import { cn } from '@/lib/utils'; +import { isReply } from '@/lib/nostrUtils'; import type { AppProps } from '@/os/types'; type Scope = 'following' | 'global'; @@ -20,9 +21,17 @@ const PAGE_SIZE = 50; /** * A kind 1 event is only worth rendering if it has something to render. Relays * happily return blanks and oddities, so the feed validates before it draws. + * Replies (NIP-10 `e` tags) are excluded too: without their parent for + * context they read as indistinguishable, orphaned root posts — open the + * thread from the Note app instead. */ function isRenderableNote(event: NostrEvent): boolean { - return event.kind === 1 && typeof event.content === 'string' && event.content.trim().length > 0; + return ( + event.kind === 1 && + typeof event.content === 'string' && + event.content.trim().length > 0 && + !isReply(event) + ); } function useFeed(scope: Scope, authors: string[] | undefined) { diff --git a/src/apps/profile/index.tsx b/src/apps/profile/index.tsx index ba9f76f..651aa7a 100644 --- a/src/apps/profile/index.tsx +++ b/src/apps/profile/index.tsx @@ -14,9 +14,14 @@ import { useCurrentUser } from '@/hooks/useCurrentUser'; import { useMyFollows } from '@/hooks/useFollows'; import { useNostrPublish } from '@/hooks/useNostrPublish'; import { useToast } from '@/hooks/useToast'; -import { decodeRelayHints, displayName, npubOf, sanitizeUrl } from '@/lib/nostrUtils'; +import { decodeRelayHints, displayName, isReply, npubOf, sanitizeUrl } from '@/lib/nostrUtils'; import type { AppProps } from '@/os/types'; +/** + * Replies are excluded here for the same reason as the Feed: without their + * parent for context, a reply on a profile's timeline reads as an orphaned + * root post rather than what it is. + */ function useAuthorNotes(pubkey: string | undefined, relays: string[] | undefined) { const { nostr } = useNostr(); @@ -29,7 +34,7 @@ function useAuthorNotes(pubkey: string | undefined, relays: string[] | undefined { signal: AbortSignal.any([signal, AbortSignal.timeout(6000)]), relays }, ); return events - .filter((event) => event.content.trim().length > 0) + .filter((event) => event.content.trim().length > 0 && !isReply(event)) .sort((a, b) => b.created_at - a.created_at); }, staleTime: 60_000, diff --git a/src/lib/nostrUtils.test.ts b/src/lib/nostrUtils.test.ts new file mode 100644 index 0000000..e90a105 --- /dev/null +++ b/src/lib/nostrUtils.test.ts @@ -0,0 +1,78 @@ +import { describe, expect, it } from 'vitest'; +import type { NostrEvent } from '@nostrify/nostrify'; +import { isReply, rootReference } from './nostrUtils'; + +function note(tags: string[][]): NostrEvent { + return { + id: 'x', + pubkey: 'y', + created_at: 0, + kind: 1, + tags, + content: 'hello', + sig: '', + }; +} + +describe('isReply', () => { + it('is false for a root note with no e tag', () => { + expect(isReply(note([]))).toBe(false); + }); + + it('is true for a note with a marked root e tag', () => { + expect(isReply(note([['e', 'root-id', '', 'root']]))).toBe(true); + }); + + it('is true for a note using the deprecated positional e tag', () => { + expect(isReply(note([['e', 'parent-id']]))).toBe(true); + }); + + it('is false for a note that only mentions another event', () => { + expect(isReply(note([['e', 'mentioned-id', '', 'mention']]))).toBe(false); + }); + + it('is true for a note with a mention alongside a marked reply', () => { + expect( + isReply( + note([ + ['e', 'root-id', '', 'root'], + ['e', 'mentioned-id', '', 'mention'], + ]), + ), + ).toBe(true); + }); +}); + +describe('rootReference', () => { + it('prefers the marked root tag over positional ones', () => { + const event = note([ + ['e', 'mention-id', '', 'mention'], + ['e', 'root-id', '', 'root'], + ]); + expect(rootReference(event)).toBe('root-id'); + }); + + it('falls back to the first positional e tag per the deprecated scheme', () => { + const event = note([ + ['e', 'root-id'], + ['e', 'reply-id'], + ]); + expect(rootReference(event)).toBe('root-id'); + }); + + it('is undefined for a root note', () => { + expect(rootReference(note([]))).toBeUndefined(); + }); + + it('is undefined for a note that only mentions another event', () => { + expect(rootReference(note([['e', 'mentioned-id', '', 'mention']]))).toBeUndefined(); + }); + + it('ignores a mention when falling back to the positional scheme', () => { + const event = note([ + ['e', 'mentioned-id', '', 'mention'], + ['e', 'root-id'], + ]); + expect(rootReference(event)).toBe('root-id'); + }); +}); diff --git a/src/lib/nostrUtils.ts b/src/lib/nostrUtils.ts index 7b1247d..76de0a9 100644 --- a/src/lib/nostrUtils.ts +++ b/src/lib/nostrUtils.ts @@ -93,15 +93,25 @@ export function tagValues(event: NostrEvent, name: string): string[] { /** * The event a reply points at, following NIP-10: prefer an explicit `root` - * marker, fall back to the last positional `e` tag. + * marker, fall back to the first *unmarked* `e` tag (the deprecated scheme + * puts the root id first: `["e", ], ["e", ]`). A `mention` + * or `reply`-only marker is never treated as the root — a mention isn't + * part of the thread, and a lone `reply` marker without `root` is malformed + * per NIP-10 rather than an implicit root. */ export function rootReference(event: NostrEvent): string | undefined { const marked = event.tags.find(([name, , , marker]) => name === 'e' && marker === 'root'); if (marked) return marked[1]; - const positional = event.tags.filter(([name]) => name === 'e'); + const positional = event.tags.filter(([name, , , marker]) => name === 'e' && !marker); return positional[0]?.[1]; } +/** + * True for a reply per NIP-10: a marked `root`/`reply` `e` tag, or an + * unmarked one (the deprecated positional scheme). An `e` tag marked + * `mention` alone does not make an event a reply — it cites another event + * without being part of its thread. + */ export function isReply(event: NostrEvent): boolean { - return event.tags.some(([name]) => name === 'e'); + return event.tags.some(([name, , , marker]) => name === 'e' && marker !== 'mention'); }