Merge d09a9667498ac6663d7239bccc204a203acabf9a into f159947e07f8aed075f2060e65fcc74d68d8c027

Mark name and members as optional fields in CreateGroupRequest

.github/workflows/ci.yml

@@ -4,9 +4,22 @@ on:
   push:
     branches:
       - '**' #every branch
+    paths-ignore:
+      - "*/*.md"
+      - "*/*.yml"
+      - "doc/**"
+      - "plugins/**"
+      - ".github/**"
   pull_request:
     branches:
       - '**' #every branch
+    paths-ignore:
+      - "*/*.md"
+      - "*/*.yml"
+      - "doc/**"
+      - "plugins/**"
+      - ".github/**"
+      
 
 jobs:
   setup:

src/api/api.go

@@ -39,8 +39,8 @@ type UpdateContactRequest struct {
 }
 
 type CreateGroupRequest struct {
-	Name           string              `json:"name"`
+	Name           string              `json:"name,omitempty"`
-	Members        []string            `json:"members"`
+	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"`
@@ -873,6 +873,11 @@ func (a *Api) AddMembersToGroup(c *gin.Context) {
 		return
 	}
 
+	if len(req.Members) == 0 {
+		c.JSON(400, Error{Msg: "Couldn't process request - group members missing"})
+		return
+	}
+
 	err = a.signalClient.AddMembersToGroup(number, groupId, req.Members)
 	if err != nil {
 		switch err.(type) {
@@ -1279,6 +1284,16 @@ func (a *Api) UnpinMessageInGroup(c *gin.Context) {
 		return
 	}
 
+	if req.TargetAuthor == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - target author missing"})
+		return
+	}
+
+	if req.Timestamp == 0 {
+		c.JSON(400, Error{Msg: "Couldn't process request - timestamp missing"})
+		return
+	}
+
 	err = a.signalClient.UnpinMessageInGroup(number, groupId, req.TargetAuthor, req.Timestamp)
 	if err != nil {
 		c.JSON(400, Error{Msg: err.Error()})
@@ -2385,6 +2400,16 @@ func (a *Api) SubmitRateLimitChallenge(c *gin.Context) {
 		return
 	}
 
+	if req.ChallengeToken == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - challenge token missing"})
+		return
+	}
+
+	if req.Captcha == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - captcha missing"})
+		return
+	}
+
 	err = a.signalClient.SubmitRateLimitChallenge(number, req.ChallengeToken, req.Captcha)
 	if err != nil {
 		c.JSON(400, Error{Msg: err.Error()})

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"`
+			Name                    string   `json:"name,omitempty"`
-			Members                 []string `json:"members"`
+			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 := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup"}
-		cmd = append(cmd, prefixUsernameMembers(members)...)
+
+		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()}...)

src/docs/docs.go

@@ -2790,10 +2790,6 @@ const docTemplate = `{
         },
         "api.CreateGroupRequest": {
             "type": "object",
-            "required": [
-                "members",
-                "name"
-            ],
             "properties": {
                 "description": {
                     "type": "string"

src/docs/swagger.json

@@ -2787,10 +2787,6 @@
         },
         "api.CreateGroupRequest": {
             "type": "object",
-            "required": [
-                "members",
-                "name"
-            ],
             "properties": {
                 "description": {
                     "type": "string"

src/docs/swagger.yaml

@@ -76,9 +76,6 @@ definitions:
         type: string
       permissions:
         $ref: '#/definitions/data.GroupPermissions'
-    required:
-    - members
-    - name
     type: object
   api.CreateGroupResponse:
     properties: