From 932361fe8f3021afb2a8fcfa084f9eed2c3ecc1b Mon Sep 17 00:00:00 2001 From: redraw Date: Mon, 2 Dec 2024 10:00:52 -0300 Subject: [PATCH] fix(decode): handle event id flag --- decode.go | 10 +++++++++- example_test.go | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/decode.go b/decode.go index 314628d..561ba92 100644 --- a/decode.go +++ b/decode.go @@ -56,11 +56,15 @@ var decode = &cli.Command{ } } else if evp := sdk.InputToEventPointer(input); evp != nil { decodeResult = DecodeResult{EventPointer: evp} + if c.Bool("id") { + stdout(evp.ID) + continue + } } else if pp := sdk.InputToProfile(ctx, input); pp != nil { decodeResult = DecodeResult{ProfilePointer: pp} if c.Bool("pubkey") { stdout(pp.PublicKey) - return nil + continue } } else if prefix, value, err := nip19.Decode(input); err == nil && prefix == "naddr" { if ep, ok := value.(nostr.EntityPointer); ok { @@ -76,6 +80,10 @@ var decode = &cli.Command{ continue } + if c.Bool("pubkey") || c.Bool("id") { + return nil + } + stdout(decodeResult.JSON()) } diff --git a/example_test.go b/example_test.go index bc2ae33..e77c4eb 100644 --- a/example_test.go +++ b/example_test.go @@ -68,9 +68,17 @@ func ExampleDecode() { } func ExampleDecodePubkey() { - app.Run(ctx, []string{"nak", "decode", "-p", "npub10xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqpkge6d"}) + app.Run(ctx, []string{"nak", "decode", "-p", "npub10xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqpkge6d", "npub1ccz8l9zpa47k6vz9gphftsrumpw80rjt3nhnefat4symjhrsnmjs38mnyd"}) // Output: // 79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 + // c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5 +} + +func ExampleDecodeEventId() { + app.Run(ctx, []string{"nak", "decode", "-e", "nevent1qyd8wumn8ghj7urewfsk66ty9enxjct5dfskvtnrdakj7qgmwaehxw309aex2mrp0yh8wetnw3jhymnzw33jucm0d5hszxthwden5te0wfjkccte9eekummjwsh8xmmrd9skctcpzamhxue69uhkzarvv9ejumn0wd68ytnvv9hxgtcqyqllp5v5j0nxr74fptqxkhvfv0h3uj870qpk3ln8a58agyxl3fka296ewr8", "nevent1qqswh48lurxs8u0pll9qj2rzctvjncwhstpzlstq59rdtzlty79awns5hl5uf"}) + // Output: + // 3ff0d19493e661faa90ac06b5d8963ef1e48fe780368fe67ed0fd410df8a6dd5 + // ebd4ffe0cd03f1e1ffca092862c2d929e1d782c22fc160a146d58beb278bd74e } func ExampleReq() {