telegram/client.go

@@ -27,41 +27,6 @@ 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
@@ -99,9 +64,6 @@ type Client struct {
 	AvatarHashes     map[int64]*HashedAvatar
 	AvatarHashesLock sync.Mutex
 
-	MessageIdChanges     map[int64]map[int64]*newId
-	MessageIdChangesLock sync.Mutex
-
 	locks           clientLocks
 	SendMessageLock sync.Mutex
 }
@@ -187,7 +149,6 @@ 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),
 		},

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, false},
+	"help":        command{0, []string{}, "help", false, nil},
-	"login":       command{1, []string{"phone"}, "sign in", false, nil, false},
+	"login":       command{1, []string{"phone"}, "sign in", false, nil},
-	"logout":      command{0, []string{}, "sign out", true, nil, true},
+	"logout":      command{0, []string{}, "sign out", true, nil},
-	"cleanup":     command{0, []string{}, "unsubscribe from all known chats", false, nil, false},
+	"cleanup":     command{0, []string{}, "unsubscribe from all known chats", false, nil},
-	"cancelauth":  command{0, []string{}, "quit the signin wizard", false, nil, false},
+	"cancelauth":  command{0, []string{}, "quit the signin wizard", false, nil},
-	"code":        command{1, []string{"xxxxx"}, "check one-time code", false, nil, false},
+	"code":        command{1, []string{"xxxxx"}, "check one-time code", false, nil},
-	"password":    command{1, []string{"********"}, "check 2fa password", false, nil, false},
+	"password":    command{1, []string{"********"}, "check 2fa password", false, nil},
-	"setusername": command{0, []string{"@username"}, "update @username", true, nil, true},
+	"setusername": command{0, []string{"@username"}, "update @username", true, nil},
-	"setname":     command{1, []string{"first", "last"}, "update name", true, nil, false},
+	"setname":     command{1, []string{"first", "last"}, "update name", true, nil},
-	"setbio":      command{0, []string{"Lorem ipsum"}, "update about", true, nil, true},
+	"setbio":      command{0, []string{"Lorem ipsum"}, "update about", true, nil},
-	"setpassword": command{0, []string{"old", "new"}, "set or remove password", true, nil, true},
+	"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, false},
+	"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, true},
+	"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, true},
+	"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, true},
+	"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, true},
+	"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, true},
+	"channel":     command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil},
 }
 
 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, false},
+	"help":       command{0, []string{}, "help", false, nil},
-	"d":          command{0, []string{"n"}, "delete your last message(s)", true, nil, true},
+	"d":          command{0, []string{"n"}, "delete your last message(s)", true, nil},
-	"s":          command{1, []string{"edited message"}, "edit your last message", true, nil, true},
+	"s":          command{1, []string{"edited message"}, "edit your last message", true, nil},
-	"silent":     command{1, []string{"message"}, "send a message without sound", true, nil, true},
+	"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, 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},
-	"raw":        command{1, []string{"message"}, "send a raw message not interpeted as a transport command (e.g. a bot command)", 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},
-	"forward":    command{2, []string{"message_id", "target_chat"}, "forwards a message", true, nil, true},
+	"forward":    command{2, []string{"message_id", "target_chat"}, "forwards a message", true, nil},
-	"vcard":      command{0, []string{}, "print vCard as text", true, nil, true},
+	"vcard":      command{0, []string{}, "print vCard as text", true, nil},
-	"add":        command{1, []string{"@username"}, "add @username to your chat list", true, nil, true},
+	"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, true},
+	"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, &notForGroups, true},
+	"group":      command{1, []string{"title"}, "create groupchat «title» with current user", true, &notForGroups},
-	"supergroup": command{1, []string{"title", "description"}, "create new supergroup «title» with «description»", true, nil, true},
+	"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, true},
+	"channel":    command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil},
-	"secret":     command{0, []string{}, "create secretchat with current user", true, &notForGroups, true},
+	"secret":     command{0, []string{}, "create secretchat with current user", true, &notForGroups},
-	"search":     command{0, []string{"string", "[limit]"}, "search <string> in current chat", true, nil, true},
+	"search":     command{0, []string{"string", "[limit]"}, "search <string> in current chat", true, nil},
-	"history":    command{0, []string{"limit"}, "get last [limit] messages from current chat", true, nil, true},
+	"history":    command{0, []string{"limit"}, "get last [limit] messages from current chat", true, nil},
-	"block":      command{0, []string{}, "blacklist current user", true, &notForGroups, true},
+	"block":      command{0, []string{}, "blacklist current user", true, &notForGroups},
-	"unblock":    command{0, []string{}, "unblacklist current user", true, &notForGroups, true},
+	"unblock":    command{0, []string{}, "unblacklist current user", true, &notForGroups},
-	"invite":     command{1, []string{"id or @username"}, "add user to current chat", true, &notForPM, true},
+	"invite":     command{1, []string{"id or @username"}, "add user to current chat", true, &notForPM},
-	"link":       command{0, []string{}, "get invite link for current chat", true, &notForPM, true},
+	"link":       command{0, []string{}, "get invite link for current chat", true, &notForPM},
-	"kick":       command{1, []string{"id or @username"}, "remove user from current chat", true, &notForPM, true},
+	"kick":       command{1, []string{"id or @username"}, "remove user from current chat", true, &notForPM},
-	"mute":       command{0, []string{"id or @username", "hours"}, "mute the whole chat or a user in current chat", true, &notForPMAndBasic, true},
+	"mute":       command{0, []string{"id or @username", "hours"}, "mute the whole chat or a user in current chat", true, &notForPMAndBasic},
-	"unmute":     command{0, []string{"id or @username"}, "unmute the whole chat or a user in the current chat", true, &notForPMAndBasic, true},
+	"unmute":     command{0, []string{"id or @username"}, "unmute the whole chat or a user in the current chat", true, &notForPMAndBasic},
-	"ban":        command{1, []string{"id or @username", "hours"}, "restrict @username from current chat for [hours] or forever", true, &notForPM, true},
+	"ban":        command{1, []string{"id or @username", "hours"}, "restrict @username from current chat for [hours] or forever", true, &notForPM},
-	"unban":      command{1, []string{"id or @username"}, "unbans @username in current chat (and devotes from admins)", true, &notForPM, true},
+	"unban":      command{1, []string{"id or @username"}, "unbans @username in current chat (and devotes from admins)", true, &notForPM},
-	"promote":    command{1, []string{"id or @username", "title"}, "promote user to admin in current chat", true, &notForPM, true},
+	"promote":    command{1, []string{"id or @username", "title"}, "promote user to admin in current chat", true, &notForPM},
-	"leave":      command{0, []string{}, "leave current chat", true, &notForPM, true},
+	"leave":      command{0, []string{}, "leave current chat", true, &notForPM},
-	"leave!":     command{0, []string{}, "leave current chat (for owners)", true, &notForPM, true},
+	"leave!":     command{0, []string{}, "leave current chat (for owners)", true, &notForPM},
-	"ttl":        command{0, []string{"seconds"}, "set secret chat messages TTL before self-destroying", true, &onlyForSecret, true},
+	"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, true},
+	"close":      command{0, []string{}, "close current secret chat", true, &onlyForSecret},
-	"delete":     command{0, []string{}, "delete current chat from chat list", true, nil, true},
+	"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, true},
+	"members":    command{0, []string{"query"}, "search members [by optional query] in current chat (requires admin rights)", true, nil},
 }
 
 var transportConfigurationOptions = map[string]configurationOption{
@@ -129,7 +129,6 @@ type command struct {
 	Description  string
 	LoginOnly    bool
 	NotFor       *[]ChatType
-	OnlineOnly   bool
 }
 type configurationOption struct {
 	arguments   string
@@ -144,15 +143,6 @@ 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
@@ -175,20 +165,14 @@ func GetCommand(typ CommandType, cmd string) (command, bool) {
 }
 
 // SortedCommandKeys sorts a slice with command keys
-func SortedCommandKeys(commandMap map[string]command, onlineFilter OnlineFilter) []string {
+func SortedCommandKeys(commandMap map[string]command) []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)
 
@@ -231,32 +215,24 @@ func IsCommandForChatType(cmd command, chatType ChatType) bool {
 	return true
 }
 
-func commandsToHelpString(str *strings.Builder, chatType ChatType, onlineFilter OnlineFilter, commandMap map[string]command) {
+func (c *Client) helpString(typ CommandType, chatId int64) string {
-	for _, name := range SortedCommandKeys(commandMap, onlineFilter) {
+	var str strings.Builder
+
+	commandMap := GetCommands(typ)
+	chatType, chatTypeErr := c.GetChatType(chatId, true)
+
+	str.WriteString("Available commands:\n")
+	for _, name := range SortedCommandKeys(commandMap) {
 		command := commandMap[name]
-		if !IsCommandForChatType(command, chatType) {
+		if chatTypeErr == nil && !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 {
-		commandsToHelpString(&str, chatType, OnlineFilterNotOnline, commandMap)
+		str.WriteString("Configuration options\n")
-
-		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)
@@ -266,8 +242,6 @@ 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")
 
@@ -362,9 +336,6 @@ 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":
@@ -403,9 +374,12 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) (strin
 				c.authorizer.Password <- args[0]
 			}
 		}
-		return "", true
 	// 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
@@ -426,6 +400,10 @@ 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]
@@ -470,6 +448,10 @@ 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),
 		})
@@ -478,6 +460,10 @@ 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 {
@@ -564,6 +550,10 @@ 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 {
@@ -572,10 +562,6 @@ 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) {
@@ -621,7 +607,6 @@ 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 {
@@ -655,7 +640,6 @@ 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))
@@ -761,7 +745,6 @@ 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)
@@ -1144,7 +1127,6 @@ 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
@@ -1181,7 +1163,6 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool,
 		}
 
 		c.sendMessagesReverse(chatID, messages)
-		return "", true, true
 	// chat members
 	case "members":
 		var query string
@@ -1211,7 +1192,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool,
 		return "", false, false
 	}
 
-	return "Success", true, true
+	return "", true, true
 }
 
 func (c *Client) cmdAdd(args []string) (string, bool) {
@@ -1227,7 +1208,7 @@ func (c *Client) cmdAdd(args []string) (string, bool) {
 
 	c.subscribeToID(chat.Id, chat)
 
-	return "Subscription sent", true
+	return "", true
 }
 
 func (c *Client) cmdJoin(args []string) (string, bool) {
@@ -1256,7 +1237,7 @@ func (c *Client) cmdJoin(args []string) (string, bool) {
 		}
 	}
 
-	return "Joined", true
+	return "", true
 }
 
 func (c *Client) cmdSupergroup(args []string, cmdline string) (string, bool) {
@@ -1268,7 +1249,7 @@ func (c *Client) cmdSupergroup(args []string, cmdline string) (string, bool) {
 		return err.Error(), false
 	}
 
-	return "Created", true
+	return "", true
 }
 
 func (c *Client) cmdChannel(args []string, cmdline string) (string, bool) {
@@ -1281,5 +1262,5 @@ func (c *Client) cmdChannel(args []string, cmdline string) (string, bool) {
 		return err.Error(), false
 	}
 
-	return "Created", true
+	return "", true
 }

telegram/handlers.go

@@ -312,99 +312,67 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
 		sId := strconv.FormatInt(update.MessageId, 10)
 		var isCarbon bool
 
-		go func() {
+		message, messageErr := c.client.GetMessage(&client.GetMessageRequest{
-			message, messageErr := c.client.GetMessage(&client.GetMessageRequest{
+			ChatId:    update.ChatId,
-				ChatId:    update.ChatId,
+			MessageId: update.MessageId,
-				MessageId: update.MessageId,
+		})
-			})
+		var prefix string
-			if messageErr != nil {
+		if messageErr == nil {
-				// odnako za vremya puti
+			if message.EditDate == 0 {
-				// sobaka mogla podrasti
+				return
-				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
+			isCarbon = c.isCarbonsEnabled() && message.IsOutgoing
-				// reply correction support in clients is suboptimal yet, so cut them out for now
+			// reply correction support in clients is suboptimal yet, so cut them out for now
-				prefix, _ = c.messageToPrefix(message, "", "", true)
+			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
 			} else {
-				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())
+				log.Infof("Mismatching message ids: %v %v, falling back to separate edit message", lastXmppId, xmppId)
 			}
+		}
 
-			// use XEP-0308 edits only if the last message is edited for sure, fallback otherwise
+		var text strings.Builder
-			if c.Session.NativeEdits {
+
-				lastXmppId, ok := c.getLastChatMessageId(update.ChatId)
+		if replaceId == "" {
-				if xmppIdErr != nil {
+			var editChar string
-					xmppId = sId
+			if c.Session.AsciiArrows {
-				}
+				editChar = "e"
-				if ok && lastXmppId == xmppId {
+			} else {
-					replaceId = xmppId
+				editChar = "✎"
-				} 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))
+		}
 
-			var text strings.Builder
+		text.WriteString(formatter.Format(
+			textContent.Text.Text,
+			textContent.Text.Entities,
+			markupFunction,
+		))
 
-			if replaceId == "" {
+		sChatId := strconv.FormatInt(update.ChatId, 10)
-				var editChar string
+		for _, jid := range jids {
-				if c.Session.AsciiArrows {
+			gateway.SendMessage(jid, sChatId, text.String(), "e"+sId, c.xmpp, nil, replaceId, isCarbon, false)
-					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
 		}
@@ -443,20 +411,6 @@ 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
@@ -466,8 +420,6 @@ 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 {
@@ -494,15 +446,3 @@ 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()
-}

telegram/utils.go

@@ -1273,11 +1273,7 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
 
 				if text != "" {
 					if prefix != "" {
-						separator := c.getPrefixSeparator(chatId)
+						newText.WriteString(c.getPrefixSeparator(chatId))
-						newText.WriteString(separator)
-						if reply != nil {
-							reply.End += uint64(len(separator))
-						}
 					}
 					newText.WriteString(text)
 				}

xmpp/component.go

@@ -148,18 +148,6 @@ 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()
 

xmpp/extensions/extensions.go

@@ -221,12 +221,6 @@ type EntityTime struct {
 	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
 }
 
-// AttachTo is from XEP-0367
-type AttachTo struct {
-	XMLName xml.Name `xml:"urn:xmpp:message-attaching:1 attach-to"`
-	Id      string   `xml:"id,attr"`
-}
-
 // Namespace is a namespace!
 func (c PresenceNickExtension) Namespace() string {
 	return c.XMLName.Space
@@ -307,11 +301,6 @@ func (ClientMessage) Name() string {
 	return "message"
 }
 
-// Namespace is a namespace!
-func (c AttachTo) Namespace() string {
-	return c.XMLName.Space
-}
-
 // NewReplyFallback initializes a fallback range
 func NewReplyFallback(start uint64, end uint64) Fallback {
 	return Fallback{
@@ -397,10 +386,4 @@ func init() {
 		"urn:xmpp:time",
 		"time",
 	}, EntityTime{})
-
-	// attach-to
-	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
-		"urn:xmpp:message-attaching:1",
-		"attach-to",
-	}, AttachTo{})
 }

xmpp/handlers.go

@@ -149,15 +149,12 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 			var reply extensions.Reply
 			var fallback extensions.Fallback
 			var replace extensions.Replace
-			var attachTo extensions.AttachTo
 			msg.Get(&reply)
 			msg.Get(&fallback)
 			msg.Get(&replace)
-			msg.Get(&attachTo)
 			log.Debugf("reply: %#v", reply)
 			log.Debugf("fallback: %#v", fallback)
 			log.Debugf("replace: %#v", replace)
-			log.Debugf("attachTo: %#v", attachTo)
 
 			var replyId int64
 			var err error
@@ -233,16 +230,12 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 					} */
 					session.AddToEditOutbox(replace.Id, resource)
 				} else {
-					messageId := msg.Id
+					err = gateway.IdsDB.Set(session.Session.Login, bare, toID, tgMessageId, msg.Id)
-					if attachTo.Id != "" {
-						messageId = attachTo.Id
-					}
-					err = gateway.IdsDB.Set(session.Session.Login, bare, toID, tgMessageId, messageId)
 					if err == nil {
 						// session.AddToOutbox(msg.Id, resource)
-						session.UpdateLastChatMessageId(toID, messageId)
+						session.UpdateLastChatMessageId(toID, msg.Id)
 					} else {
-						log.Errorf("Failed to save ids %v/%v %v", toID, tgMessageId, messageId)
+						log.Errorf("Failed to save ids %v/%v %v", toID, tgMessageId, msg.Id)
 					}
 				}
 			} else {
@@ -747,7 +740,7 @@ func handleGetDiscoItems(s xmpp.Sender, iq *stanza.IQ, di *stanza.DiscoItems) {
 		}
 
 		commands := telegram.GetCommands(cmdType)
-		for _, name := range telegram.SortedCommandKeys(commands, telegram.OnlineFilterAny) {
+		for _, name := range telegram.SortedCommandKeys(commands) {
 			command := commands[name]
 			if chatTypeErr == nil && !telegram.IsCommandForChatType(command, chatType) {
 				continue