aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-20 08:04:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

return group id when creating a group

Browse Source
This commit is contained in:
Bernhard B
2020-05-09 20:38:21 +02:00
parent 0f5ded7a3c
commit 3cad929eac
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.go
View File

@@ -27,6 +27,10 @@ type GroupEntry struct {
Blocked bool `json:"blocked"` Blocked bool `json:"blocked"`
} }
func convertInternalGroupIdToGroupId(internalId string) string {
return groupPrefix + base64.StdEncoding.EncodeToString([]byte(internalId))
}
func getStringInBetween(str string, start string, end string) (result string) { func getStringInBetween(str string, start string, end string) (result string) {
i := strings.Index(str, start) i := strings.Index(str, start)
@@ -149,7 +153,7 @@ func getGroups(number string, signalCliConfig string) ([]GroupEntry, error) {
idIdx := strings.Index(line, " Name: ") idIdx := strings.Index(line, " Name: ")
idPair := line[:idIdx] idPair := line[:idIdx]
groupEntry.InternalId = strings.TrimPrefix(idPair, "Id: ") groupEntry.InternalId = strings.TrimPrefix(idPair, "Id: ")
groupEntry.Id = groupPrefix + base64.StdEncoding.EncodeToString([]byte(groupEntry.InternalId)) groupEntry.Id = convertInternalGroupIdToGroupId(groupEntry.InternalId)
lineWithoutId := strings.TrimLeft(line[idIdx:], " ") lineWithoutId := strings.TrimLeft(line[idIdx:], " ")
nameIdx := strings.Index(lineWithoutId, " Active: ") nameIdx := strings.Index(lineWithoutId, " Active: ")
@@ -426,8 +430,8 @@ func main() {
return return
} }
groupId := getStringInBetween(out, `"`, `"`) internalGroupId := getStringInBetween(out, `"`, `"`)
c.JSON(201, gin.H{"id": groupPrefix + groupId}) c.JSON(201, gin.H{"id": convertInternalGroupIdToGroupId(internalGroupId)})
}) })
router.GET("/v1/groups/:number", func(c *gin.Context) { router.GET("/v1/groups/:number", func(c *gin.Context) {