aboutsummaryrefslogtreecommitdiff
path: root/telegram
diff options
context:
space:
mode:
authorBohdan Horbeshko <bodqhrohro@gmail.com>2024-06-01 23:43:38 +0300
committerBohdan Horbeshko <bodqhrohro@gmail.com>2024-06-01 23:45:21 +0300
commitba8f4c08cf70c062a9f40147c6245d348e8f8346 (patch)
treef41dfdfa12066f43a156bf633dc84379a0015df0 /telegram
parentaf07773b07ed3d0138ad237906bcd8e81512a11d (diff)
Attach prefix to OOB descriptions and omit empty ones only if sender is displayed by carbonHEADv1.9.6master
Diffstat (limited to 'telegram')
-rw-r--r--telegram/utils.go25
1 files changed, 19 insertions, 6 deletions
diff --git a/telegram/utils.go b/telegram/utils.go
index 4509d1a..819455c 100644
--- a/telegram/utils.go
+++ b/telegram/utils.go
@@ -1058,13 +1058,19 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
fileName, link := c.formatFile(file, false)
oob = link
- if c.Session.OOBMode && oob != "" {
- typ := message.Content.MessageContentType()
- if typ != client.TypeMessageSticker {
- auxText = text
+ oobSwap := c.Session.OOBMode && oob != ""
+
+ var ignorePrefix bool
+ if oobSwap {
+ if text == "" || message.Content.MessageContentType() == client.TypeMessageSticker {
+ isPM, err := c.IsPM(chatId)
+ if err == nil {
+ ignorePrefix = isPM && c.isCarbonsEnabled()
+ }
}
- text = oob
- } else if !c.Session.RawMessages {
+ }
+
+ if !c.Session.RawMessages && !ignorePrefix {
var newText strings.Builder
prefix, prefixReply := c.messageToPrefix(message, previewName, fileName, false)
@@ -1080,6 +1086,13 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
}
text = newText.String()
}
+
+ if oobSwap {
+ if !ignorePrefix {
+ auxText = text
+ }
+ text = oob
+ }
}
}
if !replyObtained {