nik/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/bbernhard/signal-cli-rest-api.git synced 2026-05-26 14:44:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

prefix usernames with 'u:' when creating/updating a group's members

Browse Source
This commit is contained in:
Bernhard B 2025-07-25 22:59:00 +02:00
parent 8834570421
commit aa1924aa8c
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/client/client.go
View File

@ -993,7 +993,7 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string,
AddMembersPermissions string `json:"setPermissionAddMember,omitempty"` AddMembersPermissions string `json:"setPermissionAddMember,omitempty"`
Expiration int `json:"expiration,omitempty"` Expiration int `json:"expiration,omitempty"`
} }
request := Request{Name: name, Members: members} request := Request{Name: name, Members: prefixUsernameMembers(members)}
if groupLinkState != DefaultGroupLinkState { if groupLinkState != DefaultGroupLinkState {
request.Link = groupLinkState.String() request.Link = groupLinkState.String()
@ -1036,7 +1036,7 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string,
internalGroupId = resp.GroupId internalGroupId = resp.GroupId
} else { } else {
cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-n", name, "-m"} cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-n", name, "-m"}
cmd = append(cmd, members...) cmd = append(cmd, prefixUsernameMembers(members)...)
if addMembersPermission != DefaultGroupPermission { if addMembersPermission != DefaultGroupPermission {
cmd = append(cmd, []string{"--set-permission-add-member", addMembersPermission.String()}...) cmd = append(cmd, []string{"--set-permission-add-member", addMembersPermission.String()}...)
@ -1072,6 +1072,19 @@ func (s *SignalClient) CreateGroup(number string, name string, members []string,
return groupId, nil return groupId, nil
} }
func prefixUsernameMembers(members []string) []string {
res := []string{}
for _, member := range members {
recipientType, err := getRecipientType(member)
if err == nil && recipientType == ds.Username {
res = append(res, "u:" + member)
} else {
res = append(res, member)
}
}
return res
}
func (s *SignalClient) updateGroupMembers(number string, groupId string, members []string, add bool) error { func (s *SignalClient) updateGroupMembers(number string, groupId string, members []string, add bool) error {
var err error var err error
@ -1102,9 +1115,9 @@ func (s *SignalClient) updateGroupMembers(number string, groupId string, members
} }
request := Request{GroupId: internalGroupId} request := Request{GroupId: internalGroupId}
if add { if add {
request.Members = append(request.Members, members...) request.Members = append(request.Members, prefixUsernameMembers(members)...)
} else { } else {
request.RemoveMembers = append(request.RemoveMembers, members...) request.RemoveMembers = append(request.RemoveMembers, prefixUsernameMembers(members)...)
} }
jsonRpc2Client, err := s.getJsonRpc2Client() jsonRpc2Client, err := s.getJsonRpc2Client()