diff --git a/event.go b/event.go index 8c143dd..6925f17 100644 --- a/event.go +++ b/event.go @@ -9,7 +9,9 @@ import ( "strings" "time" + "github.com/mailru/easyjson" "github.com/nbd-wtf/go-nostr" + "github.com/nbd-wtf/go-nostr/nson" "github.com/urfave/cli/v2" ) @@ -33,6 +35,10 @@ standalone: Name: "envelope", Usage: "print the event enveloped in a [\"EVENT\", ...] message ready to be sent to a relay", }, + &cli.BoolFlag{ + Name: "nson", + Usage: "encode the event using NSON", + }, &cli.IntFlag{ Name: "kind", Aliases: []string{"k"}, @@ -144,8 +150,11 @@ standalone: if c.Bool("envelope") { j, _ := json.Marshal([]any{"EVENT", evt}) result = string(j) + } else if c.Bool("nson") { + result, _ = nson.Marshal(&evt) } else { - result = evt.String() + j, _ := easyjson.Marshal(&evt) + result = string(j) } fmt.Println(result) } diff --git a/go.mod b/go.mod index c6be1f9..f423dd8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,8 @@ module github.com/fiatjaf/nak go 1.20 require ( - github.com/nbd-wtf/go-nostr v0.19.1 + github.com/mailru/easyjson v0.7.7 + github.com/nbd-wtf/go-nostr v0.19.2 github.com/urfave/cli/v2 v2.25.3 ) @@ -18,7 +19,6 @@ require ( github.com/gobwas/pool v0.2.1 // indirect github.com/gobwas/ws v1.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect - github.com/mailru/easyjson v0.7.7 // indirect github.com/puzpuzpuz/xsync v1.5.2 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/tidwall/gjson v1.14.4 // indirect diff --git a/go.sum b/go.sum index 2af37b0..6169c94 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlT github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/nbd-wtf/go-nostr v0.19.1 h1:Nbw8QEmy54qe/FqIuSzcOSW2M6B5gC5+DK02QBsm/D4= -github.com/nbd-wtf/go-nostr v0.19.1/go.mod h1:F9y6+M8askJCjilLgMC3rD0moA6UtG1MCnyClNYXeys= +github.com/nbd-wtf/go-nostr v0.19.2 h1:Oofhe5+EKvf74fZQmYyX5G4RS74/na1aNabsB/cW9b4= +github.com/nbd-wtf/go-nostr v0.19.2/go.mod h1:F9y6+M8askJCjilLgMC3rD0moA6UtG1MCnyClNYXeys= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=