XEP-0308 message editing

2 files changed, 27 insertions, 17 deletions

diff --git a/telegram/handlers.go b/telegram/handlers.go
index bd768ae..6de59e7 100644
--- a/telegram/handlers.go
+++ b/telegram/handlers.go
@@ -272,6 +272,11 @@ func (c *Client) updateAuthorizationState(update *client.UpdateAuthorizationStat
 
 // clean uploaded files
 func (c *Client) updateMessageSendSucceeded(update *client.UpdateMessageSendSucceeded) {
+	log.Debugf("replace message %v with %v", update.OldMessageId, update.Message.Id)
+	if err := gateway.IdsDB.ReplaceTgId(c.Session.Login, c.jid, update.Message.ChatId, update.OldMessageId, update.Message.Id); err != nil {
+		log.Error("failed to replace %v with %v: %v", update.OldMessageId, update.Message.Id, err.Error())
+	}
+
 	file, _ := c.contentToFile(update.Message.Content)
 	if file != nil && file.Local != nil {
 		c.cleanTempFile(file.Local.Path)
diff --git a/telegram/utils.go b/telegram/utils.go
index dd63248..ecce6da 100644
--- a/telegram/utils.go
+++ b/telegram/utils.go
@@ -991,14 +991,14 @@ func (c *Client) PrepareOutgoingMessageContent(text string) client.InputMessageC
 	return c.prepareOutgoingMessageContent(text, nil)
 }
 
-// ProcessOutgoingMessage executes commands or sends messages to mapped chats
-func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid string, id string, replyId int64) {
+// ProcessOutgoingMessage executes commands or sends messages to mapped chats, returns message id
+func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid string, replyId int64, replaceId int64) int64 {
 	if !c.Online() {
 		// we're offline
-		return
+		return 0
 	}
 
-	if strings.HasPrefix(text, "/") || strings.HasPrefix(text, "!") {
+	if replaceId == 0 && (strings.HasPrefix(text, "/") || strings.HasPrefix(text, "!")) {
 		// try to execute commands
 		response, isCommand := c.ProcessChatCommand(chatID, text)
 		if response != "" {
@@ -1006,7 +1006,7 @@ func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid str
 		}
 		// do not send on success
 		if isCommand {
-			return
+			return 0
 		}
 	}
 
@@ -1014,7 +1014,7 @@ func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid str
 
 	// quotations
 	var reply int64
-	if replyId == 0 {
+	if replaceId == 0 && replyId == 0 {
 		replySlice := replyRegex.FindStringSubmatch(text)
 		if len(replySlice) > 1 {
 			reply, _ = strconv.ParseInt(replySlice[1], 10, 64)
@@ -1069,24 +1069,29 @@ func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid str
 
 	content := c.prepareOutgoingMessageContent(text, file)
 
+	if replaceId != 0 {
+		tgMessage, err := c.client.EditMessageText(&client.EditMessageTextRequest{
+			ChatId:              chatID,
+			MessageId:           replaceId,
+			InputMessageContent: content,
+		})
+		if err != nil {
+			c.returnError(returnJid, chatID, "Not edited", err)
+			return 0
+		}
+		return tgMessage.Id
+	}
+
 	tgMessage, err := c.client.SendMessage(&client.SendMessageRequest{
 		ChatId:              chatID,
 		ReplyToMessageId:    reply,
 		InputMessageContent: content,
 	})
 	if err != nil {
-		gateway.SendTextMessage(
-			returnJid,
-			strconv.FormatInt(chatID, 10),
-			fmt.Sprintf("Not sent: %s", err.Error()),
-			c.xmpp,
-		)
-	} else {
-		err = gateway.IdsDB.Set(c.Session.Login, c.jid, tgMessage.ChatId, tgMessage.Id, id)
-		if err != nil {
-			log.Errorf("Failed to save ids %v/%v %v", tgMessage.ChatId, tgMessage.Id, id)
-		}
+		c.returnError(returnJid, chatID, "Not sent", err)
+		return 0
 	}
+	return tgMessage.Id
 }
 
 func (c *Client) returnMessage(returnJid string, chatID int64, text string) {