From c40609c8acaecca911e5c60013dec74a3d047fb0 Mon Sep 17 00:00:00 2001
From: Cody Tseng <codytseng98@gmail.com>
Date: Wed, 16 Apr 2025 11:23:22 +0800
Subject: [PATCH] fix: prevent old notes from being treated as new (#278)

---
 src/services/client.service.ts | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/services/client.service.ts b/src/services/client.service.ts
index 9846ddf5..85b383cb 100644
--- a/src/services/client.service.ts
+++ b/src/services/client.service.ts
@@ -445,23 +445,23 @@ class ClientService extends EventTarget {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const that = this
     let events: NEvent[] = []
-    let eosed = false
+    let eosedAt: number | null = null
     const subCloser = this.subscribe(relays, since ? { ...filter, since } : filter, {
       startLogin,
       onevent: (evt: NEvent) => {
         that.eventDataLoader.prime(evt.id, Promise.resolve(evt))
         // not eosed yet, push to events
-        if (!eosed) {
+        if (!eosedAt) {
           return events.push(evt)
         }
-        // eosed, (algo relay feeds) no need to sort and cache
-        if (!needSort) {
-          return onNew(evt)
+        // new event
+        if (evt.created_at > eosedAt) {
+          onNew(evt)
         }
 
         const timeline = that.timelines[key]
         if (!timeline || Array.isArray(timeline) || !timeline.refs.length) {
-          return onNew(evt)
+          return
         }
 
         // find the right position to insert
@@ -479,19 +479,16 @@ class ClientService extends EventTarget {
         // the event is too old, ignore it
         if (idx >= timeline.refs.length) return
 
-        // new event
-        if (idx === 0) {
-          onNew(evt)
-        }
-
         // insert the event to the right position
         timeline.refs.splice(idx, 0, [evt.id, evt.created_at])
       },
-      oneose: (_eosed) => {
-        eosed = _eosed
+      oneose: (eosed) => {
+        if (eosed && !eosedAt) {
+          eosedAt = dayjs().unix()
+        }
         // (algo feeds) no need to sort and cache
         if (!needSort) {
-          return onEvents([...events], eosed)
+          return onEvents([...events], !!eosedAt)
         }
         if (!eosed) {
           events = events.sort((a, b) => b.created_at - a.created_at).slice(0, filter.limit)