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

gofmt code

Browse Source 
see #12
This commit is contained in:
Bernhard B
2020-04-05 11:35:43 +02:00
parent 5d0eb28772
commit 54f1f5f13e
1 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/main.go
View File

@@ -1,29 +1,28 @@
package main package main
import ( import (
log "github.com/sirupsen/logrus"
"github.com/satori/go.uuid"
"github.com/gin-gonic/gin"
"github.com/h2non/filetype"
"os/exec"
"time"
"errors"
"flag"
"bytes" "bytes"
"os"
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"errors"
"flag"
"github.com/gin-gonic/gin"
"github.com/h2non/filetype"
"github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
"os"
"os/exec"
"strings" "strings"
"time"
) )
type GroupEntry struct {
type GroupEntry struct{ Name string `json:"name"`
Name string `json:"name"` 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"`
Active bool `json:"active"` Blocked bool `json:"blocked"`
Blocked bool `json:"blocked"`
} }
func cleanupTmpFiles(paths []string) { func cleanupTmpFiles(paths []string) {
@@ -33,7 +32,7 @@ func cleanupTmpFiles(paths []string) {
} }
func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, number string, message string, func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, number string, message string,
recipients []string, base64Attachments []string, base64EncodedGroupId string) { recipients []string, base64Attachments []string, base64EncodedGroupId string) {
cmd := []string{"--config", signalCliConfig, "-u", number, "send", "-m", message} cmd := []string{"--config", signalCliConfig, "-u", number, "send", "-m", message}
if base64EncodedGroupId != "" && len(recipients) > 0 { if base64EncodedGroupId != "" && len(recipients) > 0 {
@@ -53,7 +52,6 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
cmd = append(cmd, []string{"-g", string(groupId)}...) cmd = append(cmd, []string{"-g", string(groupId)}...)
} }
attachmentTmpPaths := []string{} attachmentTmpPaths := []string{}
for _, base64Attachment := range base64Attachments { for _, base64Attachment := range base64Attachments {
u, err := uuid.NewV4() u, err := uuid.NewV4()
@@ -100,7 +98,7 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
if len(attachmentTmpPaths) > 0 { if len(attachmentTmpPaths) > 0 {
cmd = append(cmd, "-a") cmd = append(cmd, "-a")
cmd = append(cmd , attachmentTmpPaths...) cmd = append(cmd, attachmentTmpPaths...)
} }
_, err := runSignalCli(cmd) _, err := runSignalCli(cmd)
@@ -223,7 +221,7 @@ func main() {
router.POST("/v1/register/:number", func(c *gin.Context) { router.POST("/v1/register/:number", func(c *gin.Context) {
number := c.Param("number") number := c.Param("number")
type Request struct{ type Request struct {
UseVoice bool `json:"use_voice"` UseVoice bool `json:"use_voice"`
} }
@@ -275,7 +273,6 @@ func main() {
return return
} }
_, err := runSignalCli([]string{"--config", *signalCliConfig, "-u", number, "verify", token}) _, err := runSignalCli([]string{"--config", *signalCliConfig, "-u", number, "verify", token})
if err != nil { if err != nil {
c.JSON(400, gin.H{"error": err.Error()}) c.JSON(400, gin.H{"error": err.Error()})
@@ -285,12 +282,12 @@ func main() {
}) })
router.POST("/v1/send", func(c *gin.Context) { router.POST("/v1/send", func(c *gin.Context) {
type Request struct{ type Request struct {
Number string `json:"number"` Number string `json:"number"`
Recipients []string `json:"recipients"` Recipients []string `json:"recipients"`
Message string `json:"message"` Message string `json:"message"`
Base64Attachment string `json:"base64_attachment"` Base64Attachment string `json:"base64_attachment"`
GroupId string `json:"group_id"` GroupId string `json:"group_id"`
} }
var req Request var req Request
err := c.BindJSON(&req) err := c.BindJSON(&req)
@@ -308,12 +305,12 @@ func main() {
}) })
router.POST("/v2/send", func(c *gin.Context) { router.POST("/v2/send", func(c *gin.Context) {
type Request struct{ type Request struct {
Number string `json:"number"` Number string `json:"number"`
Recipients []string `json:"recipients"` Recipients []string `json:"recipients"`
Message string `json:"message"` Message string `json:"message"`
Base64Attachments []string `json:"base64_attachments"` Base64Attachments []string `json:"base64_attachments"`
GroupId string `json:"group_id"` GroupId string `json:"group_id"`
} }
var req Request var req Request
err := c.BindJSON(&req) err := c.BindJSON(&req)
@@ -354,8 +351,8 @@ func main() {
router.POST("/v1/groups/:number", func(c *gin.Context) { router.POST("/v1/groups/:number", func(c *gin.Context) {
number := c.Param("number") number := c.Param("number")
type Request struct{ type Request struct {
Name string `json:"name"` Name string `json:"name"`
Members []string `json:"members"` Members []string `json:"members"`
} }
@@ -367,7 +364,6 @@ func main() {
return return
} }
cmd := []string{"--config", *signalCliConfig, "-u", number, "updateGroup", "-n", req.Name, "-m"} cmd := []string{"--config", *signalCliConfig, "-u", number, "updateGroup", "-n", req.Name, "-m"}
cmd = append(cmd, req.Members...) cmd = append(cmd, req.Members...)
log.Info(cmd) log.Info(cmd)
@@ -393,7 +389,6 @@ func main() {
c.JSON(200, groups) c.JSON(200, groups)
}) })
router.DELETE("/v1/groups/:number/:groupid", func(c *gin.Context) { router.DELETE("/v1/groups/:number/:groupid", func(c *gin.Context) {
base64EncodedGroupId := c.Param("groupid") base64EncodedGroupId := c.Param("groupid")
number := c.Param("number") number := c.Param("number")