Merge pull request #60 from fiatjaf/fix/grasp-kind-constraint

Enforce kind constraint in grasp ref validation and fix envconfig tag typo

Author: mattn

global/global.go

@@ -24,7 +24,7 @@ var assets embed.FS
 var (
 	S struct {
 		Port          string `envconfig:"PORT" default:"3334"`
-		SFTPPort      string `envconvig:"SFTP_PORT" default:"2222"`
+		SFTPPort      string `envconfig:"SFTP_PORT" default:"2222"`
 		Host          string `envconfig:"HOST" default:"localhost"`
 		DataPath      string `envconfig:"DATA_PATH" default:"./data"`
 		NoAutoUpdates bool   `envconfig:"NO_AUTO_UPDATES"`

grasp/validation.go

@@ -3,6 +3,7 @@ package grasp
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 
 	"fiatjaf.com/nostr"
@@ -77,11 +78,13 @@ func refExistsAsKind(eventId string, kinds []nostr.Kind) bool {
 		return false
 	}
 
-	for range global.IL.Main.QueryEvents(nostr.Filter{
-		IDs:   []nostr.ID{id},
-		Kinds: kinds,
+	// the ID query fast-path ignores the Kinds constraint, so check the kind ourselves
+	for evt := range global.IL.Main.QueryEvents(nostr.Filter{
+		IDs: []nostr.ID{id},
 	}, 1) {
-		return true
+		if slices.Contains(kinds, evt.Kind) {
+			return true
+		}
 	}
 
 	return false