Merge pull request #13 from keybase/david/add-new-apis

Add three new methods to the kbchat object

kbchat/kbchat.go

@@ -580,6 +580,47 @@ func (a *API) GetUsername() string {
 	return a.username
 }
 
+func (a *API) ListChannels(teamName string) ([]string, error) {
+	apiInput := fmt.Sprintf(`{"method": "listconvsonname", "params": {"options": {"topic_type": "CHAT", "members_type": "team", "name": "%s"}}}`, teamName)
+	output, err := a.doFetch(apiInput)
+	if err != nil {
+		return nil, err
+	}
+
+	var channelsList ChannelsList
+	inboxRaw := output.Text()
+	if err := json.Unmarshal([]byte(inboxRaw[:]), &channelsList); err != nil {
+		return nil, err
+	}
+
+	var channels []string
+	for _, conv := range channelsList.Result.Convs {
+		channels = append(channels, conv.Channel.TopicName)
+	}
+	return channels, nil
+}
+
+func (a *API) JoinChannel(teamName string, channelName string) (JoinChannelResult, error) {
+	empty := JoinChannelResult{}
+
+	apiInput := fmt.Sprintf(`{"method": "join", "params": {"options": {"channel": {"name": "%s", "members_type": "team", "topic_name": "%s"}}}}`, teamName, channelName)
+	output, err := a.doFetch(apiInput)
+	if err != nil {
+		return empty, err
+	}
+
+	joinChannel := JoinChannel{}
+	err = json.Unmarshal([]byte(output.Text()[:]), &joinChannel)
+	if err != nil {
+		return empty, fmt.Errorf("failed to parse output from keybase team api: %v", err)
+	}
+	if joinChannel.Error.Message != "" {
+		return empty, fmt.Errorf("received error from keybase team api: %s", joinChannel.Error.Message)
+	}
+
+	return joinChannel.Result, nil
+}
+
 func (a *API) LogSend(feedback string) error {
 	feedback = "go-keybase-chat-bot log send\n" +
 		"username: " + a.GetUsername() + "\n" +

kbchat/team.go

@@ -0,0 +1,89 @@
+package kbchat
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+type ListTeamMembers struct {
+	Result ListTeamMembersResult `json:"result"`
+	Error  Error             `json:"error"`
+}
+
+type ListTeamMembersResult struct {
+	Members ListTeamMembersResultMembers `json:"members"`
+}
+
+type ListTeamMembersResultMembers struct {
+	Owners  []ListMembersOutputMembersCategory `json:"owners"`
+	Admins  []ListMembersOutputMembersCategory `json:"admins"`
+	Writers []ListMembersOutputMembersCategory `json:"writers"`
+	Readers []ListMembersOutputMembersCategory `json:"readers"`
+}
+
+type ListMembersOutputMembersCategory struct {
+	Username string `json:"username"`
+	FullName string `json:"fullName"`
+}
+
+type ListUserMemberships struct {
+	Result ListUserMembershipsResult `json:"result"`
+	Error  Error             `json:"error"`
+}
+
+type ListUserMembershipsResult struct {
+	Teams []ListUserMembershipsResultTeam `json:"teams"`
+}
+
+type ListUserMembershipsResultTeam struct {
+	TeamName string `json:"fq_name"`
+	IsImplicitTeam bool `json:"is_implicit_team"`
+	IsOpenTeam bool `json:"is_open_team"`
+	Role int `json:"role"`
+	MemberCount int `json:"member_count"`
+}
+
+func (a *API) ListMembersOfTeam(teamName string) (ListTeamMembersResultMembers, error) {
+	empty := ListTeamMembersResultMembers{}
+
+	apiInput := fmt.Sprintf(`{"method": "list-team-memberships", "params": {"options": {"team": "%s"}}}`, teamName)
+	cmd := a.runOpts.Command("team", "api")
+	cmd.Stdin = strings.NewReader(apiInput)
+	bytes, err := cmd.CombinedOutput()
+	if err != nil {
+		return empty, fmt.Errorf("failed to call keybase team api: %v", err)
+	}
+
+	members := ListTeamMembers{}
+	err = json.Unmarshal(bytes, &members)
+	if err != nil {
+		return empty, fmt.Errorf("failed to parse output from keybase team api: %v", err)
+	}
+	if members.Error.Message != "" {
+		return empty, fmt.Errorf("received error from keybase team api: %s", members.Error.Message)
+	}
+	return members.Result.Members, nil
+}
+
+func (a *API) ListUserMemberships(username string) ([]ListUserMembershipsResultTeam, error) {
+	empty := []ListUserMembershipsResultTeam{}
+
+	apiInput := fmt.Sprintf(`{"method": "list-user-memberships", "params": {"options": {"username": "%s"}}}`, username)
+	cmd := a.runOpts.Command("team", "api")
+	cmd.Stdin = strings.NewReader(apiInput)
+	bytes, err := cmd.CombinedOutput()
+	if err != nil {
+		return empty, fmt.Errorf("failed to call keybase team api: %v", err)
+	}
+
+	members := ListUserMemberships{}
+	err = json.Unmarshal(bytes, &members)
+	if err != nil {
+		return empty, fmt.Errorf("failed to parse output from keybase team api: %v", err)
+	}
+	if members.Error.Message != "" {
+		return empty, fmt.Errorf("received error from keybase team api: %s", members.Error.Message)
+	}
+	return members.Result.Teams, nil
+}

kbchat/types.go

@@ -45,6 +45,10 @@ type Inbox struct {
 	Result Result `json:"result"`
 }
 
+type ChannelsList struct {
+	Result Result `json:"result"`
+}
+
 type MsgPaymentDetails struct {
 	ResultType int    `json:"resultTyp"` // 0 good. 1 error
 	PaymentID  string `json:"sent"`
@@ -123,3 +127,24 @@ type Advertisement struct {
 	Alias          string `json:"alias,omitempty"`
 	Advertisements []CommandsAdvertisement
 }
+
+type Error struct {
+	Code int `json:"code"`
+	Message string `json:"message"`
+}
+
+type JoinChannel struct {
+	Error Error `json:"error"`
+	Result JoinChannelResult `json:"result"`
+}
+
+type JoinChannelResult struct {
+	RateLimit RateLimit `json:"ratelimits"`
+}
+
+type RateLimit struct {
+	Tank string `json:"tank"`
+	Capacity int `json:"capacity"`
+	Reset int `json:"reset"`
+	Gas int `json:"gas"`
+}