mleku/nostr
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tag comparison to correctly handle binary and hex

Browse Source
This commit is contained in:
mleku
2025-11-26 14:15:03 +00:00
parent 81eebdcd1e
commit 40e67fc331
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -578,14 +578,14 @@ func main() {
tags := tag.NewS(eTag, pTag, tTag) tags := tag.NewS(eTag, pTag, tTag)
// Access tag elements // Access tag elements
fmt.Printf("Key: %s\n", eTag.Key()) // "e" fmt.Printf("Key: %s\n", eTag.Key()) // "e"
fmt.Printf("Value: %x\n", eTag.Value()) // event-id bytes fmt.Printf("Value: %s\n", eTag.ValueHex()) // event-id as hex (handles binary storage)
fmt.Printf("Relay: %s\n", eTag.Relay()) // relay URL fmt.Printf("Relay: %s\n", eTag.Relay()) // relay URL
// Find tags // Find tags - use ValueHex() for e/p tags (may be binary-encoded internally)
pTags := tags.GetAll([]byte("p")) pTags := tags.GetAll([]byte("p"))
for _, pt := range pTags { for _, pt := range pTags {
fmt.Printf("P tag: %x\n", pt.Value()) fmt.Printf("P tag: %s\n", pt.ValueHex()) // Always returns hex regardless of storage
} }
// Filter tags // Filter tags

18
encoders/tag/tags.go
View File

@@ -46,7 +46,8 @@ func (s *S) Append(t ...*T) {
} }
// ContainsAny returns true if any of the values given in `values` matches any // ContainsAny returns true if any of the values given in `values` matches any
// of the tag elements. // of the tag elements. For e/p tags with binary-encoded values, this handles
// comparison correctly by using ValueHex() to ensure consistent comparison.
func (s *S) ContainsAny(tagName []byte, values [][]byte) bool { func (s *S) ContainsAny(tagName []byte, values [][]byte) bool {
if s == nil { if s == nil {
return false return false
@@ -54,6 +55,9 @@ func (s *S) ContainsAny(tagName []byte, values [][]byte) bool {
if len(tagName) < 1 { if len(tagName) < 1 {
return false return false
} }
// Check if this is a binary-optimized tag type (e or p)
isBinaryTag := len(tagName) == 1 && (tagName[0] == 'e' || tagName[0] == 'p')
for _, v := range *s { for _, v := range *s {
if v.Len() < 2 { if v.Len() < 2 {
continue continue
@@ -61,8 +65,18 @@ func (s *S) ContainsAny(tagName []byte, values [][]byte) bool {
if !utils.FastEqual(v.Key(), tagName) { if !utils.FastEqual(v.Key(), tagName) {
continue continue
} }
// For e/p tags, use ValueHex() to get consistent hex representation
// regardless of whether the value is stored in binary or hex format
var tagValue []byte
if isBinaryTag {
tagValue = v.ValueHex()
} else {
tagValue = v.Value()
}
for _, candidate := range values { for _, candidate := range values {
if bytes.HasPrefix(v.Value(), candidate) { if bytes.HasPrefix(tagValue, candidate) {
return true return true
} }
} }