replace usage of IsValidPublicKeyHex() in subpackages.

fiatjaf · fiatjaf · commit 2586144a5cc1 · 2024-01-18T20:30:20.000-03:00
diff --git a/nip29/group.go b/nip29/group.go
@@ -150,7 +150,7 @@ func (group *Group) MergeInAdminsEvent(evt *nostr.Event) error {
 		if tag[0] != "p" {
 			continue
 		}
-		if !nostr.IsValidPublicKeyHex(tag[1]) {
+		if !nostr.IsValid32ByteHex(tag[1]) {
 			continue
 		}
 
@@ -186,7 +186,7 @@ func (group *Group) MergeInMembersEvent(evt *nostr.Event) error {
 		if tag[0] != "p" {
 			continue
 		}
-		if !nostr.IsValidPublicKeyHex(tag[1]) {
+		if !nostr.IsValid32ByteHex(tag[1]) {
 			continue
 		}
 
diff --git a/nip29/relay/relay.go b/nip29/relay/relay.go
@@ -24,7 +24,7 @@ var moderationActionFactories = map[int]func(*nostr.Event) (Action, error){
 	nostr.KindSimpleGroupAddUser: func(evt *nostr.Event) (Action, error) {
 		targets := make([]string, 0, len(evt.Tags))
 		for _, tag := range evt.Tags.GetAll([]string{"p", ""}) {
-			if !nostr.IsValidPublicKeyHex(tag[1]) {
+			if !nostr.IsValid32ByteHex(tag[1]) {
 				return nil, fmt.Errorf("")
 			}
 			targets = append(targets, tag[1])
@@ -37,7 +37,7 @@ var moderationActionFactories = map[int]func(*nostr.Event) (Action, error){
 	nostr.KindSimpleGroupRemoveUser: func(evt *nostr.Event) (Action, error) {
 		targets := make([]string, 0, len(evt.Tags))
 		for _, tag := range evt.Tags.GetAll([]string{"p", ""}) {
-			if !nostr.IsValidPublicKeyHex(tag[1]) {
+			if !nostr.IsValid32ByteHex(tag[1]) {
 				return nil, fmt.Errorf("invalid public key hex")
 			}
 			targets = append(targets, tag[1])
@@ -81,7 +81,7 @@ var moderationActionFactories = map[int]func(*nostr.Event) (Action, error){
 
 		targets := make([]string, 0, nTags-1)
 		for _, tag := range evt.Tags.GetAll([]string{"p", ""}) {
-			if !nostr.IsValidPublicKeyHex(tag[1]) {
+			if !nostr.IsValid32ByteHex(tag[1]) {
 				return nil, fmt.Errorf("invalid public key hex")
 			}
 			targets = append(targets, tag[1])
@@ -107,7 +107,7 @@ var moderationActionFactories = map[int]func(*nostr.Event) (Action, error){
 
 		targets := make([]string, 0, nTags-1)
 		for _, tag := range evt.Tags.GetAll([]string{"p", ""}) {
-			if !nostr.IsValidPublicKeyHex(tag[1]) {
+			if !nostr.IsValid32ByteHex(tag[1]) {
 				return nil, fmt.Errorf("invalid public key hex")
 			}
 			targets = append(targets, tag[1])
@@ -127,7 +127,7 @@ var moderationActionFactories = map[int]func(*nostr.Event) (Action, error){
 
 		targets := make([]string, len(tags))
 		for i, tag := range tags {
-			if nostr.IsValidPublicKeyHex(tag[1]) {
+			if nostr.IsValid32ByteHex(tag[1]) {
 				targets[i] = tag[1]
 			} else {
 				return nil, fmt.Errorf("invalid event id hex")
diff --git a/nip46/dynamic-signer.go b/nip46/dynamic-signer.go
@@ -81,7 +81,7 @@ func (p *DynamicSigner) HandleRequest(event *nostr.Event) (
 	}
 
 	targetUser := event.Tags.GetFirst([]string{"p", ""})
-	if targetUser == nil || !nostr.IsValidPublicKeyHex((*targetUser)[1]) {
+	if targetUser == nil || !nostr.IsValid32ByteHex((*targetUser)[1]) {
 		return req, resp, eventResponse, false, fmt.Errorf("invalid \"p\" tag")
 	}
 
@@ -153,7 +153,7 @@ func (p *DynamicSigner) HandleRequest(event *nostr.Event) (
 			break
 		}
 		thirdPartyPubkey := req.Params[0]
-		if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {
+		if !nostr.IsValidPublicKey(thirdPartyPubkey) {
 			resultErr = fmt.Errorf("first argument to 'nip04_encrypt' is not a pubkey string")
 			break
 		}
@@ -179,7 +179,7 @@ func (p *DynamicSigner) HandleRequest(event *nostr.Event) (
 			break
 		}
 		thirdPartyPubkey := req.Params[0]
-		if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {
+		if !nostr.IsValidPublicKey(thirdPartyPubkey) {
 			resultErr = fmt.Errorf("first argument to 'nip04_decrypt' is not a pubkey string")
 			break
 		}
diff --git a/nip46/static-key-signer.go b/nip46/static-key-signer.go
@@ -134,7 +134,7 @@ func (p *StaticKeySigner) HandleRequest(event *nostr.Event) (
 			break
 		}
 		thirdPartyPubkey := req.Params[0]
-		if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {
+		if !nostr.IsValidPublicKey(thirdPartyPubkey) {
 			resultErr = fmt.Errorf("first argument to 'nip04_encrypt' is not a pubkey string")
 			break
 		}
@@ -156,7 +156,7 @@ func (p *StaticKeySigner) HandleRequest(event *nostr.Event) (
 			break
 		}
 		thirdPartyPubkey := req.Params[0]
-		if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {
+		if !nostr.IsValidPublicKey(thirdPartyPubkey) {
 			resultErr = fmt.Errorf("first argument to 'nip04_decrypt' is not a pubkey string")
 			break
 		}
diff --git a/nip52/calendar_event.go b/nip52/calendar_event.go
@@ -75,7 +75,7 @@ func ParseCalendarEvent(event nostr.Event) CalendarEvent {
 		case "g":
 			calev.Geohashes = append(calev.Geohashes, tag[1])
 		case "p":
-			if nostr.IsValidPublicKeyHex(tag[1]) {
+			if nostr.IsValid32ByteHex(tag[1]) {
 				part := Participant{
 					PubKey: tag[1],
 				}
diff --git a/nip53/nip53.go b/nip53/nip53.go
@@ -64,7 +64,7 @@ func ParseLiveEvent(event nostr.Event) LiveEvent {
 		case "recording":
 			liev.Recording = append(liev.Recording, tag[1])
 		case "p":
-			if nostr.IsValidPublicKeyHex(tag[1]) {
+			if nostr.IsValid32ByteHex(tag[1]) {
 				part := Participant{
 					PubKey: tag[1],
 				}

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (group Group) MergeInAdminsEvent(evt nostr.Event) error {`
`150`	`150`	`if tag[0] != "p" {`
`151`	`151`	`continue`
`152`	`152`	`}`
`153`		`- if !nostr.IsValidPublicKeyHex(tag[1]) {`
	`153`	`+ if !nostr.IsValid32ByteHex(tag[1]) {`
`154`	`154`	`continue`
`155`	`155`	`}`
`156`	`156`
`@@ -186,7 +186,7 @@ func (group Group) MergeInMembersEvent(evt nostr.Event) error {`
`186`	`186`	`if tag[0] != "p" {`
`187`	`187`	`continue`
`188`	`188`	`}`
`189`		`- if !nostr.IsValidPublicKeyHex(tag[1]) {`
	`189`	`+ if !nostr.IsValid32ByteHex(tag[1]) {`
`190`	`190`	`continue`
`191`	`191`	`}`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (p DynamicSigner) HandleRequest(event nostr.Event) (`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`targetUser := event.Tags.GetFirst([]string{"p", ""})`
`84`		`- if targetUser == nil \|\| !nostr.IsValidPublicKeyHex((*targetUser)[1]) {`
	`84`	`+ if targetUser == nil \|\| !nostr.IsValid32ByteHex((*targetUser)[1]) {`
`85`	`85`	`return req, resp, eventResponse, false, fmt.Errorf("invalid \"p\" tag")`
`86`	`86`	`}`
`87`	`87`
`@@ -153,7 +153,7 @@ func (p DynamicSigner) HandleRequest(event nostr.Event) (`
`153`	`153`	`break`
`154`	`154`	`}`
`155`	`155`	`thirdPartyPubkey := req.Params[0]`
`156`		`- if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {`
	`156`	`+ if !nostr.IsValidPublicKey(thirdPartyPubkey) {`
`157`	`157`	`resultErr = fmt.Errorf("first argument to 'nip04_encrypt' is not a pubkey string")`
`158`	`158`	`break`
`159`	`159`	`}`
`@@ -179,7 +179,7 @@ func (p DynamicSigner) HandleRequest(event nostr.Event) (`
`179`	`179`	`break`
`180`	`180`	`}`
`181`	`181`	`thirdPartyPubkey := req.Params[0]`
`182`		`- if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {`
	`182`	`+ if !nostr.IsValidPublicKey(thirdPartyPubkey) {`
`183`	`183`	`resultErr = fmt.Errorf("first argument to 'nip04_decrypt' is not a pubkey string")`
`184`	`184`	`break`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (p StaticKeySigner) HandleRequest(event nostr.Event) (`
`134`	`134`	`break`
`135`	`135`	`}`
`136`	`136`	`thirdPartyPubkey := req.Params[0]`
`137`		`- if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {`
	`137`	`+ if !nostr.IsValidPublicKey(thirdPartyPubkey) {`
`138`	`138`	`resultErr = fmt.Errorf("first argument to 'nip04_encrypt' is not a pubkey string")`
`139`	`139`	`break`
`140`	`140`	`}`
`@@ -156,7 +156,7 @@ func (p StaticKeySigner) HandleRequest(event nostr.Event) (`
`156`	`156`	`break`
`157`	`157`	`}`
`158`	`158`	`thirdPartyPubkey := req.Params[0]`
`159`		`- if !nostr.IsValidPublicKeyHex(thirdPartyPubkey) {`
	`159`	`+ if !nostr.IsValidPublicKey(thirdPartyPubkey) {`
`160`	`160`	`resultErr = fmt.Errorf("first argument to 'nip04_decrypt' is not a pubkey string")`
`161`	`161`	`break`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func ParseCalendarEvent(event nostr.Event) CalendarEvent {`
`75`	`75`	`case "g":`
`76`	`76`	`calev.Geohashes = append(calev.Geohashes, tag[1])`
`77`	`77`	`case "p":`
`78`		`- if nostr.IsValidPublicKeyHex(tag[1]) {`
	`78`	`+ if nostr.IsValid32ByteHex(tag[1]) {`
`79`	`79`	`part := Participant{`
`80`	`80`	`PubKey: tag[1],`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func ParseLiveEvent(event nostr.Event) LiveEvent {`
`64`	`64`	`case "recording":`
`65`	`65`	`liev.Recording = append(liev.Recording, tag[1])`
`66`	`66`	`case "p":`
`67`		`- if nostr.IsValidPublicKeyHex(tag[1]) {`
	`67`	`+ if nostr.IsValid32ByteHex(tag[1]) {`
`68`	`68`	`part := Participant{`
`69`	`69`	`PubKey: tag[1],`
`70`	`70`	`}`