narayana/telegabber
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix missing read markers in other XMPP clients than the message sender

Browse source
This commit is contained in:
Bohdan Horbeshko 2024-04-10 22:17:58 -04:00
parent 144c5724ea
commit b499992148
2 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
telegram/handlers.go
View file

@ -56,8 +56,10 @@ func (c *Client) cleanTempFile(path string) {
} }
func (c *Client) sendMarker(chatId, messageId int64, typ gateway.MarkerType) { func (c *Client) sendMarker(chatId, messageId int64, typ gateway.MarkerType) {
if xmppId, err := gateway.IdsDB.GetByTgIds(c.Session.Login, c.jid, chatId, messageId); err == nil { xmppId, err := gateway.IdsDB.GetByTgIds(c.Session.Login, c.jid, chatId, messageId)
resource := c.getFromOutbox(xmppId) if err != nil {
xmppId = strconv.FormatInt(messageId, 10)
}
var stringType string var stringType string
if typ == gateway.MarkerTypeReceived { if typ == gateway.MarkerTypeReceived {
@ -67,20 +69,16 @@ func (c *Client) sendMarker(chatId, messageId int64, typ gateway.MarkerType) {
} }
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"xmppId": xmppId, "xmppId": xmppId,
"resource": resource,
}).Debugf("marker: %s", stringType) }).Debugf("marker: %s", stringType)
if resource != "" {
gateway.SendMessageMarker( gateway.SendMessageMarker(
c.jid+"/"+resource, c.jid,
strconv.FormatInt(chatId, 10), strconv.FormatInt(chatId, 10),
c.xmpp, c.xmpp,
typ, typ,
xmppId, xmppId,
) )
} }
}
}
func (c *Client) updateHandler() { func (c *Client) updateHandler() {
listener := c.client.GetListener() listener := c.client.GetListener()

2
xmpp/handlers.go
View file

@ -203,7 +203,7 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
} else { } else {
err = gateway.IdsDB.Set(session.Session.Login, bare, toID, tgMessageId, msg.Id) err = gateway.IdsDB.Set(session.Session.Login, bare, toID, tgMessageId, msg.Id)
if err == nil { if err == nil {
session.AddToOutbox(msg.Id, resource) // session.AddToOutbox(msg.Id, resource)
session.UpdateLastChatMessageId(toID, msg.Id) session.UpdateLastChatMessageId(toID, msg.Id)
} else { } else {
log.Errorf("Failed to save ids %v/%v %v", toID, tgMessageId, msg.Id) log.Errorf("Failed to save ids %v/%v %v", toID, tgMessageId, msg.Id)