replace usage of IsValidPublicKeyHex() in subpackages.

This commit is contained in:
fiatjaf
2024-01-18 20:30:20 -03:00
parent 9457c5a794
commit 2586144a5c
6 changed files with 14 additions and 14 deletions

View File

@@ -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
}

View File

@@ -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")