signald/signald-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

breaking change: Listen() now returns BasicResponse

Browse source
This commit is contained in:
finn 2022-01-17 18:15:23 -08:00
parent dd56e3d6f7
commit e454d63249
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
signald/client-protocol/protocol.go
View file

@ -2,6 +2,7 @@ package client_protocol
import ( import (
"encoding/json" "encoding/json"
) )
type BasicResponse struct { type BasicResponse struct {
@ -10,4 +11,5 @@ type BasicResponse struct {
ErrorType string ErrorType string
Error json.RawMessage Error json.RawMessage
Data json.RawMessage Data json.RawMessage
} Account string
}

10
signald/signald.go
View file

@ -29,7 +29,6 @@ import (
"time" "time"
client_protocol "gitlab.com/signald/signald-go/signald/client-protocol" client_protocol "gitlab.com/signald/signald-go/signald/client-protocol"
"gitlab.com/signald/signald-go/signald/client-protocol/v0"
) )
const ( const (
@ -101,7 +100,7 @@ func (s *Signald) connect() error {
} }
// Listen listens for events from signald // Listen listens for events from signald
func (s *Signald) Listen(c chan v0.LegacyResponse) { func (s *Signald) Listen(c chan client_protocol.BasicResponse) {
for { for {
msg, err := s.readNext() msg, err := s.readNext()
if err == io.EOF { if err == io.EOF {
@ -127,12 +126,7 @@ func (s *Signald) Listen(c chan v0.LegacyResponse) {
} }
if c != nil { if c != nil {
legacyResponse := v0.LegacyResponse{ID: msg.ID, Type: msg.Type} c <- msg
if err := json.Unmarshal(msg.Data, &legacyResponse.Data); err != nil {
log.Println("signald-go receive error: ", err)
} else {
c <- legacyResponse
}
} }
} }
} }