diff --git a/src/api/api.go b/src/api/api.go index a0304fc..87ef717 100644 --- a/src/api/api.go +++ b/src/api/api.go @@ -39,8 +39,8 @@ type UpdateContactRequest struct { } type CreateGroupRequest struct { - Name string `json:"name"` - Members []string `json:"members"` + Name string `json:"name,omitempty"` + Members []string `json:"members,omitempty"` Description string `json:"description,omitempty"` Permissions ds.GroupPermissions `json:"permissions,omitempty"` GroupLinkState string `json:"group_link,omitempty" enums:"disabled,enabled,enabled-with-approval"` diff --git a/src/client/client.go b/src/client/client.go index d02eb36..55671ee 100644 --- a/src/client/client.go +++ b/src/client/client.go @@ -1080,8 +1080,8 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string, var internalGroupId string if s.signalCliMode == JsonRpc { type Request struct { - Name string `json:"name"` - Members []string `json:"members"` + Name string `json:"name,omitempty"` + Members []string `json:"members,omitempty"` Link string `json:"link,omitempty"` Description string `json:"description,omitempty"` EditGroupPermissions string `json:"setPermissionEditDetails,omitempty"` @@ -1135,8 +1135,16 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string, } internalGroupId = resp.GroupId } else { - cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-n", name, "-m"} - cmd = append(cmd, prefixUsernameMembers(members)...) + cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup"} + + if name != "" { + cmd = append(cmd, []string{"--n", name}...) + } + + if len(members) > 0 { + cmd = append(cmd, "-m") + cmd = append(cmd, prefixUsernameMembers(members)...) + } if addMembersPermission != DefaultGroupPermission { cmd = append(cmd, []string{"--set-permission-add-member", addMembersPermission.String()}...) diff --git a/src/docs/docs.go b/src/docs/docs.go index 97d27b8..d4e175d 100644 --- a/src/docs/docs.go +++ b/src/docs/docs.go @@ -2790,10 +2790,6 @@ const docTemplate = `{ }, "api.CreateGroupRequest": { "type": "object", - "required": [ - "members", - "name" - ], "properties": { "description": { "type": "string" diff --git a/src/docs/swagger.json b/src/docs/swagger.json index 62c99cc..e8fbd6f 100644 --- a/src/docs/swagger.json +++ b/src/docs/swagger.json @@ -2787,10 +2787,6 @@ }, "api.CreateGroupRequest": { "type": "object", - "required": [ - "members", - "name" - ], "properties": { "description": { "type": "string" diff --git a/src/docs/swagger.yaml b/src/docs/swagger.yaml index 6e5bc71..0d10fc6 100644 --- a/src/docs/swagger.yaml +++ b/src/docs/swagger.yaml @@ -76,9 +76,6 @@ definitions: type: string permissions: $ref: '#/definitions/data.GroupPermissions' - required: - - members - - name type: object api.CreateGroupResponse: properties: