Finish api proposal, tbd

src/api/api.go

@@ -58,10 +58,11 @@ type VerifyNumberSettings struct {
 }
 
 type Reaction struct {
-	Number    string `json:"number"`
+	Recipient    string `json:"recipient"`
-	Timestamp int64  `json:"timestamp"`
+	Reaction     string `json:"reaction"`
-	Recipient string `json:"recipient"`
+	TargetAuthor string `json:"target_author"`
-	Reaction  string `json:"reaction"`
+	Timestamp    int64  `json:"timestamp"`
+	Remove       bool   `json:"remove,omitempty"`
 }
 
 type SendMessageV1 struct {
@@ -894,17 +895,17 @@ func (a *Api) QuitGroup(c *gin.Context) {
 	c.Status(http.StatusNoContent)
 }
 
-// @Summary Send a reaction.
+// @Summary Send or remove a reaction.
 // @Tags Reactions
-// @Description React to a message.
+// @Description React to a message or remove it.
 // @Accept  json
 // @Produce  json
-// @Success 201 {string} OK
+// @Success 204 {string} OK
 // @Failure 400 {object} Error
 // @Param data body Reaction true "Reaction"
 // @Router /v1/react/{number} [post]
 func (a *Api) SendReaction(c *gin.Context) {
-	var req Reaction
+	req := Reaction{Remove: false}
 	err := c.BindJSON(&req)
 	if err != nil {
 		c.JSON(400, Error{Msg: "Couldn't process request - invalid request"})
@@ -912,27 +913,29 @@ func (a *Api) SendReaction(c *gin.Context) {
 		return
 	}
 
+	number := c.Param("number")
+
 	if req.Recipient == "" {
 		c.JSON(400, Error{Msg: "Couldn't process request - recipient missing"})
 		return
 	}
 
-	if req.Timestamp == 0 {
-		c.JSON(400, Error{Msg: "Couldn't process request - timestamp missing"})
-		return
-	}
-
 	if req.Reaction == "" {
 		c.JSON(400, Error{Msg: "Couldn't process request - reaction missing"})
 		return
 	}
 
-	if req.Number == "" {
+	if req.TargetAuthor == "" {
-		c.JSON(400, Error{Msg: "Couldn't process request - number missing"})
+		c.JSON(400, Error{Msg: "Couldn't process request - target_author missing"})
 		return
 	}
 
-	err = a.signalClient.SendReaction(req.Number, req.Recipient, req.Timestamp, req.Reaction)
+	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, req.Remove)
 	if err != nil {
 		c.JSON(400, Error{Msg: err.Error()})
 		return

src/client/client.go

@@ -996,7 +996,8 @@ func (s *SignalClient) QuitGroup(number string, groupId string) error {
 	return err
 }
 
-func (s *SignalClient) SendReaction(number string, recipient string, timestamp int64, reaction string) error {
+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
@@ -1010,9 +1011,12 @@ func (s *SignalClient) SendReaction(number string, recipient string, timestamp i
 
 	if s.signalCliMode == JsonRpc {
 		type Request struct {
-			Recipient string `json:"recipient,omitempty"`
+			Recipient    string `json:"recipient,omitempty"`
-			GroupId   string `json:"group-id,omitempty"`
+			GroupId      string `json:"group-id,omitempty"`
-			// TODO other fields
+			Emoji        string `json:"emoji"`
+			TargetAuthor string `json:"target-author"`
+			Timestamp    int64  `json:"target-timestamp"`
+			Remove       bool   `json:"remove,omitempty"`
 		}
 		request := Request{}
 		if !isGroup {
@@ -1020,29 +1024,35 @@ func (s *SignalClient) SendReaction(number string, recipient string, timestamp i
 		} else {
 			request.GroupId = recp
 		}
-
+		request.Emoji = emoji
+		request.TargetAuthor = target_author
+		request.Timestamp = timestamp
+		if remove == true {
+			request.Remove = remove
+		}
 		jsonRpc2Client, err := s.getJsonRpc2Client(number)
 		if err != nil {
 			return err
 		}
 		_, err = jsonRpc2Client.getRaw("sendReaction", request)
-	} else {
+		return err
-		// TODO: check CLI command again
-		cmd := []string{
-			"--config", s.signalCliConfig,
-			"-u", number,
-			"sendTyping",
-			"-e", reaction,
-			"-t", strconv.FormatInt(timestamp, 10),
-		}
-		if !isGroup {
-			cmd = append(cmd, recp)
-		} else {
-			cmd = append(cmd, []string{"-g", recp}...)
-		}
-		_, err = runSignalCli(true, cmd, "", s.signalCliMode)
 	}
 
+	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
 }