tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Handle incoming Matrix messages as implicit read receipts

Browse source
This commit is contained in:
Tulir Asokan 2022-01-17 12:00:02 +02:00
parent 3dd30280a1
commit abdfcdc8a6
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix.go
View file

@ -544,7 +544,7 @@ func (mx *MatrixHandler) HandleReceipt(evt *event.Event) {
// But do start disappearing messages, because the user read the chat // But do start disappearing messages, because the user read the chat
portal.ScheduleDisappearing() portal.ScheduleDisappearing()
} else { } else {
portal.HandleMatrixReadReceipt(user, eventID, time.UnixMilli(receipt.Timestamp)) portal.HandleMatrixReadReceipt(user, eventID, time.UnixMilli(receipt.Timestamp), true)
} }
} }
} }

25
portal.go
View file

@ -237,6 +237,7 @@ func (portal *Portal) handleMessageLoopItem(msg PortalMessage) {
} }
func (portal *Portal) handleMatrixMessageLoopItem(msg PortalMatrixMessage) { func (portal *Portal) handleMatrixMessageLoopItem(msg PortalMatrixMessage) {
portal.HandleMatrixReadReceipt(msg.user, "", time.UnixMilli(msg.evt.Timestamp), false)
switch msg.evt.Type { switch msg.evt.Type {
case event.EventMessage, event.EventSticker: case event.EventMessage, event.EventSticker:
portal.HandleMatrixMessage(msg.user, msg.evt) portal.HandleMatrixMessage(msg.user, msg.evt)
@ -2409,15 +2410,20 @@ func (portal *Portal) HandleMatrixRedaction(sender *User, evt *event.Event) {
} }
} }
func (portal *Portal) HandleMatrixReadReceipt(sender *User, eventID id.EventID, receiptTimestamp time.Time) { func (portal *Portal) HandleMatrixReadReceipt(sender *User, eventID id.EventID, receiptTimestamp time.Time, isExplicit bool) {
if !sender.IsLoggedIn() { if !sender.IsLoggedIn() {
portal.log.Debugfln("Ignoring read receipt by %s: user is not connected to WhatsApp", sender.JID) if isExplicit {
portal.log.Debugfln("Ignoring read receipt by %s: user is not connected to WhatsApp", sender.JID)
}
return return
} }
maxTimestamp := receiptTimestamp maxTimestamp := receiptTimestamp
if message := portal.bridge.DB.Message.GetByMXID(eventID); message != nil { // Implicit read receipts don't have an event ID that's already bridged
maxTimestamp = message.Timestamp if isExplicit {
if message := portal.bridge.DB.Message.GetByMXID(eventID); message != nil {
maxTimestamp = message.Timestamp
}
} }
prevTimestamp := sender.GetLastReadTS(portal.Key) prevTimestamp := sender.GetLastReadTS(portal.Key)
@ -2444,8 +2450,11 @@ func (portal *Portal) HandleMatrixReadReceipt(sender *User, eventID id.EventID,
} // else: blank key (participant field isn't needed in direct chat read receipts) } // else: blank key (participant field isn't needed in direct chat read receipts)
groupedMessages[key] = append(groupedMessages[key], msg.JID) groupedMessages[key] = append(groupedMessages[key], msg.JID)
} }
portal.log.Debugfln("Sending read receipts by %s (last read: %d, was zero: %t): %v", // For explicit read receipts, log even if there are no targets. For implicit ones only log when there are targets
sender.JID, prevTimestamp.Unix(), lastReadIsZero, groupedMessages) if len(groupedMessages) > 0 || isExplicit {
portal.log.Debugfln("Sending read receipts by %s (last read: %d, was zero: %t, explicit: %t): %v",
sender.JID, prevTimestamp.Unix(), lastReadIsZero, isExplicit, groupedMessages)
}
for messageSender, ids := range groupedMessages { for messageSender, ids := range groupedMessages {
chatJID := portal.Key.JID chatJID := portal.Key.JID
if messageSender.Server == types.BroadcastServer { if messageSender.Server == types.BroadcastServer {
@ -2457,7 +2466,9 @@ func (portal *Portal) HandleMatrixReadReceipt(sender *User, eventID id.EventID,
portal.log.Warnfln("Failed to mark %v as read by %s: %v", ids, sender.JID, err) portal.log.Warnfln("Failed to mark %v as read by %s: %v", ids, sender.JID, err)
} }
} }
portal.ScheduleDisappearing() if isExplicit {
portal.ScheduleDisappearing()
}
} }
func typingDiff(prev, new []id.UserID) (started, stopped []id.UserID) { func typingDiff(prev, new []id.UserID) (started, stopped []id.UserID) {