Add ListConvsOnName

This function accepts functional options, and allows you to set an alternate home dir for keybase

chat.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"os/exec"
 	"time"
 
 	"samhofi.us/x/keybase/v2/types/chat1"
@@ -44,7 +45,7 @@ func getNewMessages(k *Keybase, subs *subscriptionChannels, execOptions []string
 
 		cmd = append(cmd, execString...)
 
-		execCmd := execCommand(k.ExePath, cmd...)
+		execCmd := exec.Command(k.ExePath, cmd...)
 		stdOut, _ := execCmd.StdoutPipe()
 		execCmd.Start()
 		scanner := bufio.NewScanner(stdOut)
@@ -753,35 +754,36 @@ func (k *Keybase) ListMembersOfConversation(convID chat1.ConvIDStr) (chat1.ChatM
 }
 
 // ListConvsOnName returns a list of all conversations for a chat1.ChatChannel
-func (k *Keybase) ListConvsOnName(channel chat1.ChatChannel) (*[]chat1.ConvSummary, error) {
+func (k *Keybase) ListConvsOnName(channel chat1.ChatChannel) ([]chat1.ConvSummary, error) {
-	type result struct {
-		Conversations []chat1.ConvSummary `json:"conversations"`
-	}
-
 	type res struct {
-		Result result `json:"result"`
+		Result []chat1.ConvSummary `json:"result"`
 		Error  *Error              `json:"error,omitempty"`
 	}
 
 	var r res
 
-	arg := newListConvsOnNameArg(channel)
+	opts := SendMessageOptions{
+		Channel: channel,
+	}
+
+	arg := newSendMessageArg(opts)
+	arg.Method = "listconvsonname"
 
 	jsonBytes, _ := json.Marshal(arg)
 
 	cmdOut, err := k.Exec("chat", "api", "-m", string(jsonBytes))
 	if err != nil {
-		return nil, err
+		return r.Result, err
 	}
 
 	err = json.Unmarshal(cmdOut, &r)
 	if err != nil {
-		return nil, err
+		return r.Result, err
 	}
 
 	if r.Error != nil {
-		return nil, fmt.Errorf("%v", r.Error.Message)
+		return r.Result, fmt.Errorf("%v", r.Error.Message)
 	}
 
-	return &r.Result.Conversations, nil
+	return r.Result, nil
 }

go.mod

@@ -1,3 +1,3 @@
-module samhofi.us/x/keybase
+module samhofi.us/x/keybase/v2
 
 go 1.13

keybase.go

@@ -9,9 +9,6 @@ import (
 	"samhofi.us/x/keybase/v2/types/chat1"
 )
 
-// Used for testing
-var execCommand = exec.Command
-
 // Possible MemberTypes
 const (
 	TEAM string = "team"
@@ -73,7 +70,7 @@ func (k *Keybase) Exec(command ...string) ([]byte, error) {
 
 	cmd = append(cmd, command...)
 
-	out, err := execCommand(k.ExePath, cmd...).Output()
+	out, err := exec.Command(k.ExePath, cmd...).Output()
 	if err != nil {
 		return []byte{}, err
 	}

types.go

@@ -114,7 +114,6 @@ type SendMessageOptions struct {
 	ReplyTo           *chat1.MessageID   `json:"reply_to,omitempty"`
 	ExplodingLifetime *ExplodingLifetime `json:"exploding_lifetime,omitempty"`
 	UnreadOnly        bool               `json:"unread_only,omitempty"`
-	NonBlock          bool               `json:"nonblock,omitempty"`
 }
 
 type sendMessageParams struct {
@@ -239,24 +238,6 @@ func newListMembersArg(options ListMembersOptions) listMembersArg {
 	}
 }
 
-type listConvsOnNameParams struct {
-	Options chat1.ChatChannel
-}
-
-type listConvsOnNameArg struct {
-	Method string
-	Params listConvsOnNameParams
-}
-
-func newListConvsOnNameArg(channel chat1.ChatChannel) listConvsOnNameArg {
-	return listConvsOnNameArg{
-		Method: "listconvsonname",
-		Params: listConvsOnNameParams{
-			Options: channel,
-		},
-	}
-}
-
 // KVOptions holds a set of options to be passed to the KV methods
 type KVOptions struct {
 	Team       *string `json:"team"`