highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-04-02 08:58:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

handle OK callbacks properly when there is not a "reason" (which is the expected behavior).

Browse Source
This commit is contained in:
fiatjaf 2023-06-26 21:00:33 -03:00
parent 1f38213b3f
commit 6b625f7896
No known key found for this signature in database
GPG Key ID: BAD43C4BE5C1A3A1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
relay.go
View File

@ -50,7 +50,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
@ -72,7 +72,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),
}
@ -301,7 +301,7 @@ func (r *Relay) Connect(ctx context.Context) error {
}
case *OKEnvelope:
if okCallback, exist := r.okCallbacks.Load(env.EventID); exist {
okCallback(env.OK, *env.Reason)
okCallback(env.OK, env.Reason)
}
}
}
@ -339,14 +339,18 @@ func (r *Relay) Publish(ctx context.Context, event Event) (Status, error) {
defer cancel()
// listen for an OK callback
okCallback := func(ok bool, msg string) {
okCallback := func(ok bool, msg *string) {
mu.Lock()
defer mu.Unlock()
if ok {
status = PublishStatusSucceeded
} else {
status = PublishStatusFailed
err = fmt.Errorf("msg: %s", msg)
reason := ""
if msg != nil {
reason = *msg
}
err = fmt.Errorf("msg: %s", reason)
}
cancel()
}
@ -399,13 +403,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) {
okCallback := func(ok bool, msg *string) {
mu.Lock()
if ok {
status = PublishStatusSucceeded
} else {
status = PublishStatusFailed
err = fmt.Errorf("msg: %s", msg)
reason := ""
if msg != nil {
reason = *msg
}
err = fmt.Errorf("msg: %s", reason)
}
mu.Unlock()
cancel()