refactor: combine vanish validation and kind check

Author: vikashsiwach

src/handlers/event-message-handler.ts

@@ -1,4 +1,4 @@
-import { ContextMetadataKey, EventExpirationTimeMetadataKey } from '../constants/base'
+import { ContextMetadataKey, EventExpirationTimeMetadataKey, EventKinds } from '../constants/base'
 import { Event, ExpiringEvent } from '../@types/event'
 import { EventRateLimit, FeeSchedule, Settings } from '../@types/settings'
 import {
@@ -12,7 +12,6 @@ import {
   isEventSignatureValid,
   isExpiredEvent,
   isRequestToVanishEvent,
-  isValidRequestToVanishEvent,
 } from '../utils/event'
 import { IEventRepository, IUserRepository } from '../@types/repositories'
 import { IEventStrategy, IMessageHandler } from '../@types/message-handlers'
@@ -210,7 +209,7 @@ export class EventMessageHandler implements IMessageHandler {
       return 'invalid: event signature verification failed'
     }
 
-    if (isRequestToVanishEvent(event) && !isValidRequestToVanishEvent(event, this.settings().info.relay_url)) {
+    if (event.kind === EventKinds.REQUEST_TO_VANISH && !isRequestToVanishEvent(event, this.settings().info.relay_url)) {
       return 'invalid: request to vanish relay tag invalid'
     }
   }

src/utils/event.ts

@@ -225,11 +225,15 @@ export const isDeleteEvent = (event: Event): boolean => {
   return event.kind === EventKinds.DELETE
 }
 
-export const isRequestToVanishEvent = (event: Event): boolean => {
-  return event.kind === EventKinds.REQUEST_TO_VANISH
-}
+export const isRequestToVanishEvent = (event: Event, relayUrl?: string): boolean => {
+  if (event.kind !== EventKinds.REQUEST_TO_VANISH) {
+    return false
+  }
+
+  if (typeof relayUrl === 'undefined') {
+    return true
+  }
 
-export const isValidRequestToVanishEvent = (event: Event, relayUrl: string): boolean => {
   const relayTags = event.tags
     .filter((tag) => tag.length >= 2 && tag[0] === EventTags.Relay)
     .map((tag) => tag[1])

test/unit/utils/event.spec.ts

@@ -11,7 +11,6 @@ import {
   isParameterizedReplaceableEvent,
   isReplaceableEvent,
   isRequestToVanishEvent,
-  isValidRequestToVanishEvent,
   serializeEvent,
 } from '../../../src/utils/event'
 import { expect } from 'chai'
@@ -432,39 +431,45 @@ describe('NIP-62', () => {
       } as any
       expect(isRequestToVanishEvent(event)).to.be.false
     })
-  })
 
-  describe('isValidRequestToVanishEvent', () => {
     it('returns true when event contains the relay URL', () => {
       const event: Event = {
         kind: 62,
         tags: [[EventTags.Relay, 'relay_url']],
       } as any
-      expect(isValidRequestToVanishEvent(event, 'relay_url')).to.be.true
+      expect(isRequestToVanishEvent(event, 'relay_url')).to.be.true
     })
 
     it('returns true when event contains ALL_RELAYS', () => {
       const event: Event = {
         kind: 62,
         tags: [[EventTags.Relay, ALL_RELAYS]],
       } as any
-      expect(isValidRequestToVanishEvent(event, 'relay_url')).to.be.true
+      expect(isRequestToVanishEvent(event, 'relay_url')).to.be.true
     })
 
     it('returns false when relay tag does not match', () => {
       const event: Event = {
         kind: 62,
         tags: [[EventTags.Relay, 'other_relay_url']],
       } as any
-      expect(isValidRequestToVanishEvent(event, 'relay_url')).to.be.false
+      expect(isRequestToVanishEvent(event, 'relay_url')).to.be.false
     })
 
     it('returns false when there are no relay tags', () => {
       const event: Event = {
         kind: 62,
         tags: [],
       } as any
-      expect(isValidRequestToVanishEvent(event, 'relay_url')).to.be.false
+      expect(isRequestToVanishEvent(event, 'relay_url')).to.be.false
+    })
+
+    it('returns false when relay URL is provided for non-kind-62 event', () => {
+      const event: Event = {
+        kind: 1,
+        tags: [[EventTags.Relay, 'relay_url']],
+      } as any
+      expect(isRequestToVanishEvent(event, 'relay_url')).to.be.false
     })
   })
 })