Do not ack with edited message to the XEP-0308 sender resource

1 files changed, 19 insertions, 14 deletions

diff --git a/telegram/utils.go b/telegram/utils.go
index 9664857..9486349 100644
--- a/telegram/utils.go
+++ b/telegram/utils.go
@@ -891,7 +891,6 @@ func (c *Client) ensureDownloadFile(file *client.File) *client.File {
 
 // ProcessIncomingMessage transfers a message to XMPP side and marks it as read on Telegram side
 func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message, ignoredResource string) {
-	var jids []string
 	var isPM bool
 	var err error
 	if gateway.MessageOutgoingPermission && c.Session.Carbons {
@@ -900,21 +899,13 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message, i
 			log.Errorf("Could not determine if chat is PM: %v", err)
 		}
 	}
+
 	isOutgoing := message.IsOutgoing
 	isCarbon := isPM && isOutgoing
-	log.Warnf("isOutgoing: %v", isOutgoing)
-	if isOutgoing {
-		for resource := range c.resourcesRange() {
-			if ignoredResource == "" || resource != ignoredResource {
-				jids = append(jids, c.jid+"/"+resource)
-			}
-		}
-		if len(jids) == 0 {
-			log.Info("The only resource is ignored, aborting")
-			return
-		}
-	} else {
-		jids = []string{c.jid}
+	jids := c.getCarbonFullJids(isOutgoing, ignoredResource)
+	if len(jids) == 0 {
+		log.Info("The only resource is ignored, aborting")
+		return
 	}
 
 	var text, oob, auxText string
@@ -1379,3 +1370,17 @@ func (c *Client) popFromOutbox(xmppId string) string {
 	}
 	return resource
 }
+
+func (c *Client) getCarbonFullJids(isOutgoing bool, ignoredResource string) []string {
+	var jids []string
+	if isOutgoing {
+		for resource := range c.resourcesRange() {
+			if ignoredResource == "" || resource != ignoredResource {
+				jids = append(jids, c.jid+"/"+resource)
+			}
+		}
+	} else {
+		jids = []string{c.jid}
+	}
+	return jids
+}