nik/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/bbernhard/signal-cli-rest-api.git synced 2026-05-20 13:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

reformatted code with gofmt

Browse Source
This commit is contained in:
Bernhard B 2026-01-13 22:23:02 +01:00
parent 354df7472c
commit e5e21518a5
1 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/client/client.go
View File

@ -807,29 +807,29 @@ func (s *SignalClient) UnregisterNumber(number string, deleteAccount bool, delet
} }
func (s *SignalClient) DeleteLocalAccountData(number string, ignoreRegistered bool) error { func (s *SignalClient) DeleteLocalAccountData(number string, ignoreRegistered bool) error {
if s.signalCliMode == JsonRpc { if s.signalCliMode == JsonRpc {
type Request struct { type Request struct {
IgnoreRegistered bool `json:"ignore-registered,omitempty"` IgnoreRegistered bool `json:"ignore-registered,omitempty"`
} }
req := Request{} req := Request{}
if ignoreRegistered { if ignoreRegistered {
req.IgnoreRegistered = true req.IgnoreRegistered = true
} }
jsonRpc2Client, err := s.getJsonRpc2Client() jsonRpc2Client, err := s.getJsonRpc2Client()
if err != nil { if err != nil {
return err return err
} }
_, err = jsonRpc2Client.getRaw("deleteLocalAccountData", &number, req) _, err = jsonRpc2Client.getRaw("deleteLocalAccountData", &number, req)
return err return err
} else { } else {
cmd := []string{"--config", s.signalCliConfig, "-a", number, "deleteLocalAccountData"} cmd := []string{"--config", s.signalCliConfig, "-a", number, "deleteLocalAccountData"}
if ignoreRegistered { if ignoreRegistered {
cmd = append(cmd, "--ignore-registered") cmd = append(cmd, "--ignore-registered")
} }
_, err := s.cliClient.Execute(true, cmd, "") _, err := s.cliClient.Execute(true, cmd, "")
return err return err
} }
} }
func (s *SignalClient) VerifyRegisteredNumber(number string, token string, pin string) error { func (s *SignalClient) VerifyRegisteredNumber(number string, token string, pin string) error {
@ -1538,54 +1538,54 @@ func (s *SignalClient) GetQrCodeLink(deviceName string, qrCodeVersion int) ([]by
} }
func (s *SignalClient) GetDeviceLinkUri(deviceName string) (string, error) { func (s *SignalClient) GetDeviceLinkUri(deviceName string) (string, error) {
if s.signalCliMode == JsonRpc { if s.signalCliMode == JsonRpc {
type StartResponse struct { type StartResponse struct {
DeviceLinkUri string `json:"deviceLinkUri"` DeviceLinkUri string `json:"deviceLinkUri"`
} }
jsonRpc2Client, err := s.getJsonRpc2Client() jsonRpc2Client, err := s.getJsonRpc2Client()
if err != nil { if err != nil {
return "", err return "", err
} }
raw, err := jsonRpc2Client.getRaw("startLink", nil, struct{}{}) raw, err := jsonRpc2Client.getRaw("startLink", nil, struct{}{})
if err != nil { if err != nil {
return "", errors.New("Couldn't start link: " + err.Error()) return "", errors.New("Couldn't start link: " + err.Error())
} }
var resp StartResponse var resp StartResponse
if err := json.Unmarshal([]byte(raw), &resp); err != nil { if err := json.Unmarshal([]byte(raw), &resp); err != nil {
return "", errors.New("Couldn't parse startLink response: " + err.Error()) return "", errors.New("Couldn't parse startLink response: " + err.Error())
} }
// Complete the linking handshake in the background, just like GetQrCodeLink does. // Complete the linking handshake in the background, just like GetQrCodeLink does.
s.finishLinkAsync(jsonRpc2Client, deviceName, resp.DeviceLinkUri) s.finishLinkAsync(jsonRpc2Client, deviceName, resp.DeviceLinkUri)
return resp.DeviceLinkUri, nil return resp.DeviceLinkUri, nil
} }
cmd := []string{"--config", s.signalCliConfig, "link", "-n", deviceName} cmd := []string{"--config", s.signalCliConfig, "link", "-n", deviceName}
deviceLinkUri, err := s.cliClient.Execute(false, cmd, "") deviceLinkUri, err := s.cliClient.Execute(false, cmd, "")
if err != nil { if err != nil {
return "", errors.New("Couldn't create link URI: " + err.Error()) return "", errors.New("Couldn't create link URI: " + err.Error())
} }
return strings.TrimSpace(deviceLinkUri), nil return strings.TrimSpace(deviceLinkUri), nil
} }
func (s *SignalClient) finishLinkAsync(jsonRpc2Client *JsonRpc2Client, deviceName string, deviceLinkUri string) { func (s *SignalClient) finishLinkAsync(jsonRpc2Client *JsonRpc2Client, deviceName string, deviceLinkUri string) {
type finishRequest struct { type finishRequest struct {
DeviceLinkUri string `json:"deviceLinkUri"` DeviceLinkUri string `json:"deviceLinkUri"`
DeviceName string `json:"deviceName"` DeviceName string `json:"deviceName"`
} }
go func() { go func() {
req := finishRequest{DeviceLinkUri: deviceLinkUri, DeviceName: deviceName} req := finishRequest{DeviceLinkUri: deviceLinkUri, DeviceName: deviceName}
result, err := jsonRpc2Client.getRaw("finishLink", nil, &req) result, err := jsonRpc2Client.getRaw("finishLink", nil, &req)
if err != nil { if err != nil {
log.Debug("Error linking device: ", err.Error()) log.Debug("Error linking device: ", err.Error())
return return
} }
log.Debug("Linking device result: ", result) log.Debug("Linking device result: ", result)
s.signalCliApiConfig.Load(s.signalCliApiConfigPath) s.signalCliApiConfig.Load(s.signalCliApiConfigPath)
}() }()
} }
func (s *SignalClient) GetAccounts() ([]string, error) { func (s *SignalClient) GetAccounts() ([]string, error) {