diff --git a/Makefile b/Makefile index 8a3b062..80607e2 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ COMMIT := $(shell git rev-parse --short HEAD) TD_COMMIT := "5bbfc1cf5dab94f82e02f3430ded7241d4653551" -VERSION := "v1.12.0" +VERSION := "v1.12.1" MAKEOPTS := "-j4" all: diff --git a/telegabber.go b/telegabber.go index 1f0f3e0..7d9a329 100644 --- a/telegabber.go +++ b/telegabber.go @@ -16,7 +16,7 @@ import ( goxmpp "gosrc.io/xmpp" ) -var version string = "1.12.0" +var version string = "1.12.1" var commit string var sm *goxmpp.StreamManager diff --git a/telegram/utils.go b/telegram/utils.go index b0d1dd1..789f635 100644 --- a/telegram/utils.go +++ b/telegram/utils.go @@ -1110,7 +1110,8 @@ func (c *Client) messageToPrefix(message *client.Message, previewString string, } } } - if !isPM || !c.Session.HideIds { + // with hideids options enabled, hide the id for everything but non-carbons in group chats + if (!isPM && !(c.isCarbonsEnabled() && message.IsOutgoing)) || !c.Session.HideIds { prefix = append(prefix, directionChar+strconv.FormatInt(message.Id, 10)) } // show sender in group chats