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

fixed parsing in groups endpoint

Browse Source 
* use "output mode json" instead of string parsing
This commit is contained in:
Bernhard B 2021-01-19 18:07:15 +01:00
parent 827d45c143
commit 666b9e2bdd
1 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/api/api.go
View File

@ -33,8 +33,21 @@ type GroupEntry struct {
Id string `json:"id"` Id string `json:"id"`
InternalId string `json:"internal_id"` InternalId string `json:"internal_id"`
Members []string `json:"members"` Members []string `json:"members"`
Active bool `json:"active"`
Blocked bool `json:"blocked"` Blocked bool `json:"blocked"`
PendingInvites []string `json:"pending_invites"`
PendingRequests []string `json:"pending_requests"`
InviteLink string `json:"invite_link"`
}
type SignalCliGroupEntry struct {
Name string `json:"name"`
Id string `json:"id"`
IsMember bool `json:"isMember"`
IsBlocked bool `json:"isBlocked"`
Members []string `json:"members"`
PendingMembers []string `json:"pendingMembers"`
RequestingMembers []string `json:"requestingMembers"`
GroupInviteLink string `json:"groupInviteLink"`
} }
type IdentityEntry struct { type IdentityEntry struct {
@ -237,56 +250,27 @@ func parseWhitespaceDelimitedKeyValueStringList(in string, keys []string) []map[
func getGroups(number string, signalCliConfig string) ([]GroupEntry, error) { func getGroups(number string, signalCliConfig string) ([]GroupEntry, error) {
groupEntries := []GroupEntry{} groupEntries := []GroupEntry{}
out, err := runSignalCli(true, []string{"--config", signalCliConfig, "-u", number, "listGroups", "-d"}, "") out, err := runSignalCli(true, []string{"--config", signalCliConfig, "--output", "json", "-u", number, "listGroups", "-d"}, "")
if err != nil { if err != nil {
return groupEntries, err return groupEntries, err
} }
lines := strings.Split(out, "\n") var signalCliGroupEntries []SignalCliGroupEntry
for _, line := range lines {
err = json.Unmarshal([]byte(out), &signalCliGroupEntries)
if err != nil {
return groupEntries, err
}
for _, signalCliGroupEntry := range signalCliGroupEntries {
var groupEntry GroupEntry var groupEntry GroupEntry
if line == "" { groupEntry.InternalId = signalCliGroupEntry.Id
continue groupEntry.Id = convertInternalGroupIdToGroupId(signalCliGroupEntry.Id)
} groupEntry.Blocked = signalCliGroupEntry.IsBlocked
groupEntry.Members = signalCliGroupEntry.Members
idIdx := strings.Index(line, " Name: ") groupEntry.PendingRequests = signalCliGroupEntry.PendingMembers
idPair := line[:idIdx] groupEntry.PendingInvites = signalCliGroupEntry.RequestingMembers
groupEntry.InternalId = strings.TrimPrefix(idPair, "Id: ") groupEntry.InviteLink = signalCliGroupEntry.GroupInviteLink
groupEntry.Id = convertInternalGroupIdToGroupId(groupEntry.InternalId)
lineWithoutId := strings.TrimLeft(line[idIdx:], " ")
nameIdx := strings.Index(lineWithoutId, " Active: ")
namePair := lineWithoutId[:nameIdx]
groupEntry.Name = strings.TrimRight(strings.TrimPrefix(namePair, "Name: "), " ")
lineWithoutName := strings.TrimLeft(lineWithoutId[nameIdx:], " ")
activeIdx := strings.Index(lineWithoutName, " Blocked: ")
activePair := lineWithoutName[:activeIdx]
active := strings.TrimPrefix(activePair, "Active: ")
if active == "true" {
groupEntry.Active = true
} else {
groupEntry.Active = false
}
lineWithoutActive := strings.TrimLeft(lineWithoutName[activeIdx:], " ")
blockedIdx := strings.Index(lineWithoutActive, " Members: ")
blockedPair := lineWithoutActive[:blockedIdx]
blocked := strings.TrimPrefix(blockedPair, "Blocked: ")
if blocked == "true" {
groupEntry.Blocked = true
} else {
groupEntry.Blocked = false
}
lineWithoutBlocked := strings.TrimLeft(lineWithoutActive[blockedIdx:], " ")
membersPair := lineWithoutBlocked
members := strings.TrimPrefix(membersPair, "Members: ")
trimmedMembers := strings.TrimRight(strings.TrimLeft(members, "["), "]")
trimmedMembersList := strings.Split(trimmedMembers, ",")
for _, member := range trimmedMembersList {
groupEntry.Members = append(groupEntry.Members, strings.Trim(member, " "))
}
groupEntries = append(groupEntries, groupEntry) groupEntries = append(groupEntries, groupEntry)
} }