highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-07-01 11:02:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix OKEnvelope always requiring the 4th field.

Browse Source
This commit is contained in:
fiatjaf
2023-11-04 17:30:19 -03:00
parent 0ecffe686d
commit f8fb9e8c26
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
relay.go
View File

@ -51,7 +51,7 @@ type Relay struct {
challenges chan string // NIP-42 challenges
notices chan string // NIP-01 NOTICEs
okCallbacks *xsync.MapOf[string, func(bool, *string)]
okCallbacks *xsync.MapOf[string, func(bool, string)]
writeQueue chan writeRequest
subscriptionChannelCloseQueue chan *Subscription
@ -73,7 +73,7 @@ func NewRelay(ctx context.Context, url string, opts ...RelayOption) *Relay {
connectionContext: ctx,
connectionContextCancel: cancel,
Subscriptions: xsync.NewMapOf[*Subscription](),
okCallbacks: xsync.NewMapOf[func(bool, *string)](),
okCallbacks: xsync.NewMapOf[func(bool, string)](),
writeQueue: make(chan writeRequest),
subscriptionChannelCloseQueue: make(chan *Subscription),
}
@ -346,22 +346,17 @@ func (r *Relay) Publish(ctx context.Context, event Event) (Status, error) {
defer cancel()
// listen for an OK callback
okCallback := func(ok bool, msg *string) {
r.okCallbacks.Store(event.ID, func(ok bool, reason string) {
mu.Lock()
defer mu.Unlock()
if ok {
status = PublishStatusSucceeded
} else {
status = PublishStatusFailed
reason := ""
if msg != nil {
reason = *msg
}
err = fmt.Errorf("msg: %s", reason)
}
cancel()
}
r.okCallbacks.Store(event.ID, okCallback)
})
defer r.okCallbacks.Delete(event.ID)
// publish event
@ -410,22 +405,17 @@ func (r *Relay) Auth(ctx context.Context, event Event) (Status, error) {
defer cancel()
// listen for an OK callback
okCallback := func(ok bool, msg *string) {
r.okCallbacks.Store(event.ID, func(ok bool, reason string) {
mu.Lock()
if ok {
status = PublishStatusSucceeded
} else {
status = PublishStatusFailed
reason := ""
if msg != nil {
reason = *msg
}
err = fmt.Errorf("msg: %s", reason)
}
mu.Unlock()
cancel()
}
r.okCallbacks.Store(event.ID, okCallback)
})
defer r.okCallbacks.Delete(event.ID)
// send AUTH