narayana.im/telegabber
1
0
Fork 1
mirror of https://dev.narayana.im/narayana/telegabber.git synced 2026-08-05 04:07:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into adhoc

Browse source
This commit is contained in:
Bohdan Horbeshko 2024-06-01 20:27:44 -04:00
commit dd0df7188a
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
telegram/utils.go
View file

@ -1110,13 +1110,19 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
fileName, link := c.formatFile(file, false) fileName, link := c.formatFile(file, false)
oob = link oob = link
if c.Session.OOBMode && oob != "" { oobSwap := c.Session.OOBMode && oob != ""
typ := message.Content.MessageContentType()
if typ != client.TypeMessageSticker { var ignorePrefix bool
auxText = text 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 var newText strings.Builder
prefix, prefixReply := c.messageToPrefix(message, previewName, fileName, false) prefix, prefixReply := c.messageToPrefix(message, previewName, fileName, false)
@ -1132,6 +1138,13 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
} }
text = newText.String() text = newText.String()
} }
if oobSwap {
if !ignorePrefix {
auxText = text
}
text = oob
}
} }
} }
if !replyObtained { if !replyObtained {