listGroups command

and a light sprinkling of gofmt

cmd/signald-cli/cmd/listGroups.go

@@ -0,0 +1,59 @@
+// Copyright © 2018 Finn Herzfeld <finn@janky.solutions>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package cmd
+
+import (
+	"fmt"
+	"math/rand"
+
+	"github.com/spf13/cobra"
+
+	"git.callpipe.com/finn/signald-go/signald"
+)
+
+// listGroupsCmd represents the listGroups command
+var listGroupsCmd = &cobra.Command{
+	Use:   "listGroups",
+	Short: "list of all the groups that the user is in.",
+	Long:  `Prints a list of all groups the user is in to stdout.`,
+	Run: func(cmd *cobra.Command, args []string) {
+		requestID := fmt.Sprint("signald-cli-", rand.Intn(1000))
+		s.SendRequest(signald.Request{
+			Type:      "list_groups",
+			Username:  username,
+			ID: requestID,
+		})
+
+		c := make(chan signald.Response)
+		go s.Listen(c)
+		for {
+			message := <- c
+			if message.ID == requestID {
+				for _, group := range message.Data.Groups {
+					fmt.Println(group.Name)
+				}
+				break
+			}
+		}
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(listGroupsCmd)
+
+	listGroupsCmd.Flags().StringVarP(&username, "username", "u", "", "The username of the account to use)")
+	listGroupsCmd.MarkFlagRequired("username")
+}

cmd/signald-cli/cmd/send.go

@@ -24,21 +24,21 @@ import (
 )
 
 var (
-	username string
+	username    string
-	toUser string
+	toUser      string
-	toGroup string
+	toGroup     string
 	messageBody string
-	attachment string
+	attachment  string
 )
 
 // sendCmd represents the send command
 var sendCmd = &cobra.Command{
 	Use:   "send",
 	Short: "send a message to another user or group",
-	Long: `send a message to another user or group on Signal`,
+	Long:  `send a message to another user or group on Signal`,
 	Run: func(cmd *cobra.Command, args []string) {
 		request := signald.Request{
-			Type:  "send",
+			Type:     "send",
 			Username: username,
 		}
 

signald/signald.go

@@ -45,15 +45,14 @@ func (s *Signald) Connect() {
 }
 
 // Listen listens for events from signald
-func (s *Signald) Listen(c chan interface{}) {
+func (s *Signald) Listen(c chan Response) {
 	// we create a decoder that reads directly from the socket
 	d := json.NewDecoder(s.socket)
 
-	var msg interface{}
+	var msg Response
 
 	for {
 		crash(d.Decode(&msg))
-		log.Print(msg)
 		c <- msg
 	}
 }

signald/signaldresponse.go

@@ -0,0 +1,20 @@
+package signald
+
+// Response is a response to a request to signald, or a new inbound message
+type Response struct {
+	ID   string
+	Data ResponseData
+}
+
+// ResponseData is where most of the data in the response is stored.
+type ResponseData struct {
+	Groups []Group
+}
+
+// Group represents a group in signal
+type Group struct {
+	GroupID  string
+	Members  []string
+	Name     string
+	AvatarID int
+}