mirror of
https://dev.narayana.im/narayana/telegabber.git
synced 2026-08-05 04:07:07 +00:00
Ignore prefix for OOB in channels too
This commit is contained in:
parent
68c3bece71
commit
5f4165ac13
3 changed files with 4 additions and 6 deletions
2
Makefile
2
Makefile
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
COMMIT := $(shell git rev-parse --short HEAD)
|
||||
TD_COMMIT := "5bbfc1cf5dab94f82e02f3430ded7241d4653551"
|
||||
VERSION := "v1.12.1"
|
||||
VERSION := "v1.12.2"
|
||||
MAKEOPTS := "-j4"
|
||||
|
||||
all:
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import (
|
|||
goxmpp "gosrc.io/xmpp"
|
||||
)
|
||||
|
||||
var version string = "1.12.1"
|
||||
var version string = "1.12.2"
|
||||
var commit string
|
||||
|
||||
var sm *goxmpp.StreamManager
|
||||
|
|
|
|||
|
|
@ -1251,10 +1251,8 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
|
|||
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()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue