From cde5be1bbbc18d5d6026a9ed927d539a95ebb8ba Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Mon, 30 Mar 2026 14:46:24 +0200
Subject: [PATCH] bug-fixes

---
 src/components/LiveActivitiesStrip.tsx | 16 ++++-
 src/components/NormalFeed/index.tsx    | 20 +++++-
 src/components/NoteList/index.tsx      | 93 +++++++++++++++++---------
 src/components/Relay/index.tsx         |  1 +
 src/pages/primary/SpellsPage/index.tsx |  4 +-
 5 files changed, 95 insertions(+), 39 deletions(-)

diff --git a/src/components/LiveActivitiesStrip.tsx b/src/components/LiveActivitiesStrip.tsx
index c27f2f59..47f6d9f1 100644
--- a/src/components/LiveActivitiesStrip.tsx
+++ b/src/components/LiveActivitiesStrip.tsx
@@ -3,7 +3,7 @@ import { cn } from '@/lib/utils'
 import { useLiveActivitiesOptional } from '@/providers/LiveActivitiesProvider'
 import { useUserPreferences } from '@/providers/UserPreferencesProvider'
 import { ExternalLink } from 'lucide-react'
-import { useEffect, useState } from 'react'
+import { useEffect, useLayoutEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
 type TPlacement = 'sidebar' | 'mobile'
@@ -37,11 +37,21 @@ export default function LiveActivitiesStrip({ placement }: { placement: TPlaceme
     return () => window.clearInterval(id)
   }, [items.length, reduceMotion])
 
+  useLayoutEffect(() => {
+    if (items.length === 0) return
+    setSlide((s) => Math.min(s, items.length - 1))
+  }, [items.length])
+
   if (!showLiveActivitiesBanner || items.length === 0) {
     return null
   }
 
-  const current = items[slide]!
+  // `items` can shrink without a new array identity; `slide` may then be out of range until effects run.
+  const displayIndex = Math.min(slide, items.length - 1)
+  const current = items[displayIndex]
+  if (!current) {
+    return null
+  }
 
   return (
     <div
@@ -100,7 +110,7 @@ export default function LiveActivitiesStrip({ placement }: { placement: TPlaceme
               aria-label={t('liveActivities.goToSlide', { n: i + 1 })}
               className={cn(
                 'size-1.5 rounded-full transition-colors',
-                i === slide ? 'bg-primary' : 'bg-muted-foreground/40 hover:bg-muted-foreground/60'
+                i === displayIndex ? 'bg-primary' : 'bg-muted-foreground/40 hover:bg-muted-foreground/60'
               )}
               onClick={(e) => {
                 e.preventDefault()
diff --git a/src/components/NormalFeed/index.tsx b/src/components/NormalFeed/index.tsx
index 0290c832..66a80154 100644
--- a/src/components/NormalFeed/index.tsx
+++ b/src/components/NormalFeed/index.tsx
@@ -28,10 +28,20 @@ const NormalFeed = forwardRef<TNoteListRef, {
   mergeTimelineWhenSubRequestFiltersMatch?: boolean
   /** Home favorite-relays chip scope; see {@link NoteList} `feedTimelineScopeKey`. */
   feedTimelineScopeKey?: string
-  /** Single-relay Explore / chip: kindless REQ (see `SINGLE_RELAY_KINDLESS_REQ_LIMIT` in constants), no feed kind filter. */
+  /** Single-relay Explore / chip: kindless REQ (see `SINGLE_RELAY_KINDLESS_REQ_LIMIT` in constants). */
   useFilterAsIs?: boolean
   clientSideKindFilter?: boolean
   allowKindlessRelayExplore?: boolean
+  /**
+   * Default true (home following, favorites, sets, single-relay chip): kind picker narrows visible rows.
+   * Ignored when {@link showAllKinds} is effectively true.
+   */
+  withKindFilter?: boolean
+  /**
+   * When true (relay explorer page), list shows the full relay batch. When omitted, uses KindFilter "All Events"
+   * ({@link useKindFilter} / persisted bypass) on home feeds.
+   */
+  showAllKinds?: boolean
   /**
    * Client-side 🔍 feed filter. When omitted: hidden on main following, shown on relay explore and non-main feeds.
    */
@@ -56,6 +66,8 @@ const NormalFeed = forwardRef<TNoteListRef, {
     useFilterAsIs = false,
     clientSideKindFilter = false,
     allowKindlessRelayExplore = false,
+    withKindFilter = true,
+    showAllKinds: showAllKindsProp,
     showFeedClientFilter: showFeedClientFilterProp,
     hostPrimaryPageName,
     onSingleRelayKindlessEmpty,
@@ -122,8 +134,10 @@ const NormalFeed = forwardRef<TNoteListRef, {
     [showFeedClientFilterProp, isMainFeed, allowKindlessRelayExplore, useFilterAsIs]
   )
 
+  const listShowAllKinds = showAllKindsProp ?? feedKindFilterBypass
+
   /** Include kind picker deps for single-relay chips (kindless REQ + client-side kinds). */
-  const subHeaderFilterDepsKey = `${allowKindlessRelayExplore ? 'kle' : 'std'}|${showKindsKey}|${feedKindFilterBypass}`
+  const subHeaderFilterDepsKey = `${allowKindlessRelayExplore ? 'kle' : 'std'}|${showKindsKey}|${feedKindFilterBypass}|${listShowAllKinds ? 'all' : 'k'}`
 
   const tabsElement = useMemo(
     () => (
@@ -209,6 +223,8 @@ const NormalFeed = forwardRef<TNoteListRef, {
           showKind1Replies={showKind1Replies}
           showKind1111={showKind1111}
           seeAllFeedEvents={feedKindFilterBypass}
+          withKindFilter={withKindFilter}
+          showAllKinds={listShowAllKinds}
           subRequests={subRequests}
           hideReplies={listMode === 'posts'}
           hideUntrustedNotes={hideUntrustedNotes}
diff --git a/src/components/NoteList/index.tsx b/src/components/NoteList/index.tsx
index c995d961..19a38120 100644
--- a/src/components/NoteList/index.tsx
+++ b/src/components/NoteList/index.tsx
@@ -215,7 +215,17 @@ const NoteList = forwardRef(
       showKind1111 = true,
       seeAllFeedEvents = false,
       /**
-       * Single-relay Explore / home chip: REQ omits `kinds`, limit 200, no feed kind filter (relay decides what to send).
+       * Default true: kind picker + kind-1 / 1111 splits narrow visible rows. False only when {@link showAllKinds}
+       * should win without listing every kind (rare).
+       */
+      withKindFilter = true,
+      /**
+       * True on relay explorer and when KindFilter "All Events" is on (home): merged timeline is not narrowed to
+       * {@link showKinds} for display or live merge.
+       */
+      showAllKinds = false,
+      /**
+       * Single-relay Explore / home chip: REQ omits `kinds`, relay limit (see `SINGLE_RELAY_KINDLESS_REQ_LIMIT`).
        */
       allowKindlessRelayExplore = false,
       filterMutedNotes = true,
@@ -256,8 +266,8 @@ const NoteList = forwardRef(
       timelineLoadingSafetyTimeoutMs,
       /**
        * With {@link useFilterAsIs}: omit relay `kinds` when the subrequest filter has none. Kindless relay feeds
-       * merge the full batch; the kind picker still applies in the list via {@link applyKindPickerInUi}. Other
-       * `useFilterAsIs` paths may still narrow merged batches to {@link showKinds}.
+       * merge the full batch; {@link withKindFilter} + {@link showAllKinds} control whether {@link showKinds}
+       * narrows merge and visible rows. Other `useFilterAsIs` paths may still narrow merged batches to {@link showKinds}.
        */
       clientSideKindFilter = false,
       /**
@@ -306,6 +316,8 @@ const NoteList = forwardRef(
       showKind1111?: boolean
       /** Omit REQ kinds and skip client-side kind filtering (main feed testing). Ignored when useFilterAsIs. */
       seeAllFeedEvents?: boolean
+      withKindFilter?: boolean
+      showAllKinds?: boolean
       allowKindlessRelayExplore?: boolean
       filterMutedNotes?: boolean
       hideReplies?: boolean
@@ -580,7 +592,7 @@ const NoteList = forwardRef(
         JSON.stringify({
           feed: timelineSubscriptionKey,
           ...(allowKindlessRelayExplore
-            ? { relayKindless: true }
+            ? { relayKindless: true, showAllKinds }
             : {
                 kinds: showKindsKey,
                 op: showKind1OPs,
@@ -596,7 +608,8 @@ const NoteList = forwardRef(
         showKind1Replies,
         showKind1111,
         seeAllFeedEvents,
-        allowKindlessRelayExplore
+        allowKindlessRelayExplore,
+        showAllKinds
       ]
     )
 
@@ -615,17 +628,18 @@ const NoteList = forwardRef(
     useFilterAsIsRef.current = useFilterAsIs
     const clientSideKindFilterRef = useRef(clientSideKindFilter)
     clientSideKindFilterRef.current = clientSideKindFilter
+    const showAllKindsRef = useRef(showAllKinds)
+    showAllKindsRef.current = showAllKinds
+    const withKindFilterRef = useRef(withKindFilter)
+    withKindFilterRef.current = withKindFilter
 
     /**
-     * When to apply kind picker + kind-1/1111/GitRelease visibility to visible rows. Kindless relay REQs merge
-     * the full relay batch; this still filters what the list shows (unlike standalone relay explore, which sets
-     * {@link allowKindlessRelayExplore} without {@link clientSideKindFilter} and shows the firehose).
+     * When to apply kind picker + kind-1 OP|reply / 1111 / GitRelease splits to visible rows.
+     * Home feeds default to {@link withKindFilter}; relay explorer and KindFilter "All Events" use {@link showAllKinds}.
      */
     const applyKindPickerInUi = useMemo(
-      () =>
-        !seeAllFeedEvents &&
-        (!allowKindlessRelayExplore || (useFilterAsIs && clientSideKindFilter)),
-      [seeAllFeedEvents, allowKindlessRelayExplore, useFilterAsIs, clientSideKindFilter]
+      () => withKindFilter && !showAllKinds && !seeAllFeedEvents,
+      [withKindFilter, showAllKinds, seeAllFeedEvents]
     )
 
     const shouldHideEvent = useCallback(
@@ -1304,15 +1318,14 @@ const NoteList = forwardRef(
         }
 
         /**
-         * Kindless relay REQ (`allowKindlessRelayExplore`): never drop events here — relays return many kinds;
-         * merging only rows in {@link showKinds} left almost nothing in the timeline (e.g. christpill 200 events → 1
-         * visible) while relay explore showed the full firehose. {@link applyKindPickerInUi} / {@link filteredEvents}
-         * still apply the kind picker for what the user sees.
+         * Kindless relay REQ: when {@link showAllKinds} is true (explorer / "All Events"), keep the full batch;
+         * otherwise narrow to {@link showKinds} so the merged timeline matches {@link applyKindPickerInUi}.
          */
         const narrowLiveBatch = (evs: Event[]) => {
           if (seeAllFeedEventsRef.current) return evs
-          if (allowKindlessRelayExploreRef.current) return evs
+          if (allowKindlessRelayExploreRef.current && showAllKindsRef.current) return evs
           if (!useFilterAsIsRef.current || !clientSideKindFilterRef.current) return evs
+          if (!withKindFilterRef.current) return evs
           return evs.filter((e) => showKinds.includes(e.kind))
         }
 
@@ -1349,7 +1362,13 @@ const NoteList = forwardRef(
             let merged = [...byId.values()]
               .sort((a, b) => b.created_at - a.created_at)
               .slice(0, cap)
-            if (useFilterAsIs && clientSideKindFilter && !seeAllFeedEventsRef.current) {
+            if (
+              useFilterAsIs &&
+              clientSideKindFilter &&
+              withKindFilter &&
+              !seeAllFeedEventsRef.current &&
+              (!allowKindlessRelayExplore || !showAllKinds)
+            ) {
               merged = merged.filter((e) => showKinds.includes(e.kind))
             }
             if (sessionSnap?.length && !userPulledRefresh) {
@@ -1579,21 +1598,25 @@ const NoteList = forwardRef(
             onNew: (event: Event) => {
               if (!effectActive) return
               feedRelayReturnedAnyEventRef.current = true
-              if (!seeAllFeedEventsRef.current && !allowKindlessRelayExploreRef.current) {
-                if (!useFilterAsIsRef.current && !showKinds.includes(event.kind)) return
-                if (
-                  clientSideKindFilterRef.current &&
-                  useFilterAsIsRef.current &&
-                  !showKinds.includes(event.kind)
-                )
-                  return
-                if (event.kind === kinds.ShortTextNote) {
-                  const isReply = isReplyNoteEvent(event)
-                  if (isReply && !showKind1Replies) return
-                  if (!isReply && !showKind1OPs) return
+              if (!seeAllFeedEventsRef.current && withKindFilterRef.current) {
+                const kindlessFirehose =
+                  allowKindlessRelayExploreRef.current && showAllKindsRef.current
+                if (!kindlessFirehose) {
+                  if (!useFilterAsIsRef.current && !showKinds.includes(event.kind)) return
+                  if (
+                    clientSideKindFilterRef.current &&
+                    useFilterAsIsRef.current &&
+                    !showKinds.includes(event.kind)
+                  )
+                    return
+                  if (event.kind === kinds.ShortTextNote) {
+                    const isReply = isReplyNoteEvent(event)
+                    if (isReply && !showKind1Replies) return
+                    if (!isReply && !showKind1OPs) return
+                  }
+                  if (event.kind === ExtendedKind.COMMENT && !showKind1111) return
+                  if (event.kind === ExtendedKind.GIT_RELEASE && !showKind1OPs) return
                 }
-                if (event.kind === ExtendedKind.COMMENT && !showKind1111) return
-                if (event.kind === ExtendedKind.GIT_RELEASE && !showKind1OPs) return
               }
               if (shouldHideEventRef.current(event)) return
               if (pubkey && event.pubkey === pubkey) {
@@ -1693,6 +1716,8 @@ const NoteList = forwardRef(
       oneShotFirstRelayGraceMs,
       clientSideKindFilter,
       allowKindlessRelayExplore,
+      showAllKinds,
+      withKindFilter,
       onSingleRelayKindlessEmpty
     ])
 
@@ -1971,7 +1996,9 @@ const NoteList = forwardRef(
             const narrowLoadMore =
               useFilterAsIsRef.current &&
               clientSideKindFilterRef.current &&
-              !seeAllFeedEventsRef.current
+              withKindFilterRef.current &&
+              !seeAllFeedEventsRef.current &&
+              (!allowKindlessRelayExploreRef.current || !showAllKindsRef.current)
             let toAppend = narrowLoadMore
               ? fetchBatch.filter((e) => showKindsRef.current.includes(e.kind))
               : fetchBatch
diff --git a/src/components/Relay/index.tsx b/src/components/Relay/index.tsx
index f72c5c6b..388df45a 100644
--- a/src/components/Relay/index.tsx
+++ b/src/components/Relay/index.tsx
@@ -148,6 +148,7 @@ const Relay = forwardRef<
         subRequests={relayFeedSubRequests}
         useFilterAsIs
         allowKindlessRelayExplore
+        showAllKinds
         showFeedClientFilter
         hostPrimaryPageName={hostPrimaryPageName}
       />
diff --git a/src/pages/primary/SpellsPage/index.tsx b/src/pages/primary/SpellsPage/index.tsx
index ec3eeee5..233c6d08 100644
--- a/src/pages/primary/SpellsPage/index.tsx
+++ b/src/pages/primary/SpellsPage/index.tsx
@@ -1689,7 +1689,9 @@ const SpellsPage = forwardRef<TPageRef>(function SpellsPage(
                   subRequests={subRequests}
                   feedSubscriptionKey={spellFeedSubscriptionKey}
                   hostPrimaryPageName="spells"
-                  showKinds={showKinds}
+                  showKinds={
+                    selectedFauxSpell === 'notifications' ? NOTIFICATION_SPELL_KINDS : showKinds
+                  }
                   spellFeedInstrumentToken={spellFeedInstrumentToken}
                   onSpellFeedFirstPaint={handleSpellFeedFirstPaint}
                   timelineLoadingSafetyTimeoutMs={