mirror of
https://github.com/aljazceru/signal-cli-rest-api.git
synced 2025-12-20 16:14:29 +01:00
fixed bugs in list groups endpoint
* pendingMembers and requestingMembers were incorrectly parsed from signal-cli's JSON output see #187
This commit is contained in:
@@ -96,8 +96,8 @@ type SignalCliGroupEntry struct {
|
|||||||
IsMember bool `json:"isMember"`
|
IsMember bool `json:"isMember"`
|
||||||
IsBlocked bool `json:"isBlocked"`
|
IsBlocked bool `json:"isBlocked"`
|
||||||
Members []SignalCliGroupMember `json:"members"`
|
Members []SignalCliGroupMember `json:"members"`
|
||||||
PendingMembers []string `json:"pendingMembers"`
|
PendingMembers []SignalCliGroupMember `json:"pendingMembers"`
|
||||||
RequestingMembers []string `json:"requestingMembers"`
|
RequestingMembers []SignalCliGroupMember `json:"requestingMembers"`
|
||||||
GroupInviteLink string `json:"groupInviteLink"`
|
GroupInviteLink string `json:"groupInviteLink"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -698,8 +698,18 @@ func (s *SignalClient) GetGroups(number string) ([]GroupEntry, error) {
|
|||||||
}
|
}
|
||||||
groupEntry.Members = members
|
groupEntry.Members = members
|
||||||
|
|
||||||
groupEntry.PendingRequests = signalCliGroupEntry.PendingMembers
|
pendingMembers := []string{}
|
||||||
groupEntry.PendingInvites = signalCliGroupEntry.RequestingMembers
|
for _, val := range signalCliGroupEntry.PendingMembers {
|
||||||
|
pendingMembers = append(pendingMembers, val.Number)
|
||||||
|
}
|
||||||
|
groupEntry.PendingRequests = pendingMembers
|
||||||
|
|
||||||
|
requestingMembers := []string{}
|
||||||
|
for _, val := range signalCliGroupEntry.RequestingMembers {
|
||||||
|
requestingMembers = append(requestingMembers, val.Number)
|
||||||
|
}
|
||||||
|
groupEntry.PendingInvites = requestingMembers
|
||||||
|
|
||||||
groupEntry.InviteLink = signalCliGroupEntry.GroupInviteLink
|
groupEntry.InviteLink = signalCliGroupEntry.GroupInviteLink
|
||||||
|
|
||||||
groupEntries = append(groupEntries, groupEntry)
|
groupEntries = append(groupEntries, groupEntry)
|
||||||
|
|||||||
Reference in New Issue
Block a user