Merge branch 'master' into muc

This commit is contained in:
Bohdan Horbeshko 2025-06-02 10:59:03 -04:00
commit 86d8f0903a

View file

@ -1721,10 +1721,8 @@ func (c *Client) SendMessageToGateway(chatId int64, message *client.Message, id
var ignorePrefix bool
if oobSwap {
if text == "" || message.Content.MessageContentType() == client.TypeMessageSticker {
isPM, _, err := c.IsPM(chatId)
if err == nil {
ignorePrefix = isPM && c.isCarbonsEnabled()
}
chatType, err := c.GetChatType(chatId)
ignorePrefix = err == nil && (chatType != ChatTypeBasicGroup && chatType != ChatTypeSupergroup) && c.isCarbonsEnabled()
}
}