From a0c3390da3ccb41c67714e030c0fb8386feeb5e6 Mon Sep 17 00:00:00 2001 From: Finn Date: Mon, 8 Oct 2018 21:41:44 -0700 Subject: [PATCH] Add linking support --- cmd/signald-cli/cmd/link.go | 70 +++++++++++++++++++++++++++++++++++++ signald/signaldresponse.go | 5 ++- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 cmd/signald-cli/cmd/link.go diff --git a/cmd/signald-cli/cmd/link.go b/cmd/signald-cli/cmd/link.go new file mode 100644 index 0000000..0ce0180 --- /dev/null +++ b/cmd/signald-cli/cmd/link.go @@ -0,0 +1,70 @@ +// Copyright © 2018 Finn Herzfeld +// +// 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 . + +package cmd + +import ( + "fmt" + "log" + "math/rand" + "os" + + "github.com/mdp/qrterminal" + "github.com/spf13/cobra" + + "git.callpipe.com/finn/signald-go/signald" +) + +var uriOrQR bool + +// linkCmd represents the link command +var linkCmd = &cobra.Command{ + Use: "link", + Short: "Link to an existing Signal account", + Long: `Get a URI or QR code to link to an existing Signal account`, + Run: func(cmd *cobra.Command, args []string) { + requestID := fmt.Sprint("signald-cli-", rand.Intn(1000)) + s.SendRequest(signald.Request{ + Type: "link", + ID: requestID, + }) + + c := make(chan signald.Response) + go s.Listen(c) + for { + message := <-c + if message.ID == requestID { + switch message.Type { + case "linking_error": + log.Fatal(message.Data.Message) + os.Exit(1) + break + + case "linking_uri": + if uriOrQR { + fmt.Println(message.Data.URI) + } else { + qrterminal.Generate(message.Data.URI, qrterminal.M, os.Stdout) + } + } + } + } + }, +} + +func init() { + RootCmd.AddCommand(linkCmd) + linkCmd.Flags().BoolVarP(&uriOrQR, "uri", "u", false, "Print a URI instead of a QR code.") +} diff --git a/signald/signaldresponse.go b/signald/signaldresponse.go index 5b49df1..3f319d4 100644 --- a/signald/signaldresponse.go +++ b/signald/signaldresponse.go @@ -4,11 +4,14 @@ package signald type Response struct { ID string Data ResponseData + Type string } // ResponseData is where most of the data in the response is stored. type ResponseData struct { - Groups []Group + Groups []Group + URI string + Message string } // Group represents a group in signal