laantungir
/
nak
mirror of https://github.com/fiatjaf/nak.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix getStdinLinesOrFirstArgument

This commit is contained in:
Yasuhiro Matsumoto 2024-02-03 15:10:25 +09:00
parent 982f1e2dda
commit a657f49920
No known key found for this signature in database
GPG Key ID: 622DE34DC490584B
5 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decode.go
View File

@ -33,7 +33,7 @@ var decode = &cli.Command{
},
ArgsUsage: "<npub | nprofile | nip05 | nevent | naddr | nsec>",
Action: func(c *cli.Context) error {
for input := range getStdinLinesOrFirstArgument(c) {
for input := range getStdinLinesOrFirstArgument(c.Args().First()) {
if strings.HasPrefix(input, "nostr:") {
input = input[6:]
}

10
encode.go
View File

@ -29,7 +29,7 @@ var encode = &cli.Command{
Name: "npub",
Usage: "encode a hex public key into bech32 'npub' format",
Action: func(c *cli.Context) error {
for target := range getStdinLinesOrFirstArgument(c) {
for target := range getStdinLinesOrFirstArgument(c.Args().First()) {
if ok := nostr.IsValidPublicKey(target); !ok {
lineProcessingError(c, "invalid public key: %s", target)
continue
@ -50,7 +50,7 @@ var encode = &cli.Command{
Name: "nsec",
Usage: "encode a hex private key into bech32 'nsec' format",
Action: func(c *cli.Context) error {
for target := range getStdinLinesOrFirstArgument(c) {
for target := range getStdinLinesOrFirstArgument(c.Args().First()) {
if ok := nostr.IsValid32ByteHex(target); !ok {
lineProcessingError(c, "invalid private key: %s", target)
continue
@ -78,7 +78,7 @@ var encode = &cli.Command{
},
},
Action: func(c *cli.Context) error {
for target := range getStdinLinesOrFirstArgument(c) {
for target := range getStdinLinesOrFirstArgument(c.Args().First()) {
if ok := nostr.IsValid32ByteHex(target); !ok {
lineProcessingError(c, "invalid public key: %s", target)
continue
@ -115,7 +115,7 @@ var encode = &cli.Command{
},
},
Action: func(c *cli.Context) error {
for target := range getStdinLinesOrFirstArgument(c) {
for target := range getStdinLinesOrFirstArgument(c.Args().First()) {
if ok := nostr.IsValid32ByteHex(target); !ok {
lineProcessingError(c, "invalid event id: %s", target)
continue
@ -212,7 +212,7 @@ var encode = &cli.Command{
Name: "note",
Usage: "generate note1 event codes (not recommended)",
Action: func(c *cli.Context) error {
for target := range getStdinLinesOrFirstArgument(c) {
for target := range getStdinLinesOrFirstArgument(c.Args().First()) {
if ok := nostr.IsValid32ByteHex(target); !ok {
lineProcessingError(c, "invalid event id: %s", target)
continue

2
fetch.go
View File

@ -31,7 +31,7 @@ var fetch = &cli.Command{
})
}()
for code := range getStdinLinesOrFirstArgument(c) {
for code := range getStdinLinesOrFirstArgument(c.Args().First()) {
filter := nostr.Filter{}
prefix, value, err := nip19.Decode(code)

7
helpers.go
View File

@ -47,12 +47,11 @@ func getStdinLinesOrBlank() chan string {
}
}
func getStdinLinesOrFirstArgument(c *cli.Context) chan string {
func getStdinLinesOrFirstArgument(arg string) chan string {
// try the first argument
target := c.Args().First()
if target != "" {
if arg != "" {
single := make(chan string, 1)
single <- target
single <- arg
close(single)
return single
}

23
key.go
View File

@ -65,7 +65,13 @@ var encrypt = &cli.Command{
},
},
Action: func(c *cli.Context) error {
password := c.Args().Get(1)
var password string
switch c.Args().Len() {
case 1:
password = c.Args().Get(0)
case 2:
password = c.Args().Get(1)
}
if password == "" {
return fmt.Errorf("no password given")
}
@ -87,11 +93,20 @@ var decrypt = &cli.Command{
Description: `uses the NIP-49 standard.`,
ArgsUsage: "<ncryptsec-code> <password>",
Action: func(c *cli.Context) error {
password := c.Args().Get(1)
var content string
var password string
switch c.Args().Len() {
case 1:
content = ""
password = c.Args().Get(0)
case 2:
content = c.Args().Get(0)
password = c.Args().Get(1)
}
if password == "" {
return fmt.Errorf("no password given")
}
for ncryptsec := range getStdinLinesOrFirstArgument(c) {
for ncryptsec := range getStdinLinesOrFirstArgument(content) {
sec, err := nip49.Decrypt(ncryptsec, password)
if err != nil {
lineProcessingError(c, "failed to decrypt: %s", err)
@ -107,7 +122,7 @@ var decrypt = &cli.Command{
func getSecretKeyFromStdinLinesOrFirstArgument(c *cli.Context) chan string {
ch := make(chan string)
go func() {
for sec := range getStdinLinesOrFirstArgument(c) {
for sec := range getStdinLinesOrFirstArgument(c.Args().First()) {
if sec == "" {
continue
}