highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-07-07 14:49:56 +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

15
envelopes.go
View File

@ -268,7 +268,7 @@ func (v CloseEnvelope) MarshalJSON() ([]byte, error) {
type OKEnvelope struct {
EventID string
OK bool
Reason *string
Reason string
}
func (_ OKEnvelope) Label() string { return "OK" }
@ -276,15 +276,12 @@ func (_ OKEnvelope) Label() string { return "OK" }
func (v *OKEnvelope) UnmarshalJSON(data []byte) error {
r := gjson.ParseBytes(data)
arr := r.Array()
if len(arr) < 3 {
if len(arr) < 4 {
return fmt.Errorf("failed to decode OK envelope: missing fields")
}
v.EventID = arr[1].Str
v.OK = arr[2].Raw == "true"
if len(arr) > 3 {
v.Reason = &arr[3].Str
}
v.Reason = arr[3].Str
return nil
}
@ -298,10 +295,8 @@ func (v OKEnvelope) MarshalJSON() ([]byte, error) {
ok = "true"
}
w.RawString(ok)
if v.Reason != nil {
w.RawString(`,`)
w.Raw(json.Marshal(v.Reason))
}
w.RawString(`,`)
w.Raw(json.Marshal(v.Reason))
w.RawString(`]`)
return w.BuildBytes()
}