From b77c7c8b436acd1ec449a617bea35f7cbbb8356c Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Sat, 1 Feb 2020 14:06:27 +0100
Subject: [PATCH] added functionality to receive messages

see #8
---
 README.md   | 12 +++++++++++-
 src/main.go | 46 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 63e5ae5..2827ccf 100644
--- a/README.md
+++ b/README.md
@@ -65,4 +65,14 @@ Sample REST API calls:
 
   ```curl -X POST -H "Content-Type: application/json" -d '{"message": "<message>", "base64_attachment": "<base64 encoded attachment>", "number": "<number>", "recipients": ["<recipient1>", "<recipient2>"]}' 'http://127.0.0.1:8080/v1/send'```
 
-In case you need more functionality, please **create a pull request**
+* Receive messages
+
+  Fetch all new messages in the inbox of the specified number.
+
+   ```curl -X GET -H "Content-Type: application/json" 'http://127.0.0.1:8080/v1/receive/<number>'```
+
+   e.g:
+
+   ```curl -X GET -H "Content-Type: application/json" 'http://127.0.0.1:8080/v1/receive/+431212131491291'```
+
+In case you need more functionality, please **file a ticket** or **create a PR**
diff --git a/src/main.go b/src/main.go
index cf1b390..13ae3b6 100644
--- a/src/main.go
+++ b/src/main.go
@@ -13,6 +13,7 @@ import (
 	"os"
 	"encoding/base64"
 	"encoding/json"
+	"strings"
 )
 
 func cleanupTmpFiles(paths []string) {
@@ -76,7 +77,7 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
 		cmd = append(cmd , attachmentTmpPaths...)
 	}
 
-	err := runSignalCli(cmd)
+	_, err := runSignalCli(cmd)
 	if err != nil {
 		cleanupTmpFiles(attachmentTmpPaths)
 		c.JSON(400, gin.H{"error": err.Error()})
@@ -85,14 +86,16 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
 	c.JSON(201, nil)
 }
 
-func runSignalCli(args []string) error {
+func runSignalCli(args []string) (string, error) {
 	cmd := exec.Command("signal-cli", args...)
 	var errBuffer bytes.Buffer
+	var outBuffer bytes.Buffer
 	cmd.Stderr = &errBuffer
+	cmd.Stdout = &outBuffer
 
 	err := cmd.Start()
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	done := make(chan error, 1)
@@ -103,15 +106,15 @@ func runSignalCli(args []string) error {
 	case <-time.After(60 * time.Second):
 		err := cmd.Process.Kill()
 		if err != nil {
-			return err
+			return "", err
 		}
-		return errors.New("process killed as timeout reached")
+		return "", errors.New("process killed as timeout reached")
 	case err := <-done:
 		if err != nil {
-			return errors.New(errBuffer.String())
+			return "", errors.New(errBuffer.String())
 		}
 	}
-	return nil
+	return outBuffer.String(), nil
 }
 
 func main() {
@@ -164,7 +167,7 @@ func main() {
 			command = append(command, "--voice")
 		}
 
-		err := runSignalCli(command)
+		_, err := runSignalCli(command)
 		if err != nil {
 			c.JSON(400, err.Error())
 			return
@@ -187,7 +190,7 @@ func main() {
 		}
 
 		
-		err := runSignalCli([]string{"--config", *signalCliConfig, "-u", number, "verify", token})
+		_, err := runSignalCli([]string{"--config", *signalCliConfig, "-u", number, "verify", token})
 		if err != nil {
 			c.JSON(400, gin.H{"error": err.Error()})
 			return
@@ -235,5 +238,30 @@ func main() {
 		send(c, *attachmentTmpDir, *signalCliConfig, req.Number, req.Message, req.Recipients, req.Base64Attachments)
 	})
 
+	router.GET("/v1/receive/:number", func(c *gin.Context) {
+		number := c.Param("number")
+
+		command := []string{"--config", *signalCliConfig, "-u", number, "receive", "-t", "1", "--json"}
+		out, err := runSignalCli(command)
+		if err != nil {
+			c.JSON(400, err.Error())
+			return
+		}
+		
+		out = strings.Trim(out, "\n")
+		lines := strings.Split(out, "\n")
+		
+		jsonStr := "["
+		for i, line := range lines {
+			jsonStr += line
+			if i != (len(lines) - 1) {
+				jsonStr += ","
+			}
+		}
+		jsonStr += "]"
+
+		c.String(200, jsonStr)
+	})
+
 	router.Run()
 }