From 1d29aa4694117a014f1c7f20fff080ea50de8960 Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Mon, 27 Oct 2025 17:52:46 -0400 Subject: [PATCH 1/3] Generic online safety check for commands --- telegram/commands.go | 173 +++++++++++++++++++++++-------------------- xmpp/handlers.go | 2 +- 2 files changed, 94 insertions(+), 81 deletions(-) diff --git a/telegram/commands.go b/telegram/commands.go index 1f65520..f938d03 100644 --- a/telegram/commands.go +++ b/telegram/commands.go @@ -51,23 +51,23 @@ var permissionsMember = client.ChatPermissions{ var permissionsReadonly = client.ChatPermissions{} var transportCommands = map[string]command{ - "help": command{0, []string{}, "help", false, nil}, - "login": command{1, []string{"phone"}, "sign in", false, nil}, - "logout": command{0, []string{}, "sign out", true, nil}, - "cleanup": command{0, []string{}, "unsubscribe from all known chats", false, nil}, - "cancelauth": command{0, []string{}, "quit the signin wizard", false, nil}, - "code": command{1, []string{"xxxxx"}, "check one-time code", false, nil}, - "password": command{1, []string{"********"}, "check 2fa password", false, nil}, - "setusername": command{0, []string{"@username"}, "update @username", true, nil}, - "setname": command{1, []string{"first", "last"}, "update name", true, nil}, - "setbio": command{0, []string{"Lorem ipsum"}, "update about", true, nil}, - "setpassword": command{0, []string{"old", "new"}, "set or remove password", true, nil}, - "config": command{0, []string{"param", "value"}, "view or update configuration options", false, nil}, - "report": command{2, []string{"chat", "comment"}, "report a chat by id or @username", true, nil}, - "add": command{1, []string{"@username"}, "add @username to your chat list", true, nil}, - "join": command{1, []string{"https://t.me/invite_link"}, "join to chat via invite link or @publicname", true, nil}, - "supergroup": command{1, []string{"title", "description"}, "create new supergroup «title» with «description»", true, nil}, - "channel": command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil}, + "help": command{0, []string{}, "help", false, nil, false}, + "login": command{1, []string{"phone"}, "sign in", false, nil, false}, + "logout": command{0, []string{}, "sign out", true, nil, true}, + "cleanup": command{0, []string{}, "unsubscribe from all known chats", false, nil, false}, + "cancelauth": command{0, []string{}, "quit the signin wizard", false, nil, false}, + "code": command{1, []string{"xxxxx"}, "check one-time code", false, nil, false}, + "password": command{1, []string{"********"}, "check 2fa password", false, nil, false}, + "setusername": command{0, []string{"@username"}, "update @username", true, nil, true}, + "setname": command{1, []string{"first", "last"}, "update name", true, nil, false}, + "setbio": command{0, []string{"Lorem ipsum"}, "update about", true, nil, true}, + "setpassword": command{0, []string{"old", "new"}, "set or remove password", true, nil, true}, + "config": command{0, []string{"param", "value"}, "view or update configuration options", false, nil, false}, + "report": command{2, []string{"chat", "comment"}, "report a chat by id or @username", true, nil, true}, + "add": command{1, []string{"@username"}, "add @username to your chat list", true, nil, true}, + "join": command{1, []string{"https://t.me/invite_link"}, "join to chat via invite link or @publicname", true, nil, true}, + "supergroup": command{1, []string{"title", "description"}, "create new supergroup «title» with «description»", true, nil, true}, + "channel": command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil, true}, } var notForGroups = []ChatType{ChatTypeBasicGroup, ChatTypeSupergroup, ChatTypeChannel} @@ -76,38 +76,38 @@ var notForPMAndBasic = []ChatType{ChatTypePrivate, ChatTypeSecret, ChatTypeBasic var onlyForSecret = []ChatType{ChatTypePrivate, ChatTypeBasicGroup, ChatTypeSupergroup, ChatTypeChannel} var chatCommands = map[string]command{ - "help": command{0, []string{}, "help", false, nil}, - "d": command{0, []string{"n"}, "delete your last message(s)", true, nil}, - "s": command{1, []string{"edited message"}, "edit your last message", true, nil}, - "silent": command{1, []string{"message"}, "send a message without sound", true, nil}, - "schedule": command{2, []string{"{online | 2006-01-02T15:04:05 | 15:04:05}", "message"}, "schedules a message either to timestamp or to whenever the user goes online", true, nil}, - "raw": command{1, []string{"message"}, "send a raw message not interpeted as a transport command (e.g. a bot command)", true, nil}, - "forward": command{2, []string{"message_id", "target_chat"}, "forwards a message", true, nil}, - "vcard": command{0, []string{}, "print vCard as text", true, nil}, - "add": command{1, []string{"@username"}, "add @username to your chat list", true, nil}, - "join": command{1, []string{"https://t.me/invite_link"}, "join to chat via invite link or @publicname", true, nil}, - "group": command{1, []string{"title"}, "create groupchat «title» with current user", true, ¬ForGroups}, - "supergroup": command{1, []string{"title", "description"}, "create new supergroup «title» with «description»", true, nil}, - "channel": command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil}, - "secret": command{0, []string{}, "create secretchat with current user", true, ¬ForGroups}, - "search": command{0, []string{"string", "[limit]"}, "search in current chat", true, nil}, - "history": command{0, []string{"limit"}, "get last [limit] messages from current chat", true, nil}, - "block": command{0, []string{}, "blacklist current user", true, ¬ForGroups}, - "unblock": command{0, []string{}, "unblacklist current user", true, ¬ForGroups}, - "invite": command{1, []string{"id or @username"}, "add user to current chat", true, ¬ForPM}, - "link": command{0, []string{}, "get invite link for current chat", true, ¬ForPM}, - "kick": command{1, []string{"id or @username"}, "remove user from current chat", true, ¬ForPM}, - "mute": command{0, []string{"id or @username", "hours"}, "mute the whole chat or a user in current chat", true, ¬ForPMAndBasic}, - "unmute": command{0, []string{"id or @username"}, "unmute the whole chat or a user in the current chat", true, ¬ForPMAndBasic}, - "ban": command{1, []string{"id or @username", "hours"}, "restrict @username from current chat for [hours] or forever", true, ¬ForPM}, - "unban": command{1, []string{"id or @username"}, "unbans @username in current chat (and devotes from admins)", true, ¬ForPM}, - "promote": command{1, []string{"id or @username", "title"}, "promote user to admin in current chat", true, ¬ForPM}, - "leave": command{0, []string{}, "leave current chat", true, ¬ForPM}, - "leave!": command{0, []string{}, "leave current chat (for owners)", true, ¬ForPM}, - "ttl": command{0, []string{"seconds"}, "set secret chat messages TTL before self-destroying", true, &onlyForSecret}, - "close": command{0, []string{}, "close current secret chat", true, &onlyForSecret}, - "delete": command{0, []string{}, "delete current chat from chat list", true, nil}, - "members": command{0, []string{"query"}, "search members [by optional query] in current chat (requires admin rights)", true, nil}, + "help": command{0, []string{}, "help", false, nil, false}, + "d": command{0, []string{"n"}, "delete your last message(s)", true, nil, true}, + "s": command{1, []string{"edited message"}, "edit your last message", true, nil, true}, + "silent": command{1, []string{"message"}, "send a message without sound", true, nil, true}, + "schedule": command{2, []string{"{online | 2006-01-02T15:04:05 | 15:04:05}", "message"}, "schedules a message either to timestamp or to whenever the user goes online", true, nil, true}, + "raw": command{1, []string{"message"}, "send a raw message not interpeted as a transport command (e.g. a bot command)", true, nil, true}, + "forward": command{2, []string{"message_id", "target_chat"}, "forwards a message", true, nil, true}, + "vcard": command{0, []string{}, "print vCard as text", true, nil, true}, + "add": command{1, []string{"@username"}, "add @username to your chat list", true, nil, true}, + "join": command{1, []string{"https://t.me/invite_link"}, "join to chat via invite link or @publicname", true, nil, true}, + "group": command{1, []string{"title"}, "create groupchat «title» with current user", true, ¬ForGroups, true}, + "supergroup": command{1, []string{"title", "description"}, "create new supergroup «title» with «description»", true, nil, true}, + "channel": command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil, true}, + "secret": command{0, []string{}, "create secretchat with current user", true, ¬ForGroups, true}, + "search": command{0, []string{"string", "[limit]"}, "search in current chat", true, nil, true}, + "history": command{0, []string{"limit"}, "get last [limit] messages from current chat", true, nil, true}, + "block": command{0, []string{}, "blacklist current user", true, ¬ForGroups, true}, + "unblock": command{0, []string{}, "unblacklist current user", true, ¬ForGroups, true}, + "invite": command{1, []string{"id or @username"}, "add user to current chat", true, ¬ForPM, true}, + "link": command{0, []string{}, "get invite link for current chat", true, ¬ForPM, true}, + "kick": command{1, []string{"id or @username"}, "remove user from current chat", true, ¬ForPM, true}, + "mute": command{0, []string{"id or @username", "hours"}, "mute the whole chat or a user in current chat", true, ¬ForPMAndBasic, true}, + "unmute": command{0, []string{"id or @username"}, "unmute the whole chat or a user in the current chat", true, ¬ForPMAndBasic, true}, + "ban": command{1, []string{"id or @username", "hours"}, "restrict @username from current chat for [hours] or forever", true, ¬ForPM, true}, + "unban": command{1, []string{"id or @username"}, "unbans @username in current chat (and devotes from admins)", true, ¬ForPM, true}, + "promote": command{1, []string{"id or @username", "title"}, "promote user to admin in current chat", true, ¬ForPM, true}, + "leave": command{0, []string{}, "leave current chat", true, ¬ForPM, true}, + "leave!": command{0, []string{}, "leave current chat (for owners)", true, ¬ForPM, true}, + "ttl": command{0, []string{"seconds"}, "set secret chat messages TTL before self-destroying", true, &onlyForSecret, true}, + "close": command{0, []string{}, "close current secret chat", true, &onlyForSecret, true}, + "delete": command{0, []string{}, "delete current chat from chat list", true, nil, true}, + "members": command{0, []string{"query"}, "search members [by optional query] in current chat (requires admin rights)", true, nil, true}, } var transportConfigurationOptions = map[string]configurationOption{ @@ -129,6 +129,7 @@ type command struct { Description string LoginOnly bool NotFor *[]ChatType + OnlineOnly bool } type configurationOption struct { arguments string @@ -143,6 +144,15 @@ const ( CommandTypeChat ) +// OnlineFilter is a tri-state condition for commands selection +type OnlineFilter int + +const ( + OnlineFilterOnline OnlineFilter = iota + OnlineFilterNotOnline + OnlineFilterAny +) + // GetCommands exposes the set of commands func GetCommands(typ CommandType) map[string]command { var commandMap map[string]command @@ -165,14 +175,20 @@ func GetCommand(typ CommandType, cmd string) (command, bool) { } // SortedCommandKeys sorts a slice with command keys -func SortedCommandKeys(commandMap map[string]command) []string { +func SortedCommandKeys(commandMap map[string]command, onlineFilter OnlineFilter) []string { keys := make([]string, len(commandMap)) i := 0 for k := range commandMap { + command := commandMap[k] + if (onlineFilter == OnlineFilterOnline && !command.OnlineOnly) || (onlineFilter == OnlineFilterNotOnline && command.OnlineOnly) { + continue + } + keys[i] = k i++ } + keys = keys[:i] sort.Strings(keys) @@ -215,24 +231,32 @@ func IsCommandForChatType(cmd command, chatType ChatType) bool { return true } -func (c *Client) helpString(typ CommandType, chatId int64) string { - var str strings.Builder - - commandMap := GetCommands(typ) - chatType, chatTypeErr := c.GetChatType(chatId, true) - - str.WriteString("Available commands:\n") - for _, name := range SortedCommandKeys(commandMap) { +func commandsToHelpString(str *strings.Builder, chatType ChatType, onlineFilter OnlineFilter, commandMap map[string]command) { + for _, name := range SortedCommandKeys(commandMap, onlineFilter) { command := commandMap[name] - if chatTypeErr == nil && !IsCommandForChatType(command, chatType) { + if !IsCommandForChatType(command, chatType) { continue } str.WriteString(CommandToHelpString(name, command)) str.WriteString("\n") } +} + +func (c *Client) helpString(typ CommandType, chatId int64) string { + var str strings.Builder + + commandMap := GetCommands(typ) + chatType, _ := c.GetChatType(chatId, true) + + str.WriteString("Available commands:\n") if typ == CommandTypeTransport { - str.WriteString("Configuration options\n") + commandsToHelpString(&str, chatType, OnlineFilterNotOnline, commandMap) + + str.WriteString("\nOnline-only commands:\n") + commandsToHelpString(&str, chatType, OnlineFilterOnline, commandMap) + + str.WriteString("\nConfiguration options\n") for _, name := range persistence.ConfigKeys { option := transportConfigurationOptions[name] str.WriteString(name) @@ -242,6 +266,8 @@ func (c *Client) helpString(typ CommandType, chatId int64) string { str.WriteString(option.description) str.WriteString("\n") } + } else if typ == CommandTypeChat { + commandsToHelpString(&str, chatType, OnlineFilterAny, commandMap) } str.WriteString("\nYou may use ! instead of / if it conflicts with internal commands of a client") @@ -336,6 +362,9 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin if len(args) < command.RequiredArgs { return notEnoughArguments, false } + if command.OnlineOnly && !c.Online() { + return notOnline, false + } switch cmd { case "login", "code", "password": @@ -376,10 +405,6 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin } // sign out case "logout": - if !c.Online() { - return notOnline, false - } - _, err := c.client.LogOut() if err != nil { return errors.Wrap(err, "Logout error").Error(), false @@ -400,10 +425,6 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin return "Cancelled", true // set @username case "setusername": - if !c.Online() { - return notOnline, false - } - var username string if len(args) > 0 { username = args[0] @@ -448,10 +469,6 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin } // set About case "setbio": - if !c.Online() { - return notOnline, false - } - _, err := c.client.SetBio(&client.SetBioRequest{ Bio: rawCmdArguments(cmdline, 0), }) @@ -460,10 +477,6 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin } // set password case "setpassword": - if !c.Online() { - return notOnline, false - } - var oldPassword string var newPassword string if len(args) > 0 { @@ -550,10 +563,6 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin // ProcessChatCommand executes a command sent in a mapped chat // and returns a response, the status of command support and the execution success result func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, bool) { - if !c.Online() { - return notOnline, true, false - } - cmd, args := parseCommand(cmdline) command, ok := chatCommands[cmd] if !ok { @@ -562,6 +571,10 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, if len(args) < command.RequiredArgs { return notEnoughArguments, true, false } + if command.OnlineOnly && !c.Online() { + return notOnline, true, false + } + chatType, chatTypeErr := c.GetChatType(chatID, true) if chatTypeErr == nil && !IsCommandForChatType(command, chatType) { diff --git a/xmpp/handlers.go b/xmpp/handlers.go index b6d6822..4d5dcda 100644 --- a/xmpp/handlers.go +++ b/xmpp/handlers.go @@ -740,7 +740,7 @@ func handleGetDiscoItems(s xmpp.Sender, iq *stanza.IQ, di *stanza.DiscoItems) { } commands := telegram.GetCommands(cmdType) - for _, name := range telegram.SortedCommandKeys(commands) { + for _, name := range telegram.SortedCommandKeys(commands, telegram.OnlineFilterAny) { command := commands[name] if chatTypeErr == nil && !telegram.IsCommandForChatType(command, chatType) { continue From 5650850be9d5554617c381ef98994f42149f282b Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Mon, 27 Oct 2025 18:21:49 -0400 Subject: [PATCH 2/3] Return text acknowledges for arbitrary commands --- telegram/commands.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/telegram/commands.go b/telegram/commands.go index f938d03..738c46b 100644 --- a/telegram/commands.go +++ b/telegram/commands.go @@ -403,6 +403,7 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin c.authorizer.Password <- args[0] } } + return "", true // sign out case "logout": _, err := c.client.LogOut() @@ -620,6 +621,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, if err != nil { return err.Error(), true, false } + return "", true, true // edit message case "s": if c.me == nil { @@ -653,6 +655,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, } else { return "Message processing error", true, false } + return "", true, true // send without sound case "silent": content := c.PrepareOutgoingMessageContent(rawCmdArguments(cmdline, 0)) @@ -758,6 +761,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, } else { return "Message processing error", true, false } + return "", true, true // forward a message to chat case "forward": messageId, err := strconv.ParseInt(args[0], 10, 64) @@ -1140,6 +1144,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, } c.sendMessagesReverse(chatID, messages.Messages) + return "", true, true // get latest entries from history case "history": var limit int32 = 10 @@ -1176,6 +1181,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, } c.sendMessagesReverse(chatID, messages) + return "", true, true // chat members case "members": var query string @@ -1205,7 +1211,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool, return "", false, false } - return "", true, true + return "Success", true, true } func (c *Client) cmdAdd(args []string) (string, bool) { @@ -1221,7 +1227,7 @@ func (c *Client) cmdAdd(args []string) (string, bool) { c.subscribeToID(chat.Id, chat) - return "", true + return "Subscription sent", true } func (c *Client) cmdJoin(args []string) (string, bool) { @@ -1250,7 +1256,7 @@ func (c *Client) cmdJoin(args []string) (string, bool) { } } - return "", true + return "Joined", true } func (c *Client) cmdSupergroup(args []string, cmdline string) (string, bool) { @@ -1262,7 +1268,7 @@ func (c *Client) cmdSupergroup(args []string, cmdline string) (string, bool) { return err.Error(), false } - return "", true + return "Created", true } func (c *Client) cmdChannel(args []string, cmdline string) (string, bool) { @@ -1275,5 +1281,5 @@ func (c *Client) cmdChannel(args []string, cmdline string) (string, bool) { return err.Error(), false } - return "", true + return "Created", true } From eee277e36eb9b6383e937fb86fcfb9684df447be Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Fri, 31 Oct 2025 13:16:56 -0400 Subject: [PATCH 3/3] Track updated message ids for more reliable message edit check --- telegram/client.go | 39 +++++++++++ telegram/handlers.go | 154 ++++++++++++++++++++++++++++++------------- xmpp/component.go | 12 ++++ 3 files changed, 158 insertions(+), 47 deletions(-) diff --git a/telegram/client.go b/telegram/client.go index 005ec2f..4ef78c9 100644 --- a/telegram/client.go +++ b/telegram/client.go @@ -27,6 +27,41 @@ type HashedAvatar struct { File int32 } +// NewId stores message ids and timestamps of their additions so old ones can be truncated to save memory +type newId struct { + Id int64 + Ts int64 + lock sync.Mutex + ownLock sync.Mutex + locked bool + fired bool +} + +func newNewId() *newId { + return &newId{Ts: time.Now().Unix()} +} + +func (i *newId) Lock() { + i.ownLock.Lock() + if i.fired { + i.ownLock.Unlock() + return + } + i.locked = true + i.ownLock.Unlock() + i.lock.Lock() +} + +func (i *newId) Unlock() { + i.ownLock.Lock() + if i.locked { + i.lock.Unlock() + i.locked = false + i.fired = true + } + i.ownLock.Unlock() +} + // Client stores the metadata for lazily invoked TDlib instance type Client struct { client *client.Client @@ -64,6 +99,9 @@ type Client struct { AvatarHashes map[int64]*HashedAvatar AvatarHashesLock sync.Mutex + MessageIdChanges map[int64]map[int64]*newId + MessageIdChangesLock sync.Mutex + locks clientLocks SendMessageLock sync.Mutex } @@ -149,6 +187,7 @@ func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component lastMsgIds: make(map[int64]string), XmppClientFeatures: make(map[string]*[]string), AvatarHashes: make(map[int64]*HashedAvatar), + MessageIdChanges: make(map[int64]map[int64]*newId), locks: clientLocks{ chatMessageLocks: make(map[int64]*sync.Mutex), }, diff --git a/telegram/handlers.go b/telegram/handlers.go index a9cdb06..d7d0823 100644 --- a/telegram/handlers.go +++ b/telegram/handlers.go @@ -312,67 +312,99 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) { sId := strconv.FormatInt(update.MessageId, 10) var isCarbon bool - message, messageErr := c.client.GetMessage(&client.GetMessageRequest{ - ChatId: update.ChatId, - MessageId: update.MessageId, - }) - var prefix string - if messageErr == nil { - if message.EditDate == 0 { - return + go func() { + message, messageErr := c.client.GetMessage(&client.GetMessageRequest{ + ChatId: update.ChatId, + MessageId: update.MessageId, + }) + if messageErr != nil { + // odnako za vremya puti + // sobaka mogla podrasti + c.MessageIdChangesLock.Lock() + idsMap, idsMapOk := c.MessageIdChanges[update.ChatId] + hadNoId := false + if idsMapOk { + newId, newIdOk := idsMap[update.MessageId] + if newIdOk { + if newId.Id == 0 { + hadNoId = true + c.MessageIdChangesLock.Unlock() + newId.Lock() + } + log.Infof("falling back to updated message id: %v/%v->%v", update.ChatId, update.MessageId, newId.Id) + message, messageErr = c.client.GetMessage(&client.GetMessageRequest{ + ChatId: update.ChatId, + MessageId: newId.Id, + }) + } + } + if !hadNoId { + c.MessageIdChangesLock.Unlock() + } } + var prefix string + if messageErr == nil { + if message.EditDate == 0 { + return + } + log.Debugf("editDate: %v", message.EditDate) - isCarbon = c.isCarbonsEnabled() && message.IsOutgoing - // reply correction support in clients is suboptimal yet, so cut them out for now - prefix, _ = c.messageToPrefix(message, "", "", true) - } else { - log.Errorf("No message %v/%v found, cannot reliably determine if it is a carbon and if it is edited", update.ChatId, update.MessageId) - } - - // use XEP-0308 edits only if the last message is edited for sure, fallback otherwise - if c.Session.NativeEdits { - lastXmppId, ok := c.getLastChatMessageId(update.ChatId) - if xmppIdErr != nil { - xmppId = sId - } - if ok && lastXmppId == xmppId { - replaceId = xmppId + isCarbon = c.isCarbonsEnabled() && message.IsOutgoing + // reply correction support in clients is suboptimal yet, so cut them out for now + prefix, _ = c.messageToPrefix(message, "", "", true) } else { - log.Infof("Mismatching message ids: %v %v, falling back to separate edit message", lastXmppId, xmppId) + log.Errorf("No message %v/%v found, cannot reliably determine if it is a carbon and if it is edited: %v", update.ChatId, update.MessageId, messageErr.Error()) } - } - var text strings.Builder - - if replaceId == "" { - var editChar string - if c.Session.AsciiArrows { - editChar = "e" - } else { - editChar = "✎" + // use XEP-0308 edits only if the last message is edited for sure, fallback otherwise + if c.Session.NativeEdits { + lastXmppId, ok := c.getLastChatMessageId(update.ChatId) + if xmppIdErr != nil { + xmppId = sId + } + if ok && lastXmppId == xmppId { + replaceId = xmppId + } else { + log.Infof("Mismatching message ids: %v %v, falling back to separate edit message", lastXmppId, xmppId) + } } - text.WriteString(fmt.Sprintf("%s %v | ", editChar, update.MessageId)) - } else if prefix != "" { - text.WriteString(prefix) - text.WriteString(c.getPrefixSeparator(update.ChatId)) - } - text.WriteString(formatter.Format( - textContent.Text.Text, - textContent.Text.Entities, - markupFunction, - )) + var text strings.Builder - sChatId := strconv.FormatInt(update.ChatId, 10) - for _, jid := range jids { - gateway.SendMessage(jid, sChatId, text.String(), "e"+sId, c.xmpp, nil, replaceId, isCarbon, false) - } + if replaceId == "" { + var editChar string + if c.Session.AsciiArrows { + editChar = "e" + } else { + editChar = "✎" + } + text.WriteString(fmt.Sprintf("%s %v | ", editChar, update.MessageId)) + } else if prefix != "" { + text.WriteString(prefix) + text.WriteString(c.getPrefixSeparator(update.ChatId)) + } + + text.WriteString(formatter.Format( + textContent.Text.Text, + textContent.Text.Entities, + markupFunction, + )) + + sChatId := strconv.FormatInt(update.ChatId, 10) + for _, jid := range jids { + gateway.SendMessage(jid, sChatId, text.String(), "e"+sId, c.xmpp, nil, replaceId, isCarbon, false) + } + }() } } // message(s) deleted func (c *Client) updateDeleteMessages(update *client.UpdateDeleteMessages) { if update.IsPermanent { + for _, deleteId := range update.MessageIds { + c.tryUnlockMessageId(update.ChatId, deleteId) + } + if c.Session.IsChatIgnored(update.ChatId) { return } @@ -411,6 +443,20 @@ func (c *Client) updateMessageSendSucceeded(update *client.UpdateMessageSendSucc log.Errorf("failed to replace %v with %v: %v", update.OldMessageId, update.Message.Id, err.Error()) } + c.MessageIdChangesLock.Lock() + idsMap, ok := c.MessageIdChanges[update.Message.ChatId] + if !ok { + idsMap = make(map[int64]*newId) + c.MessageIdChanges[update.Message.ChatId] = idsMap + } + id, ok := idsMap[update.OldMessageId] + if !ok { + id = newNewId() + idsMap[update.OldMessageId] = id + } + id.Id = update.Message.Id + c.MessageIdChangesLock.Unlock() + c.sendMarker(update.Message.ChatId, update.Message.Id, gateway.MarkerTypeReceived) // clean uploaded files @@ -420,6 +466,8 @@ func (c *Client) updateMessageSendSucceeded(update *client.UpdateMessageSendSucc } } func (c *Client) updateMessageSendFailed(update *client.UpdateMessageSendFailed) { + c.tryUnlockMessageId(update.Message.ChatId, update.OldMessageId) + // clean uploaded files file, _ := c.contentToFile(update.Message.Content) if file != nil && file.Local != nil { @@ -446,3 +494,15 @@ func (c *Client) updateChatTitle(update *client.UpdateChatTitle) { func (c *Client) updateChatReadOutbox(update *client.UpdateChatReadOutbox) { c.sendMarker(update.ChatId, update.LastReadOutboxMessageId, gateway.MarkerTypeDisplayed) } + +func (c *Client) tryUnlockMessageId(chatId, messageId int64) { + c.MessageIdChangesLock.Lock() + idsMap, ok := c.MessageIdChanges[chatId] + if ok { + id, ok := idsMap[messageId] + if ok { + id.Unlock() + } + } + c.MessageIdChangesLock.Unlock() +} diff --git a/xmpp/component.go b/xmpp/component.go index 6a0ae98..784b25f 100644 --- a/xmpp/component.go +++ b/xmpp/component.go @@ -148,6 +148,18 @@ func heartbeat(component *xmpp.Component) { } } session.DelayedStatusesLock.Unlock() + + // shrink message id maps + session.MessageIdChangesLock.Lock() + for _, idsMap := range session.MessageIdChanges { + for oldMessageId, newId := range idsMap { + if newId.Ts < now - 60 { + newId.Unlock() + delete(idsMap, oldMessageId) + } + } + } + session.MessageIdChangesLock.Unlock() } sessionLock.Unlock()