aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-21 00:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug in create group endpoint

Browse Source 
* the group id of the newly created signal group wasn't correctly
  returned in json-rpc mode.
This commit is contained in:
Bernhard B
2021-10-20 19:16:09 +02:00
parent 6c28b782fa
commit 405b7f0f9e
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/client/client.go
View File

@@ -595,8 +595,7 @@ func (s *SignalClient) Receive(number string, timeout int64) (string, error) {
} }
func (s *SignalClient) CreateGroup(number string, name string, members []string, description string, editGroupPermission GroupPermission, addMembersPermission GroupPermission, groupLinkState GroupLinkState) (string, error) { func (s *SignalClient) CreateGroup(number string, name string, members []string, description string, editGroupPermission GroupPermission, addMembersPermission GroupPermission, groupLinkState GroupLinkState) (string, error) {
var err error var internalGroupId string
var rawData string
if s.signalCliMode == JsonRpc { if s.signalCliMode == JsonRpc {
type Request struct { type Request struct {
Name string `json:"name"` Name string `json:"name"`
@@ -608,10 +607,21 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string,
if err != nil { if err != nil {
return "", err return "", err
} }
rawData, err = jsonRpc2Client.getRaw("updateGroup", request) rawData, err := jsonRpc2Client.getRaw("updateGroup", request)
if err != nil { if err != nil {
return "", err return "", err
} }
type Response struct {
GroupId string `json:"groupId"`
Timestamp int64 `json:"timestamp"`
}
var resp Response
json.Unmarshal([]byte(rawData), &resp)
if err != nil {
return "", err
}
internalGroupId = resp.GroupId
} else { } else {
cmd := []string{"--config", s.signalCliConfig, "-u", number, "updateGroup", "-n", name, "-m"} cmd := []string{"--config", s.signalCliConfig, "-u", number, "updateGroup", "-n", name, "-m"}
cmd = append(cmd, members...) cmd = append(cmd, members...)
@@ -632,15 +642,15 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string,
cmd = append(cmd, []string{"--description", description}...) cmd = append(cmd, []string{"--description", description}...)
} }
rawData, err = runSignalCli(true, cmd, "", s.signalCliMode) rawData, err := runSignalCli(true, cmd, "", s.signalCliMode)
if err != nil { if err != nil {
if strings.Contains(err.Error(), signalCliV2GroupError) { if strings.Contains(err.Error(), signalCliV2GroupError) {
return "", errors.New("Cannot create group - please first update your profile.") return "", errors.New("Cannot create group - please first update your profile.")
} }
return "", err return "", err
} }
internalGroupId = getStringInBetween(rawData, `"`, `"`)
} }
internalGroupId := getStringInBetween(rawData, `"`, `"`)
groupId := convertInternalGroupIdToGroupId(internalGroupId) groupId := convertInternalGroupIdToGroupId(internalGroupId)
return groupId, nil return groupId, nil