From f15e44436beb9629bbd57607faba072b1f9a9b18 Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Thu, 11 Apr 2024 20:59:49 -0400 Subject: [PATCH] Use carbons for non-native edits too --- telegram/handlers.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/telegram/handlers.go b/telegram/handlers.go index 64280e6..3c54746 100644 --- a/telegram/handlers.go +++ b/telegram/handlers.go @@ -304,20 +304,21 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) { } if ok && lastXmppId == xmppId { replaceId = xmppId - message, err := c.client.GetMessage(&client.GetMessageRequest{ - ChatId: update.ChatId, - MessageId: update.MessageId, - }) - if err == nil { - isCarbon = c.isCarbonsEnabled() && message.IsOutgoing - } else { - log.Errorf("No message %v/%v found, cannot reliably determine if it's a carbon", update.ChatId, update.MessageId) - } } else { log.Infof("Mismatching message ids: %v %v, falling back to separate edit message", lastXmppId, xmppId) } } + message, err := c.client.GetMessage(&client.GetMessageRequest{ + ChatId: update.ChatId, + MessageId: update.MessageId, + }) + if err == nil { + isCarbon = c.isCarbonsEnabled() && message.IsOutgoing + } else { + log.Errorf("No message %v/%v found, cannot reliably determine if it's a carbon", update.ChatId, update.MessageId) + } + text := formatter.Format( textContent.Text.Text, textContent.Text.Entities,