From c40c809e6f4ba5aecf232c3c171f12fedca75298 Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Fri, 31 Oct 2025 19:44:58 +0100
Subject: [PATCH] bug-fixes

---
 .../Note/AsciidocArticle/AsciidocArticle.tsx  | 36 +++----
 .../Note/MarkdownArticle/MarkdownArticle.tsx  | 10 +-
 .../PublicationIndex/PublicationIndex.tsx     | 94 ++++++++++---------
 src/components/NoteList/index.tsx             | 15 ++-
 4 files changed, 88 insertions(+), 67 deletions(-)

diff --git a/src/components/Note/AsciidocArticle/AsciidocArticle.tsx b/src/components/Note/AsciidocArticle/AsciidocArticle.tsx
index d38e125..51e6fca 100644
--- a/src/components/Note/AsciidocArticle/AsciidocArticle.tsx
+++ b/src/components/Note/AsciidocArticle/AsciidocArticle.tsx
@@ -345,23 +345,25 @@ export default function AsciidocArticle({
 
   return (
     <article className={`prose prose-zinc max-w-none dark:prose-invert break-words leading-relaxed ${parsedContent?.cssClasses || ''} ${className || ''}`}>
-      {/* Article metadata */}
-      <header className="mb-8">
-        <h1 className="break-words text-4xl font-bold mb-6 leading-tight">{metadata.title}</h1>
-        {metadata.summary && (
-          <blockquote className="border-l-4 border-primary pl-6 italic text-muted-foreground mb-8 text-lg leading-relaxed">
-            <p className="break-words">{metadata.summary}</p>
-          </blockquote>
-        )}
-        {metadata.image && (
-          <div className="mb-8">
-            <ImageWithLightbox
-              image={{ url: metadata.image, pubkey: event.pubkey }}
-              className="w-full max-w-[400px] h-auto object-contain rounded-lg shadow-lg mx-auto"
-            />
-          </div>
-        )}
-      </header>
+      {/* Article metadata - hide when used as nested content */}
+      {!hideImagesAndInfo && (
+        <header className="mb-8">
+          <h1 className="break-words text-4xl font-bold mb-6 leading-tight">{metadata.title}</h1>
+          {metadata.summary && (
+            <blockquote className="border-l-4 border-primary pl-6 italic text-muted-foreground mb-8 text-lg leading-relaxed">
+              <p className="break-words">{metadata.summary}</p>
+            </blockquote>
+          )}
+          {metadata.image && (
+            <div className="mb-8">
+              <ImageWithLightbox
+                image={{ url: metadata.image, pubkey: event.pubkey }}
+                className="w-full max-w-[400px] h-auto object-contain rounded-lg shadow-lg mx-auto"
+              />
+            </div>
+          )}
+        </header>
+      )}
 
       {/* Render AsciiDoc content (everything is now processed as AsciiDoc) */}
       <div 
diff --git a/src/components/Note/MarkdownArticle/MarkdownArticle.tsx b/src/components/Note/MarkdownArticle/MarkdownArticle.tsx
index cc85c71..c1de974 100644
--- a/src/components/Note/MarkdownArticle/MarkdownArticle.tsx
+++ b/src/components/Note/MarkdownArticle/MarkdownArticle.tsx
@@ -25,11 +25,13 @@ import { Components } from './types'
 export default function MarkdownArticle({
   event,
   className,
-  showImageGallery = false
+  showImageGallery = false,
+  hideMetadata = false
 }: {
   event: Event
   className?: string
   showImageGallery?: boolean
+  hideMetadata?: boolean
 }) {
   const { push } = useSecondaryPage()
   const { navigateToHashtag } = useSmartHashtagNavigation()
@@ -491,13 +493,13 @@ export default function MarkdownArticle({
         ref={contentRef}
         className={`prose prose-zinc max-w-none dark:prose-invert break-words overflow-wrap-anywhere ${className || ''}`}
       >
-      {metadata.title && <h1 className="break-words">{metadata.title}</h1>}
-      {metadata.summary && (
+      {!hideMetadata && metadata.title && <h1 className="break-words">{metadata.title}</h1>}
+      {!hideMetadata && metadata.summary && (
         <blockquote>
           <p className="break-words">{metadata.summary}</p>
         </blockquote>
       )}
-      {metadata.image && (() => {
+      {!hideMetadata && metadata.image && (() => {
         // Find the index of the metadata image in allImages
         const cleanedMetadataImage = cleanUrl(metadata.image)
         const metadataImageIndex = cleanedMetadataImage
diff --git a/src/components/Note/PublicationIndex/PublicationIndex.tsx b/src/components/Note/PublicationIndex/PublicationIndex.tsx
index 0be9869..228dd6b 100644
--- a/src/components/Note/PublicationIndex/PublicationIndex.tsx
+++ b/src/components/Note/PublicationIndex/PublicationIndex.tsx
@@ -46,10 +46,12 @@ interface PublicationMetadata {
 
 export default function PublicationIndex({
   event,
-  className
+  className,
+  isNested = false
 }: {
   event: Event
   className?: string
+  isNested?: boolean
 }) {
   const { push } = useSecondaryPage()
   // Parse publication metadata from event tags
@@ -780,48 +782,50 @@ export default function PublicationIndex({
 
   return (
     <div className={cn('space-y-6', className)}>
-      {/* Publication Metadata */}
-      <div className="prose prose-zinc max-w-none dark:prose-invert">
-        <header className="mb-8 border-b pb-6">
-          <div className="flex items-start justify-between gap-4 mb-4">
-            <h1 className="text-4xl font-bold leading-tight break-words flex-1">{metadata.title}</h1>
-            <Button 
-              variant="ghost" 
-              size="icon" 
-              className="shrink-0"
-              onClick={exportPublication}
-              title="Export as AsciiDoc"
-            >
-              <MoreVertical className="h-5 w-5" />
-            </Button>
-          </div>
-          {metadata.summary && (
-            <blockquote className="border-l-4 border-primary pl-6 italic text-muted-foreground mb-4 text-lg leading-relaxed">
-              <p className="break-words">{metadata.summary}</p>
-            </blockquote>
-          )}
-          <div className="text-sm text-muted-foreground space-y-1">
-            {metadata.author && (
-              <div>
-                <span className="font-semibold">Author:</span> {metadata.author}
-              </div>
-            )}
-            {metadata.version && (
-              <div>
-                <span className="font-semibold">Version:</span> {metadata.version}
-              </div>
-            )}
-            {metadata.type && (
-              <div>
-                <span className="font-semibold">Type:</span> {metadata.type}
-              </div>
+      {/* Publication Metadata - only show for top-level publications */}
+      {!isNested && (
+        <div className="prose prose-zinc max-w-none dark:prose-invert">
+          <header className="mb-8 border-b pb-6">
+            <div className="flex items-start justify-between gap-4 mb-4">
+              <h1 className="text-4xl font-bold leading-tight break-words flex-1">{metadata.title}</h1>
+              <Button 
+                variant="ghost" 
+                size="icon" 
+                className="shrink-0"
+                onClick={exportPublication}
+                title="Export as AsciiDoc"
+              >
+                <MoreVertical className="h-5 w-5" />
+              </Button>
+            </div>
+            {metadata.summary && (
+              <blockquote className="border-l-4 border-primary pl-6 italic text-muted-foreground mb-4 text-lg leading-relaxed">
+                <p className="break-words">{metadata.summary}</p>
+              </blockquote>
             )}
-          </div>
-        </header>
-      </div>
+            <div className="text-sm text-muted-foreground space-y-1">
+              {metadata.author && (
+                <div>
+                  <span className="font-semibold">Author:</span> {metadata.author}
+                </div>
+              )}
+              {metadata.version && (
+                <div>
+                  <span className="font-semibold">Version:</span> {metadata.version}
+                </div>
+              )}
+              {metadata.type && (
+                <div>
+                  <span className="font-semibold">Type:</span> {metadata.type}
+                </div>
+              )}
+            </div>
+          </header>
+        </div>
+      )}
 
-      {/* Table of Contents */}
-      {!isLoading && tableOfContents.length > 0 && (
+      {/* Table of Contents - only show for top-level publications */}
+      {!isNested && !isLoading && tableOfContents.length > 0 && (
         <div className="border rounded-lg p-6 bg-muted/30">
           <h2 className="text-xl font-semibold mb-4">Table of Contents</h2>
           <nav>
@@ -839,8 +843,8 @@ export default function PublicationIndex({
         </div>
       )}
 
-      {/* Failed References Banner */}
-      {!isLoading && failedReferences.length > 0 && references.length > 0 && (
+      {/* Failed References Banner - only show for top-level publications */}
+      {!isNested && !isLoading && failedReferences.length > 0 && references.length > 0 && (
         <div className="p-4 border rounded-lg bg-yellow-50 dark:bg-yellow-900/20 border-yellow-200 dark:border-yellow-800">
           <div className="flex items-center justify-between gap-4">
             <div className="text-sm text-yellow-800 dark:text-yellow-200">
@@ -954,7 +958,7 @@ export default function PublicationIndex({
               // Recursively render nested 30040 publication index
               return (
                 <div key={index} id={sectionId} className="border-l-4 border-primary pl-6 scroll-mt-4">
-                  <PublicationIndex event={ref.event} />
+                  <PublicationIndex event={ref.event} isNested={true} />
                 </div>
               )
             } else if (eventKind === ExtendedKind.PUBLICATION_CONTENT || eventKind === ExtendedKind.WIKI_ARTICLE) {
@@ -968,7 +972,7 @@ export default function PublicationIndex({
               // Render 30817 content as MarkdownArticle
               return (
                 <div key={index} id={sectionId} className="scroll-mt-4">
-                  <MarkdownArticle event={ref.event} showImageGallery={false} />
+                  <MarkdownArticle event={ref.event} showImageGallery={false} hideMetadata={true} />
                 </div>
               )
             } else {
diff --git a/src/components/NoteList/index.tsx b/src/components/NoteList/index.tsx
index 2c5d195..d667145 100644
--- a/src/components/NoteList/index.tsx
+++ b/src/components/NoteList/index.tsx
@@ -1,5 +1,6 @@
 import NewNotesButton from '@/components/NewNotesButton'
 import { Button } from '@/components/ui/button'
+import { ExtendedKind } from '@/constants'
 import {
   getReplaceableCoordinateFromEvent,
   isMentioningMutedUsers,
@@ -7,12 +8,14 @@ import {
   isReplyNoteEvent
 } from '@/lib/event'
 import { shouldFilterEvent } from '@/lib/event-filtering'
+import { getZapInfoFromEvent } from '@/lib/event-metadata'
 import { isTouchDevice } from '@/lib/utils'
 import { useContentPolicy } from '@/providers/ContentPolicyProvider'
 import { useDeletedEvent } from '@/providers/DeletedEventProvider'
 import { useMuteList } from '@/providers/MuteListProvider'
 import { useNostr } from '@/providers/NostrProvider'
 import { useUserTrust } from '@/providers/UserTrustProvider'
+import { useZap } from '@/providers/ZapProvider'
 import client from '@/services/client.service'
 import { TFeedSubRequest } from '@/types'
 import dayjs from 'dayjs'
@@ -65,6 +68,7 @@ const NoteList = forwardRef(
     const { mutePubkeySet } = useMuteList()
     const { hideContentMentioningMutedUsers } = useContentPolicy()
     const { isEventDeleted } = useDeletedEvent()
+    const { zapReplyThreshold } = useZap()
     const [events, setEvents] = useState<Event[]>([])
     const [newEvents, setNewEvents] = useState<Event[]>([])
     const [hasMore, setHasMore] = useState<boolean>(true)
@@ -106,9 +110,18 @@ const NoteList = forwardRef(
         // Filter out expired events
         if (shouldFilterEvent(evt)) return true
 
+        // Filter out zap receipts below the zap threshold (superzaps)
+        if (evt.kind === ExtendedKind.ZAP_RECEIPT) {
+          const zapInfo = getZapInfoFromEvent(evt)
+          // Hide zap receipts if amount is missing, 0, or below the threshold
+          if (!zapInfo || zapInfo.amount === undefined || zapInfo.amount === 0 || zapInfo.amount < zapReplyThreshold) {
+            return true
+          }
+        }
+
         return false
       },
-      [hideReplies, hideUntrustedNotes, mutePubkeySet, pinnedEventIds, isEventDeleted]
+      [hideReplies, hideUntrustedNotes, mutePubkeySet, pinnedEventIds, isEventDeleted, zapReplyThreshold]
     )
 
     const filteredEvents = useMemo(() => {