From cddf3c166af6a36c25e8d15689ba1488b42c6237 Mon Sep 17 00:00:00 2001
From: Bernhard B <bernhard@liftingcoder.com>
Date: Thu, 14 Nov 2024 22:50:15 +0100
Subject: [PATCH] GET groups endpoint: return uuid instead of number in case no
 number is set

see #611
---
 src/client/client.go | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/client/client.go b/src/client/client.go
index d30045e..7767b31 100644
--- a/src/client/client.go
+++ b/src/client/client.go
@@ -143,6 +143,7 @@ type SignalCliGroupEntry struct {
 	RequestingMembers []SignalCliGroupMember `json:"requestingMembers"`
 	GroupInviteLink   string                 `json:"groupInviteLink"`
 	Admins            []SignalCliGroupAdmin  `json:"admins"`
+	Uuid              string                 `json:"uuid"`
 }
 
 type SignalCliIdentityEntry struct {
@@ -1125,25 +1126,41 @@ func (s *SignalClient) GetGroups(number string) ([]GroupEntry, error) {
 
 		members := []string{}
 		for _, val := range signalCliGroupEntry.Members {
-			members = append(members, val.Number)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
+			members = append(members, identifier)
 		}
 		groupEntry.Members = members
 
 		pendingMembers := []string{}
 		for _, val := range signalCliGroupEntry.PendingMembers {
-			pendingMembers = append(pendingMembers, val.Number)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
+			pendingMembers = append(pendingMembers, identifier)
 		}
 		groupEntry.PendingRequests = pendingMembers
 
 		requestingMembers := []string{}
 		for _, val := range signalCliGroupEntry.RequestingMembers {
-			requestingMembers = append(requestingMembers, val.Number)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
+			requestingMembers = append(requestingMembers, identifier)
 		}
 		groupEntry.PendingInvites = requestingMembers
 
 		admins := []string{}
 		for _, val := range signalCliGroupEntry.Admins {
-			admins = append(admins, val.Number)
+			identifier := val.Number
+			if identifier == "" {
+				identifier = val.Uuid
+			}
+			admins = append(admins, identifier)
 		}
 		groupEntry.Admins = admins