Merge pull request #176 from filipre/reactions

Reactions Endpoint Proposal

src/api/api.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
 	"github.com/gorilla/websocket"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/bbernhard/signal-cli-rest-api/client"
 	utils "github.com/bbernhard/signal-cli-rest-api/utils"
@@ -57,6 +57,13 @@ type VerifyNumberSettings struct {
 	Pin string `json:"pin"`
 }
 
+type Reaction struct {
+	Recipient    string `json:"recipient"`
+	Reaction     string `json:"reaction"`
+	TargetAuthor string `json:"target_author"`
+	Timestamp    int64  `json:"timestamp"`
+}
+
 type SendMessageV1 struct {
 	Number           string   `json:"number"`
 	Recipients       []string `json:"recipients"`
@@ -80,8 +87,6 @@ type Error struct {
 	Msg string `json:"error"`
 }
 
-
-
 type CreateGroupResponse struct {
 	Id string `json:"id"`
 }
@@ -283,7 +288,6 @@ func (a *Api) SendV2(c *gin.Context) {
 	c.JSON(201, SendMessageResponse{Timestamp: strconv.FormatInt((*timestamps)[0].Timestamp, 10)})
 }
 
-
 func (a *Api) handleSignalReceive(ws *websocket.Conn, number string) {
 	for {
 		data, err := a.signalClient.Receive(number, 0)
@@ -890,6 +894,97 @@ func (a *Api) QuitGroup(c *gin.Context) {
 	c.Status(http.StatusNoContent)
 }
 
+// @Summary Send a reaction.
+// @Tags Reactions
+// @Description React to a message
+// @Accept  json
+// @Produce  json
+// @Success 204 {string} OK
+// @Failure 400 {object} Error
+// @Param data body Reaction true "Reaction"
+// @Router /v1/reactions/{number} [post]
+func (a *Api) SendReaction(c *gin.Context) {
+	var req Reaction
+	err := c.BindJSON(&req)
+	if err != nil {
+		c.JSON(400, Error{Msg: "Couldn't process request - invalid request"})
+		log.Error(err.Error())
+		return
+	}
+
+	number := c.Param("number")
+
+	if req.Recipient == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - recipient missing"})
+		return
+	}
+
+	if req.Reaction == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - reaction missing"})
+		return
+	}
+
+	if req.TargetAuthor == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - target_author missing"})
+		return
+	}
+
+	if req.Timestamp == 0 {
+		c.JSON(400, Error{Msg: "Couldn't process request - timestamp missing"})
+		return
+	}
+
+	err = a.signalClient.SendReaction(number, req.Recipient, req.Reaction, req.TargetAuthor, req.Timestamp, false)
+	if err != nil {
+		c.JSON(400, Error{Msg: err.Error()})
+		return
+	}
+	c.Status(http.StatusNoContent)
+}
+
+// @Summary Remove a reaction.
+// @Tags Reactions
+// @Description Remove a reaction
+// @Accept  json
+// @Produce  json
+// @Success 204 {string} OK
+// @Failure 400 {object} Error
+// @Param data body Reaction true "Reaction"
+// @Router /v1/reactions/{number} [delete]
+func (a *Api) RemoveReaction(c *gin.Context) {
+	var req Reaction
+	err := c.BindJSON(&req)
+	if err != nil {
+		c.JSON(400, Error{Msg: "Couldn't process request - invalid request"})
+		log.Error(err.Error())
+		return
+	}
+
+	number := c.Param("number")
+
+	if req.Recipient == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - recipient missing"})
+		return
+	}
+
+	if req.TargetAuthor == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - target_author missing"})
+		return
+	}
+
+	if req.Timestamp == 0 {
+		c.JSON(400, Error{Msg: "Couldn't process request - timestamp missing"})
+		return
+	}
+
+	err = a.signalClient.SendReaction(number, req.Recipient, req.Reaction, req.TargetAuthor, req.Timestamp, true)
+	if err != nil {
+		c.JSON(400, Error{Msg: err.Error()})
+		return
+	}
+	c.Status(http.StatusNoContent)
+}
+
 // @Summary Show Typing Indicator.
 // @Tags Messages
 // @Description Show Typing Indicator.

src/client/client.go

@@ -14,9 +14,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cyphar/filepath-securejoin"
+	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/h2non/filetype"
+
 	//"github.com/sourcegraph/jsonrpc2"//"net/rpc/jsonrpc"
 	log "github.com/sirupsen/logrus"
 
@@ -995,6 +996,69 @@ func (s *SignalClient) QuitGroup(number string, groupId string) error {
 	return err
 }
 
+func (s *SignalClient) SendReaction(number string, recipient string, emoji string, target_author string, timestamp int64, remove bool) error {
+	// see https://github.com/AsamK/signal-cli/blob/master/man/signal-cli.1.adoc#sendreaction
+	var err error
+	recp := recipient
+	isGroup := false
+	if strings.HasPrefix(recipient, groupPrefix) {
+		isGroup = true
+		recp, err = ConvertGroupIdToInternalGroupId(recipient)
+		if err != nil {
+			return errors.New("Invalid group id")
+		}
+	}
+	if remove && emoji == "" {
+		emoji = "👍" // emoji must not be empty to remove a reaction
+	}
+
+	if s.signalCliMode == JsonRpc {
+		type Request struct {
+			Recipient    string `json:"recipient,omitempty"`
+			GroupId      string `json:"group-id,omitempty"`
+			Emoji        string `json:"emoji"`
+			TargetAuthor string `json:"target-author"`
+			Timestamp    int64  `json:"target-timestamp"`
+			Remove       bool   `json:"remove,omitempty"`
+		}
+		request := Request{}
+		if !isGroup {
+			request.Recipient = recp
+		} else {
+			request.GroupId = recp
+		}
+		request.Emoji = emoji
+		request.TargetAuthor = target_author
+		request.Timestamp = timestamp
+		if remove {
+			request.Remove = remove
+		}
+		jsonRpc2Client, err := s.getJsonRpc2Client(number)
+		if err != nil {
+			return err
+		}
+		_, err = jsonRpc2Client.getRaw("sendReaction", request)
+		return err
+	}
+
+	cmd := []string{
+		"--config", s.signalCliConfig,
+		"-u", number,
+		"sendReaction",
+	}
+	if !isGroup {
+		cmd = append(cmd, recp)
+	} else {
+		cmd = append(cmd, []string{"-g", recp}...)
+	}
+	cmd = append(cmd, []string{"-e", emoji, "-a", target_author, "-t", strconv.FormatInt(timestamp, 10)}...)
+	if remove {
+		cmd = append(cmd, "-r")
+	}
+	_, err = runSignalCli(true, cmd, "", s.signalCliMode)
+	return err
+}
+
 func (s *SignalClient) SendStartTyping(number string, recipient string) error {
 	var err error
 	recp := recipient

src/docs/swagger.json

@@ -679,6 +679,101 @@
                 }
             }
         },
+        "/v1/reactions/{number}": {
+            "post": {
+                "description": "React to a message.",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Reactions"
+                ],
+                "summary": "Send a reaction.",
+                "parameters": [
+                    {
+                        "description": "Reactions",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/api.Reaction"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "No Content",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/api.Error"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "description": "Delete a reaction.",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Reactions"
+                ],
+                "summary": "Delete a reaction.",
+                "parameters": [
+                    {
+                        "description": "Reactions",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/api.Reaction"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "No Content",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/api.Error"
+                        }
+                    }
+                }
+            }
+        },
+        "api.Reaction": {
+            "type": "object",
+            "properties": {
+                "recipient": {
+                    "type": "string"
+                },
+                "reaction": {
+                    "type": "string"
+                },
+                "target_author": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "integer"
+                }
+            }
+        },
         "/v1/receive/{number}": {
             "get": {
                 "description": "Receives Signal Messages from the Signal Network. If you are running the docker container in normal/native mode, this is a GET endpoint. In json-rpc mode this is a websocket endpoint.",
@@ -1280,6 +1375,10 @@
         {
             "description": "List and Trust Identities.",
             "name": "Identities"
+        },
+        {
+            "description": "React to messages.",
+            "name": "Reactions"
         }
     ]
 }

src/docs/swagger.yaml

@@ -1,9 +1,9 @@
-basePath: /
+"basePath: /
 definitions:
   api.Configuration:
     properties:
       logging:
-        $ref: '#/definitions/api.LoggingConfiguration'
+        $ref: "#/definitions/api.LoggingConfiguration"
         type: object
     type: object
   api.CreateGroupRequest:
@@ -23,7 +23,7 @@ definitions:
       name:
         type: string
       permissions:
-        $ref: '#/definitions/api.GroupPermissions'
+        $ref: "#/definitions/api.GroupPermissions"
         type: object
     type: object
   api.CreateGroupResponse:
@@ -54,6 +54,17 @@ definitions:
       Level:
         type: string
     type: object
+  api.Reaction:
+    properties:
+      recipient:
+        type: string
+      reaction:
+        type: string
+      target_author:
+        type: string
+      timestamp:
+        type: integer
+    type: object
   api.RegisterNumberRequest:
     properties:
       captcha:
@@ -184,7 +195,7 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/client.About'
+            $ref: "#/definitions/client.About"
       summary: Lists general information about the API
       tags:
         - General
@@ -203,7 +214,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: List all attachments.
       tags:
         - Attachments
@@ -226,7 +237,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Remove attachment.
       tags:
         - Attachments
@@ -248,7 +259,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Serve Attachment.
       tags:
         - Attachments
@@ -263,11 +274,11 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/api.Configuration'
+            $ref: "#/definitions/api.Configuration"
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: List the REST API configuration.
       tags:
         - General
@@ -281,7 +292,7 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.Configuration'
+            $ref: "#/definitions/api.Configuration"
       produces:
         - application/json
       responses:
@@ -292,7 +303,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Set the REST API configuration.
       tags:
         - General
@@ -314,12 +325,12 @@ paths:
           description: OK
           schema:
             items:
-              $ref: '#/definitions/client.GroupEntry'
+              $ref: "#/definitions/client.GroupEntry"
             type: array
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: List all Signal Groups.
       tags:
         - Groups
@@ -333,7 +344,7 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.CreateGroupRequest'
+            $ref: "#/definitions/api.CreateGroupRequest"
         - description: Registered Phone Number
           in: path
           name: number
@@ -345,11 +356,11 @@ paths:
         "201":
           description: Created
           schema:
-            $ref: '#/definitions/api.CreateGroupResponse'
+            $ref: "#/definitions/api.CreateGroupResponse"
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Create a new Signal Group.
       tags:
         - Groups
@@ -379,7 +390,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Delete a Signal Group.
       tags:
         - Groups
@@ -404,11 +415,11 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/client.GroupEntry'
+            $ref: "#/definitions/client.GroupEntry"
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: List a Signal Group.
       tags:
         - Groups
@@ -438,7 +449,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Block a Signal Group.
       tags:
         - Groups
@@ -468,7 +479,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Join a Signal Group.
       tags:
         - Groups
@@ -498,7 +509,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Quit a Signal Group.
       tags:
         - Groups
@@ -531,7 +542,7 @@ paths:
           description: OK
           schema:
             items:
-              $ref: '#/definitions/client.IdentityEntry'
+              $ref: "#/definitions/client.IdentityEntry"
             type: array
       summary: List Identities
       tags:
@@ -545,7 +556,7 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.TrustIdentityRequest'
+            $ref: "#/definitions/api.TrustIdentityRequest"
         - description: Registered Phone Number
           in: path
           name: number
@@ -575,7 +586,7 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.UpdateProfileRequest'
+            $ref: "#/definitions/api.UpdateProfileRequest"
         - description: Registered Phone Number
           in: path
           name: number
@@ -591,7 +602,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Update Profile.
       tags:
         - Profiles
@@ -614,10 +625,61 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Link device and generate QR code.
       tags:
         - Devices
+  /v1/reactions/{number}:
+    post:
+      consumes:
+      - application/json
+      description: React to a message.
+      parameters:
+      - description: Reactions
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/api.Reaction'
+      produces:
+      - application/json
+      responses:
+        "204":
+          description: No Content
+          schema:
+            type: string
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/api.Error'
+      summary: Send a reaction.
+      tags:
+      - Reactions
+    delete:
+      consumes:
+      - application/json
+      description: Delete a reaction.
+      parameters:
+      - description: Reactions
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/api.Reaction'
+      produces:
+      - application/json
+      responses:
+        "204":
+          description: No Content
+          schema:
+            type: string
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/api.Error'
+      summary: Delete a reaction.
+      tags:
+      - Reactions
   /v1/receive/{number}:
     get:
       consumes:
@@ -629,7 +691,7 @@ paths:
           name: number
           required: true
           type: string
-      - description: 'Receive timeout in seconds (default: 1)'
+        - description: "Receive timeout in seconds (default: 1)"
           in: query
           name: timeout
           type: string
@@ -645,7 +707,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Receive Signal Messages.
       tags:
         - Messages
@@ -664,7 +726,7 @@ paths:
           in: body
           name: data
           schema:
-          $ref: '#/definitions/api.RegisterNumberRequest'
+            $ref: "#/definitions/api.RegisterNumberRequest"
       produces:
         - application/json
       responses:
@@ -672,7 +734,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Register a phone number.
       tags:
         - Devices
@@ -691,7 +753,7 @@ paths:
           in: body
           name: data
           schema:
-          $ref: '#/definitions/api.VerifyNumberSettings'
+            $ref: "#/definitions/api.VerifyNumberSettings"
         - description: Verification Code
           in: path
           name: token
@@ -707,7 +769,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Verify a registered phone number.
       tags:
         - Devices
@@ -723,7 +785,7 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.SendMessageV1'
+            $ref: "#/definitions/api.SendMessageV1"
       produces:
         - application/json
       responses:
@@ -734,7 +796,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Send a signal message.
       tags:
         - Messages
@@ -754,7 +816,7 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.TypingIndicatorRequest'
+            $ref: "#/definitions/api.TypingIndicatorRequest"
       produces:
         - application/json
       responses:
@@ -765,7 +827,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Hide Typing Indicator.
       tags:
         - Messages
@@ -784,7 +846,7 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.TypingIndicatorRequest'
+            $ref: "#/definitions/api.TypingIndicatorRequest"
       produces:
         - application/json
       responses:
@@ -795,7 +857,7 @@ paths:
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Show Typing Indicator.
       tags:
         - Messages
@@ -810,18 +872,18 @@ paths:
           name: data
           required: true
           schema:
-          $ref: '#/definitions/api.SendMessageV2'
+            $ref: "#/definitions/api.SendMessageV2"
       produces:
         - application/json
       responses:
         "201":
           description: Created
           schema:
-            $ref: '#/definitions/api.SendMessageResponse'
+            $ref: "#/definitions/api.SendMessageResponse"
         "400":
           description: Bad Request
           schema:
-            $ref: '#/definitions/api.Error'
+            $ref: "#/definitions/api.Error"
       summary: Send a signal message.
       tags:
         - Messages
@@ -841,3 +903,6 @@ tags:
     name: Profiles
   - description: List and Trust Identities.
     name: Identities
+  - description: React to messages.
+    name: Reactions
+"

src/main.go

@@ -46,6 +46,9 @@ import (
 // @tag.name Identities
 // @tag.description List and Trust Identities.
 
+// @tag.name Reactions
+// @tag.description React to messages.
+
 // @host 127.0.0.1:8080
 // @BasePath /
 func main() {
@@ -114,7 +117,6 @@ func main() {
 		}
 	}
 
-
 	jsonRpc2ClientConfigPathPath := *signalCliConfig + "/jsonrpc2.yml"
 	signalClient := client.NewSignalClient(*signalCliConfig, *attachmentTmpDir, *avatarTmpDir, signalCliMode, jsonRpc2ClientConfigPathPath)
 	err = signalClient.Init()
@@ -196,6 +198,12 @@ func main() {
 			typingIndicator.PUT(":number", api.SendStartTyping)
 			typingIndicator.DELETE(":number", api.SendStopTyping)
 		}
+
+		reactions := v1.Group("/reactions")
+		{
+			reactions.POST(":number", api.SendReaction)
+			reactions.DELETE(":number", api.RemoveReaction)
+		}
 	}
 
 	v2 := router.Group("/v2")
@@ -264,8 +272,5 @@ func main() {
 		c.Start()
 	}
 
-
 	router.Run()
 }
-
-