refactor: remove duplicate expiration filter in subscription replay

Author: Priyanshubhartistm

src/handlers/subscribe-message-handler.ts

@@ -59,7 +59,7 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
     const sendEOSE = () =>
       this.webSocket.emit(WebSocketAdapterEvent.Message, createEndOfStoredEventsNoticeMessage(subscriptionId))
     const isSubscribedToEvent = SubscribeMessageHandler.isClientSubscribedToEvent(filters)
-    const isNotExpired = (event: Event) => {
+    const isTagUnexpired = (event: Event) => {
       if (isExpiredEvent(event)) {
         return false
       }
@@ -74,9 +74,8 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
       await pipeline(
         findEvents,
         streamFilter(propSatisfies(isNil, 'deleted_at')),
-        streamFilter(SubscribeMessageHandler.isNotExpired),
         streamMap(toNostrEvent),
-        streamFilter(isNotExpired),
+        streamFilter(isTagUnexpired),
         streamFilter(isSubscribedToEvent),
         streamEach(sendEvent),
         streamEnd(sendEOSE),
@@ -96,11 +95,6 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
     return anyPass(map(isEventMatchingFilter)(filters))
   }
 
-  private static isNotExpired(event: { expires_at?: number }): boolean {
-    const now = Math.floor(Date.now() / 1000)
-    return typeof event.expires_at !== 'number' || event.expires_at > now
-  }
-
   private canSubscribe(subscriptionId: SubscriptionId, filters: SubscriptionFilter[]): string | undefined {
     const subscriptions = this.webSocket.getSubscriptions()
     const existingSubscription = subscriptions.get(subscriptionId)

test/unit/handlers/subscribe-message-handler.spec.ts

@@ -210,21 +210,6 @@ describe('SubscribeMessageHandler', () => {
       expect(webSocketOnMessageStub).to.have.been.calledWithExactly(['EOSE', subscriptionId])
     })
 
-    it('does not send expired stored events', async () => {
-      isClientSubscribedToEventStub.returns(always(true))
-
-      const promise = (handler as any).fetchAndSend(subscriptionId, filters)
-
-      stream.write(toDbEvent(event, { expires_at: Math.floor(Date.now() / 1000) - 1 }))
-      stream.end()
-
-      await promise
-
-      expect(webSocketOnMessageStub).to.have.been.calledOnceWithExactly(
-        ['EOSE', subscriptionId],
-      )
-    })
-
     it('sends EOSE', async () => {
       const promise = (handler as any).fetchAndSend(subscriptionId, filters)