{t('{{number}} votes', { number: pollResults?.totalVotes ?? 0 })}
diff --git a/src/components/Note/UnknownNote.tsx b/src/components/Note/UnknownNote.tsx
index 6dcd123b..1db089eb 100644
--- a/src/components/Note/UnknownNote.tsx
+++ b/src/components/Note/UnknownNote.tsx
@@ -11,16 +11,132 @@ import EventViewer from './EventViewer'
import { Button } from '@/components/ui/button'
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
import { ChevronDown, ChevronRight } from 'lucide-react'
+import { Badge } from '@/components/ui/badge'
+import PubkeyCopy from '@/components/PubkeyCopy'
+import UserAvatar from '@/components/UserAvatar'
+import Username from '@/components/Username'
+import { hexPubkeysEqual, isValidPubkey, userIdToPubkey } from '@/lib/pubkey'
const CONTENT_PREVIEW_MAX = 800
+/** Tag names we render in structured sections (hidden from the flat tag list). */
+const ELEVATED_TAG_NAMES = new Set([
+ 'title',
+ 't',
+ 'summary',
+ 'description',
+ 'image',
+ 'thumb',
+ 'banner',
+ 'content',
+ 'kind',
+ 'pubkey'
+])
+
function truncatePreview(text: string, max: number): string {
const t = text.trim()
if (t.length <= max) return t
return `${t.slice(0, max).trimEnd()}…`
}
-export default function UnknownNote({ event, className }: { event: Event; className?: string }) {
+function normText(s: string): string {
+ return s.trim().replace(/\s+/g, ' ')
+}
+
+function joinTagRest(tag: string[]): string {
+ return tag.slice(1).join(' ').trim()
+}
+
+function isHttpUrl(s: string): boolean {
+ return /^https?:\/\//i.test(s.trim())
+}
+
+type ElevatedTags = {
+ title?: string
+ topics: string[]
+ summary?: string
+ description?: string
+ imageUrls: string[]
+ tagContent?: string
+ declaredKind?: string
+ taggedPubkey?: string
+}
+
+function extractElevatedTags(tags: string[][]): ElevatedTags {
+ let title: string | undefined
+ const topics: string[] = []
+ const summaryParts: string[] = []
+ const descriptionParts: string[] = []
+ const imageUrls: string[] = []
+ const contentParts: string[] = []
+ let declaredKind: string | undefined
+ let taggedPubkey: string | undefined
+
+ for (const tag of tags) {
+ const name = tag[0]
+ const rest = tag.slice(1)
+ if (name === 't') {
+ const v = rest[0]?.trim()
+ if (v) topics.push(v)
+ continue
+ }
+ if (name === 'title' && rest.length) {
+ const j = joinTagRest(tag)
+ if (j) title = title ? `${title} ${j}` : j
+ continue
+ }
+ if (name === 'summary' && rest.length) {
+ summaryParts.push(joinTagRest(tag))
+ continue
+ }
+ if (name === 'description' && rest.length) {
+ descriptionParts.push(joinTagRest(tag))
+ continue
+ }
+ if ((name === 'image' || name === 'thumb' || name === 'banner') && rest.length) {
+ const u = rest[0].trim()
+ if (isHttpUrl(u) && !imageUrls.includes(u)) imageUrls.push(u)
+ continue
+ }
+ if (name === 'content' && rest.length) {
+ const j = joinTagRest(tag)
+ if (j) contentParts.push(j)
+ continue
+ }
+ if (name === 'kind' && rest.length && !declaredKind) {
+ declaredKind = joinTagRest(tag)
+ continue
+ }
+ if (name === 'pubkey' && rest.length && !taggedPubkey) {
+ const raw = rest[0].trim()
+ const pk = userIdToPubkey(raw)
+ if (isValidPubkey(pk)) taggedPubkey = pk.toLowerCase()
+ continue
+ }
+ }
+
+ return {
+ title,
+ topics,
+ summary: summaryParts.length ? summaryParts.join('\n') : undefined,
+ description: descriptionParts.length ? descriptionParts.join('\n') : undefined,
+ imageUrls,
+ tagContent: contentParts.length ? contentParts.join('\n') : undefined,
+ declaredKind,
+ taggedPubkey
+ }
+}
+
+export default function UnknownNote({
+ event,
+ className,
+ showAuthorSummary
+}: {
+ event: Event
+ className?: string
+ /** When the parent does not render an author header (e.g. embedded unsupported notes). */
+ showAuthorSummary?: boolean
+}) {
const { t } = useTranslation()
const [technicalOpen, setTechnicalOpen] = useState(false)
const bookMetadata = useMemo(() => extractBookMetadata(event), [event])
@@ -44,6 +160,44 @@ export default function UnknownNote({ event, className }: { event: Event; classN
const kindLabel = getKindDescription(event.kind)
const contentRaw = event.content?.trim() ?? ''
+ const elevated = useMemo(() => extractElevatedTags(event.tags), [event.tags])
+ const remainderTags = useMemo(
+ () => event.tags.filter(tag => tag[0] && !ELEVATED_TAG_NAMES.has(tag[0])),
+ [event.tags]
+ )
+
+ const headline = elevated.title?.trim() || kindLabel.description
+ const showKindAsSubtitle = !!elevated.title?.trim()
+
+ const contentNorm = contentRaw ? normText(contentRaw) : ''
+ const elevatedBlocksNorm = [elevated.summary, elevated.description, elevated.tagContent]
+ .filter(Boolean)
+ .map(s => normText(s!))
+ const showMainContent =
+ !!contentRaw &&
+ !elevatedBlocksNorm.some(b => b === contentNorm) &&
+ !(elevated.title && normText(elevated.title) === contentNorm)
+
+ const declaredKindTrimmed = elevated.declaredKind?.trim()
+ const showDeclaredKindTag =
+ !!declaredKindTrimmed && declaredKindTrimmed !== String(event.kind)
+
+ const showTaggedPubkey =
+ !!elevated.taggedPubkey &&
+ isValidPubkey(elevated.taggedPubkey) &&
+ (!isValidPubkey(event.pubkey) || !hexPubkeysEqual(elevated.taggedPubkey, event.pubkey))
+
+ const hasAnyElevatedCopy =
+ !!elevated.summary ||
+ !!elevated.description ||
+ !!elevated.tagContent ||
+ elevated.imageUrls.length > 0
+
+ const showNoTextPlaceholder =
+ !contentRaw && !hasAnyElevatedCopy && !isBookstrEvent
+
+ const proseClass = 'text-sm leading-relaxed whitespace-pre-wrap break-words text-foreground/95'
+
return (
{t('Unsupported event preview')}
+
+ {showAuthorSummary && isValidPubkey(event.pubkey) ? (
+
+
+ ) : null}
+
-
+ {showTaggedPubkey ? (
+ - {kindLabel.description} -
-- {t('Event kind label', { kind: event.kind })} +
{headline}
++ {showKindAsSubtitle ? ( + {kindLabel.description} + ) : null} + {showKindAsSubtitle ? · : null} + {t('Event kind label', { kind: event.kind })}
+ {showDeclaredKindTag ? ( +{t('Unknown note declared kind tag', { value: declaredKindTrimmed })}
+ ) : null}
+
+ {t('Unknown note tagged pubkey')}
+
+
+ ) : null}
+
+ {elevated.topics.length > 0 ? (
+
+
+ ) : null}
+
+ {elevated.imageUrls.length > 0 ? (
+ + {t('Topics')} +
+
+ {elevated.topics.map((topic, i) => (
+
+ {topic}
+
+ ))}
+
+
+ {elevated.imageUrls.slice(0, 4).map((url, i) => (
+ 
+ ))}
+
+ ) : null}
+
+ {elevated.summary ? (
+
+
+ ) : null}
+
+ {elevated.description ? (
+ + {t('Summary')} +
+{truncatePreview(elevated.summary, CONTENT_PREVIEW_MAX)}
+
+
+ ) : null}
+
+ {elevated.tagContent && normText(elevated.tagContent) !== contentNorm ? (
+ + {t('Description')} +
+{truncatePreview(elevated.description, CONTENT_PREVIEW_MAX)}
+
+
+ ) : null}
+
{isBookstrEvent && (
+ {t('Unknown note tagged content')} +
+{truncatePreview(elevated.tagContent, CONTENT_PREVIEW_MAX)}
+
{bookMetadata.type && {t('Type')}: {bookMetadata.type}}
@@ -74,21 +311,21 @@ export default function UnknownNote({ event, className }: { event: Event; classN
)}
- {contentRaw ? (
- - {truncatePreview(contentRaw, CONTENT_PREVIEW_MAX)} -
- ) : ( + {showMainContent ? ( +{truncatePreview(contentRaw, CONTENT_PREVIEW_MAX)}
+ ) : null} + + {showNoTextPlaceholder ? ({t('No text content in event')}
- )} + ) : null} - {event.tags.length > 0 ? ( + {remainderTags.length > 0 ? ({t('Tags')}
-
- {event.tags.map((tag, i) => (
+ {remainderTags.map((tag, i) => (
-
{tag[0]}
diff --git a/src/components/Note/ZapPoll.tsx b/src/components/Note/ZapPoll.tsx
index 5b452ac1..849742d9 100644
--- a/src/components/Note/ZapPoll.tsx
+++ b/src/components/Note/ZapPoll.tsx
@@ -45,6 +45,8 @@ export default function ZapPoll({
const [optionIndex, setOptionIndex] = useState
(null) const [sats, setSats] = useState (21) const [zapping, setZapping] = useState(false) + /** Show sat/zap breakdown without having voted (card UX). */ + const [tallyRevealed, setTallyRevealed] = useState(false) useEffect(() => { if (meta?.valueMinimum != null) { @@ -62,7 +64,8 @@ export default function ZapPoll({ const myVoteOption = pubkey && meta ? userZapPollVoteOption(event.id, pubkey, receipts) : undefined - const showTally = !!meta && (closed || viewerZapped || event.pubkey === pubkey) + const showTally = + !!meta && (closed || viewerZapped || event.pubkey === pubkey || tallyRevealed) const satsBounds = useMemo(() => { if (!meta) return { min: 1, max: undefined as number | undefined } @@ -151,6 +154,21 @@ export default function ZapPoll({ {t('Loading tally…')}
)} {error &&{error}
} + {meta && !closed && !showTally && ( + + )}{meta.options.map((opt) => { const satsOpt = tally?.satsByOption.get(opt.index) ?? 0 diff --git a/src/components/RssUrlThreadEventsPreview/index.tsx b/src/components/RssUrlThreadEventsPreview/index.tsx index ab5ba036..3b764b32 100644 --- a/src/components/RssUrlThreadEventsPreview/index.tsx +++ b/src/components/RssUrlThreadEventsPreview/index.tsx @@ -3,7 +3,7 @@ import { Skeleton } from '@/components/ui/skeleton' import { FAST_READ_RELAY_URLS, SEARCHABLE_RELAY_URLS } from '@/constants' import { useNoteStatsRelayHints } from '@/hooks/useNoteStatsRelayHints' import { - buildRssArticleUrlThreadInteractionFilters, + buildRssArticleUrlThreadInteractionFilterGroups, isRssArticleUrlThreadInteraction } from '@/lib/rss-web-feed' import { queryService } from '@/services/client.service' @@ -28,14 +28,25 @@ export default function RssUrlThreadEventsPreview({ canonicalUrl }: { canonicalU useEffect(() => { let cancelled = false setLoading(true) - const filters = buildRssArticleUrlThreadInteractionFilters(canonicalUrl, FETCH_LIMIT) - void queryService - .fetchEvents(relayUrls, filters) - .then((all) => { + const { nonSocial, social } = buildRssArticleUrlThreadInteractionFilterGroups( + canonicalUrl, + FETCH_LIMIT + ) + const fetchOpts = { + eoseTimeout: 12_000, + globalTimeout: 26_000, + firstRelayResultGraceMs: false as const + } + void Promise.all([ + nonSocial.length > 0 ? queryService.fetchEvents(relayUrls, nonSocial, fetchOpts) : Promise.resolve([]), + social.length > 0 ? queryService.fetchEvents(relayUrls, social, fetchOpts) : Promise.resolve([]) + ]) + .then(([a, b]) => { if (cancelled) return + const all = [...a, ...b] const seen = new Set() const merged: Event[] = [] - for (const e of [...all].sort((a, b) => b.created_at - a.created_at)) { + for (const e of [...all].sort((x, y) => y.created_at - x.created_at)) { if (seen.has(e.id)) continue if (!isRssArticleUrlThreadInteraction(e, canonicalUrl)) continue seen.add(e.id) diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts index a931da59..e9dbdae9 100644 --- a/src/i18n/locales/en.ts +++ b/src/i18n/locales/en.ts @@ -396,6 +396,9 @@ export default { 'Technical details': 'Technical details', 'Event kind and time': 'Kind {{kind}} · {{time}}', 'Event kind label': 'Kind {{kind}}', + 'Unknown note declared kind tag': 'Tagged kind: {{value}}', + 'Unknown note tagged pubkey': 'Tagged pubkey', + 'Unknown note tagged content': 'Content', 'Copy JSON': 'Copy JSON', Verse: 'Verse', 'Notification reaction summary': 'reacted to this note.', @@ -638,6 +641,7 @@ export default { 'Relay URLs (optional, comma-separated)': 'Relay URLs (optional, comma-separated)', 'Remove poll': 'Remove poll', 'Refresh results': 'Refresh results', + 'See results': 'See results', 'Zap poll (paid votes)': 'Zap poll (paid votes)', 'Invalid zap poll': 'Invalid zap poll', 'You voted on this poll (zap receipt)': 'You voted on this poll (zap receipt)', diff --git a/src/lib/rss-article.ts b/src/lib/rss-article.ts index df2609dc..73ed3dc1 100644 --- a/src/lib/rss-article.ts +++ b/src/lib/rss-article.ts @@ -2,7 +2,7 @@ import { bytesToHex } from '@noble/hashes/utils' import { sha256 } from '@noble/hashes/sha256' import { ExtendedKind } from '@/constants' import { cleanUrl } from '@/lib/url' -import type { Event } from 'nostr-tools' +import { kinds, type Event } from 'nostr-tools' /** NIP-22: `K` / `k` value for http(s) URL comment scopes (web pages, articles). */ export const NIP22_URL_SCOPE_KIND = 'web' @@ -113,6 +113,12 @@ export function getHighlightSourceHttpUrl(event: Pick