mirror of
https://github.com/aljazceru/signal-cli-rest-api.git
synced 2025-12-19 23:54:22 +01:00
@@ -118,6 +118,10 @@ type TrustIdentityRequest struct {
|
||||
VerifiedSafetyNumber string `json:"verified_safety_number"`
|
||||
}
|
||||
|
||||
type SendMessageResponse struct {
|
||||
Timestamp string `json:"timestamp"`
|
||||
}
|
||||
|
||||
func convertInternalGroupIdToGroupId(internalId string) string {
|
||||
return groupPrefix + base64.StdEncoding.EncodeToString([]byte(internalId))
|
||||
}
|
||||
@@ -235,7 +239,7 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
|
||||
cmd = append(cmd, attachmentTmpPaths...)
|
||||
}
|
||||
|
||||
_, err := runSignalCli(true, cmd, message)
|
||||
resp, err := runSignalCli(true, cmd, message)
|
||||
if err != nil {
|
||||
cleanupTmpFiles(attachmentTmpPaths)
|
||||
if strings.Contains(err.Error(), signalCliV2GroupError) {
|
||||
@@ -246,8 +250,10 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
|
||||
return
|
||||
}
|
||||
|
||||
sendMessageResponse := SendMessageResponse{Timestamp: strings.TrimSuffix(resp, "\n")}
|
||||
|
||||
cleanupTmpFiles(attachmentTmpPaths)
|
||||
c.Writer.WriteHeader(201)
|
||||
c.JSON(201, sendMessageResponse)
|
||||
}
|
||||
|
||||
func parseWhitespaceDelimitedKeyValueStringList(in string, keys []string) []map[string]string {
|
||||
@@ -543,7 +549,7 @@ func (a *Api) Send(c *gin.Context) {
|
||||
// @Description Send a signal message
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Success 201 {string} string "OK"
|
||||
// @Success 201 {object} SendMessageResponse
|
||||
// @Failure 400 {object} Error
|
||||
// @Param data body SendMessageV2 true "Input Data"
|
||||
// @Router /v2/send [post]
|
||||
|
||||
@@ -902,9 +902,9 @@ var doc = `{
|
||||
],
|
||||
"responses": {
|
||||
"201": {
|
||||
"description": "OK",
|
||||
"description": "Created",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
"$ref": "#/definitions/api.SendMessageResponse"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -1048,6 +1048,14 @@ var doc = `{
|
||||
}
|
||||
}
|
||||
},
|
||||
"api.SendMessageResponse": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"timestamp": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
},
|
||||
"api.SendMessageV1": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
||||
@@ -887,9 +887,9 @@
|
||||
],
|
||||
"responses": {
|
||||
"201": {
|
||||
"description": "OK",
|
||||
"description": "Created",
|
||||
"schema": {
|
||||
"type": "string"
|
||||
"$ref": "#/definitions/api.SendMessageResponse"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -1033,6 +1033,14 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"api.SendMessageResponse": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"timestamp": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
},
|
||||
"api.SendMessageV1": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
||||
@@ -84,6 +84,11 @@ definitions:
|
||||
use_voice:
|
||||
type: boolean
|
||||
type: object
|
||||
api.SendMessageResponse:
|
||||
properties:
|
||||
timestamp:
|
||||
type: string
|
||||
type: object
|
||||
api.SendMessageV1:
|
||||
properties:
|
||||
base64_attachment:
|
||||
@@ -718,9 +723,9 @@ paths:
|
||||
- application/json
|
||||
responses:
|
||||
"201":
|
||||
description: OK
|
||||
description: Created
|
||||
schema:
|
||||
type: string
|
||||
$ref: '#/definitions/api.SendMessageResponse'
|
||||
"400":
|
||||
description: Bad Request
|
||||
schema:
|
||||
|
||||
Reference in New Issue
Block a user