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

remove HTML escaping from (easy)json encoder everywhere.

Browse Source
This commit is contained in:
fiatjaf
2024-11-11 22:55:07 -03:00
parent b62678e606
commit a0bf181547
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
envelopes.go
View File

@@ -91,7 +91,7 @@ func (v *EventEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v EventEnvelope) MarshalJSON() ([]byte, error) { func (v EventEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["EVENT",`) w.RawString(`["EVENT",`)
if v.SubscriptionID != nil { if v.SubscriptionID != nil {
w.RawString(`"` + *v.SubscriptionID + `",`) w.RawString(`"` + *v.SubscriptionID + `",`)
@@ -128,7 +128,7 @@ func (v *ReqEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v ReqEnvelope) MarshalJSON() ([]byte, error) { func (v ReqEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["REQ",`) w.RawString(`["REQ",`)
w.RawString(`"` + v.SubscriptionID + `"`) w.RawString(`"` + v.SubscriptionID + `"`)
for _, filter := range v.Filters { for _, filter := range v.Filters {
@@ -183,7 +183,7 @@ func (v *CountEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v CountEnvelope) MarshalJSON() ([]byte, error) { func (v CountEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["COUNT",`) w.RawString(`["COUNT",`)
w.RawString(`"` + v.SubscriptionID + `"`) w.RawString(`"` + v.SubscriptionID + `"`)
if v.Count != nil { if v.Count != nil {
@@ -219,7 +219,7 @@ func (v *NoticeEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v NoticeEnvelope) MarshalJSON() ([]byte, error) { func (v NoticeEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["NOTICE",`) w.RawString(`["NOTICE",`)
w.Raw(json.Marshal(string(v))) w.Raw(json.Marshal(string(v)))
w.RawString(`]`) w.RawString(`]`)
@@ -245,7 +245,7 @@ func (v *EOSEEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v EOSEEnvelope) MarshalJSON() ([]byte, error) { func (v EOSEEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["EOSE",`) w.RawString(`["EOSE",`)
w.Raw(json.Marshal(string(v))) w.Raw(json.Marshal(string(v)))
w.RawString(`]`) w.RawString(`]`)
@@ -273,7 +273,7 @@ func (v *CloseEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v CloseEnvelope) MarshalJSON() ([]byte, error) { func (v CloseEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["CLOSE",`) w.RawString(`["CLOSE",`)
w.Raw(json.Marshal(string(v))) w.Raw(json.Marshal(string(v)))
w.RawString(`]`) w.RawString(`]`)
@@ -304,7 +304,7 @@ func (v *ClosedEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v ClosedEnvelope) MarshalJSON() ([]byte, error) { func (v ClosedEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["CLOSED",`) w.RawString(`["CLOSED",`)
w.Raw(json.Marshal(string(v.SubscriptionID))) w.Raw(json.Marshal(string(v.SubscriptionID)))
w.RawString(`,`) w.RawString(`,`)
@@ -339,7 +339,7 @@ func (v *OKEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v OKEnvelope) MarshalJSON() ([]byte, error) { func (v OKEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["OK",`) w.RawString(`["OK",`)
w.RawString(`"` + v.EventID + `",`) w.RawString(`"` + v.EventID + `",`)
ok := "false" ok := "false"
@@ -379,7 +379,7 @@ func (v *AuthEnvelope) UnmarshalJSON(data []byte) error {
} }
func (v AuthEnvelope) MarshalJSON() ([]byte, error) { func (v AuthEnvelope) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
w.RawString(`["AUTH",`) w.RawString(`["AUTH",`)
if v.Challenge != nil { if v.Challenge != nil {
w.Raw(json.Marshal(*v.Challenge)) w.Raw(json.Marshal(*v.Challenge))

3
event_easyjson.go
View File

@@ -169,13 +169,14 @@ func easyjsonF642ad3eEncodeGithubComNbdWtfGoNostr(out *jwriter.Writer, in Event)
// MarshalJSON supports json.Marshaler interface // MarshalJSON supports json.Marshaler interface
func (v Event) MarshalJSON() ([]byte, error) { func (v Event) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
easyjsonF642ad3eEncodeGithubComNbdWtfGoNostr(&w, v) easyjsonF642ad3eEncodeGithubComNbdWtfGoNostr(&w, v)
return w.Buffer.BuildBytes(), w.Error return w.Buffer.BuildBytes(), w.Error
} }
// MarshalEasyJSON supports easyjson.Marshaler interface // MarshalEasyJSON supports easyjson.Marshaler interface
func (v Event) MarshalEasyJSON(w *jwriter.Writer) { func (v Event) MarshalEasyJSON(w *jwriter.Writer) {
w.NoEscapeHTML = true
easyjsonF642ad3eEncodeGithubComNbdWtfGoNostr(w, v) easyjsonF642ad3eEncodeGithubComNbdWtfGoNostr(w, v)
} }

3
filter_easyjson.go
View File

@@ -288,13 +288,14 @@ func easyjson4d398eaaEncodeGithubComNbdWtfGoNostr(out *jwriter.Writer, in Filter
// MarshalJSON supports json.Marshaler interface // MarshalJSON supports json.Marshaler interface
func (v Filter) MarshalJSON() ([]byte, error) { func (v Filter) MarshalJSON() ([]byte, error) {
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
easyjson4d398eaaEncodeGithubComNbdWtfGoNostr(&w, v) easyjson4d398eaaEncodeGithubComNbdWtfGoNostr(&w, v)
return w.Buffer.BuildBytes(), w.Error return w.Buffer.BuildBytes(), w.Error
} }
// MarshalEasyJSON supports easyjson.Marshaler interface // MarshalEasyJSON supports easyjson.Marshaler interface
func (v Filter) MarshalEasyJSON(w *jwriter.Writer) { func (v Filter) MarshalEasyJSON(w *jwriter.Writer) {
w.NoEscapeHTML = true
easyjson4d398eaaEncodeGithubComNbdWtfGoNostr(w, v) easyjson4d398eaaEncodeGithubComNbdWtfGoNostr(w, v)
} }

2
nip77/envelopes.go
View File

@@ -75,7 +75,7 @@ func (v OpenEnvelope) MarshalJSON() ([]byte, error) {
res.WriteString(v.SubscriptionID) res.WriteString(v.SubscriptionID)
res.WriteString(`",`) res.WriteString(`",`)
w := jwriter.Writer{} w := jwriter.Writer{NoEscapeHTML: true}
v.Filter.MarshalEasyJSON(&w) v.Filter.MarshalEasyJSON(&w)
w.Buffer.DumpTo(res) w.Buffer.DumpTo(res)