From 5f4165ac13612848aedde2c76995ecd9abd2af76 Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Mon, 2 Jun 2025 10:56:26 -0400 Subject: [PATCH] Ignore prefix for OOB in channels too --- Makefile | 2 +- telegabber.go | 2 +- telegram/utils.go | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 80607e2..bfac3a1 100644 --- a/Makefile +++ b/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: diff --git a/telegabber.go b/telegabber.go index 7d9a329..f4bed43 100644 --- a/telegabber.go +++ b/telegabber.go @@ -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 diff --git a/telegram/utils.go b/telegram/utils.go index 789f635..592cde1 100644 --- a/telegram/utils.go +++ b/telegram/utils.go @@ -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() } }