Dockerfile

@@ -1,6 +1,6 @@
 ARG SIGNAL_CLI_VERSION=0.14.1
 ARG LIBSIGNAL_CLIENT_VERSION=0.87.4
-ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.14.1+morph027+2
+ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.14.1+morph027+1
 
 ARG SWAG_VERSION=1.16.4
 ARG GRAALVM_VERSION=25.0.2

src/api/api.go

@@ -1024,7 +1024,6 @@ func (a *Api) RemoveAdminsFromGroup(c *gin.Context) {
 // @Success 200 {object} []client.GroupEntry
 // @Failure 400 {object} Error
 // @Param number path string true "Registered Phone Number"
-// @Param use_only_uuid_as_identifier query bool false "Use UUIDs instead of phone numbers as identifier for (pending|requesting) members"
 // @Router /v1/groups/{number} [get]
 func (a *Api) GetGroups(c *gin.Context) {
 	number, err := url.PathUnescape(c.Param("number"))
@@ -1033,13 +1032,7 @@ func (a *Api) GetGroups(c *gin.Context) {
 		return
 	}
 
-	useOnlyUuidAsIdentifier := c.DefaultQuery("use_only_uuid_as_identifier", "false")
+	groups, err := a.signalClient.GetGroups(number)
-	if useOnlyUuidAsIdentifier != "true" && useOnlyUuidAsIdentifier != "false" {
-		c.JSON(400, Error{Msg: "Couldn't process request - use_only_uuid_as_identifier parameter needs to be either 'true' or 'false'"})
-		return
-	}
-
-	groups, err := a.signalClient.GetGroups(number, StringToBool(useOnlyUuidAsIdentifier))
 	if err != nil {
 		c.JSON(400, Error{Msg: err.Error()})
 		return
@@ -1057,7 +1050,6 @@ func (a *Api) GetGroups(c *gin.Context) {
 // @Failure 400 {object} Error
 // @Param number path string true "Registered Phone Number"
 // @Param groupid path string true "Group ID"
-// @Param use_only_uuid_as_identifier query bool false "Use UUIDs instead of phone numbers as identifier for (pending|requesting) members"
 // @Router /v1/groups/{number}/{groupid} [get]
 func (a *Api) GetGroup(c *gin.Context) {
 	number, err := url.PathUnescape(c.Param("number"))
@@ -1067,13 +1059,7 @@ func (a *Api) GetGroup(c *gin.Context) {
 	}
 	groupId := c.Param("groupid")
 
-	useOnlyUuidAsIdentifier := c.DefaultQuery("use_only_uuid_as_identifier", "false")
+	groupEntry, err := a.signalClient.GetGroup(number, groupId)
-	if useOnlyUuidAsIdentifier != "true" && useOnlyUuidAsIdentifier != "false" {
-		c.JSON(400, Error{Msg: "Couldn't process request - use_only_uuid_as_identifier parameter needs to be either 'true' or 'false'"})
-		return
-	}
-
-	groupEntry, err := a.signalClient.GetGroup(number, groupId, StringToBool(useOnlyUuidAsIdentifier))
 	if err != nil {
 		c.JSON(400, Error{Msg: err.Error()})
 		return

src/client/client.go

@@ -341,18 +341,6 @@ func getSignalCliModeString(signalCliMode SignalCliMode) string {
 	return "unknown"
 }
 
-func pickGroupMemberIdentifier(number string, uuid string, useOnlyUuidAsIdentifier bool) string {
-	if useOnlyUuidAsIdentifier {
-		return uuid
-	}
-
-	if number != "" {
-		return number
-	}
-
-	return uuid
-}
-
 func getRecipientType(s string) (ds.RecpType, error) {
 	// check if the provided recipient is of type 'group'
 	if strings.HasPrefix(s, groupPrefix) { // if the recipient starts with 'group.' it is either a group or a username that starts with 'group.'
@@ -1193,7 +1181,7 @@ func (s *SignalClient) updateGroupMembers(number string, groupId string, members
 		return nil
 	}
 
-	group, err := s.GetGroup(number, groupId, false)
+	group, err := s.GetGroup(number, groupId)
 	if err != nil {
 		return err
 	}
@@ -1255,7 +1243,7 @@ func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins [
 		return nil
 	}
 
-	group, err := s.GetGroup(number, groupId, false)
+	group, err := s.GetGroup(number, groupId)
 	if err != nil {
 		return err
 	}
@@ -1312,7 +1300,7 @@ func (s *SignalClient) RemoveAdminsFromGroup(number string, groupId string, admi
 	return s.updateGroupAdmins(number, groupId, admins, false)
 }
 
-func (s *SignalClient) GetGroups(number string, useOnlyUuidAsIdentifier bool) ([]GroupEntry, error) {
+func (s *SignalClient) GetGroups(number string) ([]GroupEntry, error) {
 	groupEntries := []GroupEntry{}
 
 	var signalCliGroupEntries []SignalCliGroupEntry
@@ -1353,28 +1341,40 @@ func (s *SignalClient) GetGroups(number string, useOnlyUuidAsIdentifier bool) ([
 
 		members := []string{}
 		for _, val := range signalCliGroupEntry.Members {
-			identifier := pickGroupMemberIdentifier(val.Number, val.Uuid, useOnlyUuidAsIdentifier)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
 			members = append(members, identifier)
 		}
 		groupEntry.Members = members
 
 		pendingMembers := []string{}
 		for _, val := range signalCliGroupEntry.PendingMembers {
-			identifier := pickGroupMemberIdentifier(val.Number, val.Uuid, useOnlyUuidAsIdentifier)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
 			pendingMembers = append(pendingMembers, identifier)
 		}
 		groupEntry.PendingInvites = pendingMembers
 
 		requestingMembers := []string{}
 		for _, val := range signalCliGroupEntry.RequestingMembers {
-			identifier := pickGroupMemberIdentifier(val.Number, val.Uuid, useOnlyUuidAsIdentifier)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
 			requestingMembers = append(requestingMembers, identifier)
 		}
 		groupEntry.PendingRequests = requestingMembers
 
 		admins := []string{}
 		for _, val := range signalCliGroupEntry.Admins {
-			identifier := pickGroupMemberIdentifier(val.Number, val.Uuid, useOnlyUuidAsIdentifier)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
 			admins = append(admins, identifier)
 		}
 		groupEntry.Admins = admins
@@ -1387,9 +1387,9 @@ func (s *SignalClient) GetGroups(number string, useOnlyUuidAsIdentifier bool) ([
 	return groupEntries, nil
 }
 
-func (s *SignalClient) GetGroup(number string, groupId string, useOnlyUuidAsIdentifier bool) (*GroupEntry, error) {
+func (s *SignalClient) GetGroup(number string, groupId string) (*GroupEntry, error) {
 	groupEntry := GroupEntry{}
-	groups, err := s.GetGroups(number, useOnlyUuidAsIdentifier)
+	groups, err := s.GetGroups(number)
 	if err != nil {
 		return nil, err
 	}

src/client/jsonrpc2.go

@@ -233,6 +233,13 @@ func (r *JsonRpc2Client) ReceiveData(number string, receiveWebhookUrl string) {
 		}
 		log.Debug("json-rpc received data: ", str)
 
+		if receiveWebhookUrl != "" {
+			err = postMessageToWebhook(receiveWebhookUrl, []byte(str))
+			if err != nil {
+				log.Error("Couldn't post data to webhook: ", err)
+			}
+		}
+
 		var resp1 JsonRpc2ReceivedMessage
 		json.Unmarshal([]byte(str), &resp1)
 		if resp1.Method == "receive" {
@@ -247,13 +254,6 @@ func (r *JsonRpc2Client) ReceiveData(number string, receiveWebhookUrl string) {
 				continue
 			}
 			r.receivedMessagesMutex.Unlock()
-
-			if receiveWebhookUrl != "" {
-				err = postMessageToWebhook(receiveWebhookUrl, []byte(str))
-				if err != nil {
-					log.Error("Couldn't post data to webhook: ", err)
-				}
-			}
 		}
 
 		var resp2 JsonRpc2MessageResponse

src/docs/docs.go

@@ -917,12 +917,6 @@ const docTemplate = `{
                         "name": "number",
                         "in": "path",
                         "required": true
-                    },
-                    {
-                        "type": "boolean",
-                        "description": "Use UUIDs instead of phone numbers as identifier for (pending|requesting) members",
-                        "name": "use_only_uuid_as_identifier",
-                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -1016,12 +1010,6 @@ const docTemplate = `{
                         "name": "groupid",
                         "in": "path",
                         "required": true
-                    },
-                    {
-                        "type": "boolean",
-                        "description": "Use UUIDs instead of phone numbers as identifier for (pending|requesting) members",
-                        "name": "use_only_uuid_as_identifier",
-                        "in": "query"
                     }
                 ],
                 "responses": {

src/docs/swagger.json

@@ -914,12 +914,6 @@
                         "name": "number",
                         "in": "path",
                         "required": true
-                    },
-                    {
-                        "type": "boolean",
-                        "description": "Use UUIDs instead of phone numbers as identifier for (pending|requesting) members",
-                        "name": "use_only_uuid_as_identifier",
-                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -1013,12 +1007,6 @@
                         "name": "groupid",
                         "in": "path",
                         "required": true
-                    },
-                    {
-                        "type": "boolean",
-                        "description": "Use UUIDs instead of phone numbers as identifier for (pending|requesting) members",
-                        "name": "use_only_uuid_as_identifier",
-                        "in": "query"
                     }
                 ],
                 "responses": {

src/docs/swagger.yaml

@@ -1163,11 +1163,6 @@ paths:
         name: number
         required: true
         type: string
-      - description: Use UUIDs instead of phone numbers as identifier for (pending|requesting)
-          members
-        in: query
-        name: use_only_uuid_as_identifier
-        type: boolean
       produces:
       - application/json
       responses:
@@ -1259,11 +1254,6 @@ paths:
         name: groupid
         required: true
         type: string
-      - description: Use UUIDs instead of phone numbers as identifier for (pending|requesting)
-          members
-        in: query
-        name: use_only_uuid_as_identifier
-        type: boolean
       produces:
       - application/json
       responses: