Send double puppeting identifier with read receipts if server supports it

custompuppet.go

@@ -215,17 +215,17 @@ func (puppet *Puppet) handlePresenceEvent(event *event.Event) {
 
 func (puppet *Puppet) handleReceiptEvent(portal *Portal, event *event.Event) {
 	for eventID, receipts := range *event.Content.AsReceipt() {
-		if _, ok := receipts.Read[puppet.CustomMXID]; !ok {
-			continue
-		}
-		message := puppet.bridge.DB.Message.GetByMXID(eventID)
-		if message == nil {
-			continue
-		}
-		puppet.customUser.log.Debugfln("Marking %s/%s in %s/%s as read", message.JID, message.MXID, portal.Key.JID, portal.MXID)
-		_, err := puppet.customUser.Conn.Read(portal.Key.JID, message.JID)
-		if err != nil {
-			puppet.customUser.log.Warnln("Error marking read:", err)
+		if receipt, ok := receipts.Read[puppet.CustomMXID]; !ok {
+			// Ignore receipt events where this user isn't present.
+		} else if isDoublePuppeted, _ := receipt.Extra["net.maunium.whatsapp.puppet"].(bool); isDoublePuppeted {
+			puppet.customUser.log.Debugfln("Ignoring double puppeted read receipt %+v", event.Content.Raw)
+			// Ignore double puppeted read receipts.
+		} else if message := puppet.bridge.DB.Message.GetByMXID(eventID); message != nil {
+			puppet.customUser.log.Debugfln("Marking %s/%s in %s/%s as read", message.JID, message.MXID, portal.Key.JID, portal.MXID)
+			_, err := puppet.customUser.Conn.Read(portal.Key.JID, message.JID)
+			if err != nil {
+				puppet.customUser.log.Warnln("Error marking read:", err)
+			}
 		}
 	}
 }

go.mod

@@ -12,7 +12,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	maunium.net/go/mauflag v1.0.0
 	maunium.net/go/maulogger/v2 v2.2.4
-	maunium.net/go/mautrix v0.9.11
+	maunium.net/go/mautrix v0.9.12
 )
 
 replace github.com/Rhymen/go-whatsapp => github.com/tulir/go-whatsapp v0.5.2

go.sum

@@ -670,6 +670,8 @@ maunium.net/go/maulogger/v2 v2.2.4 h1:oV2GDeM4fx1uRysdpDC0FcrPg+thFicSd9XzPcYMbV
 maunium.net/go/maulogger/v2 v2.2.4/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
 maunium.net/go/mautrix v0.9.11 h1:WY6mLVLM8MAM2znmqgsSFGVlSG7b3vvPMcKNrBOtK/o=
 maunium.net/go/mautrix v0.9.11/go.mod h1:7IzKfWvpQtN+W2Lzxc0rLvIxFM3ryKX6Ys3S/ZoWbg8=
+maunium.net/go/mautrix v0.9.12 h1:iNsKOCyK/BqN6Q/7A1aLj1B0/lMbr81LIg+Lry1Vjuo=
+maunium.net/go/mautrix v0.9.12/go.mod h1:7IzKfWvpQtN+W2Lzxc0rLvIxFM3ryKX6Ys3S/ZoWbg8=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM=

user.go

@@ -30,6 +30,7 @@ import (
 
 	"github.com/skip2/go-qrcode"
 	log "maunium.net/go/maulogger/v2"
+
 	"maunium.net/go/mautrix/appservice"
 	"maunium.net/go/mautrix/pushrules"
 
@@ -744,6 +745,11 @@ func (user *User) updateChatTag(intent *appservice.IntentAPI, portal *Portal, ta
 	}
 }
 
+type CustomReadReceipt struct {
+	Timestamp    int64 `json:"ts,omitempty"`
+	DoublePuppet bool  `json:"net.maunium.whatsapp.puppet,omitempty"`
+}
+
 func (user *User) syncChatDoublePuppetDetails(doublePuppet *Puppet, chat Chat, justCreated bool) {
 	if doublePuppet == nil || doublePuppet.CustomIntent() == nil {
 		return
@@ -752,7 +758,7 @@ func (user *User) syncChatDoublePuppetDetails(doublePuppet *Puppet, chat Chat, j
 	if chat.UnreadCount == 0 && (justCreated || !user.bridge.Config.Bridge.MarkReadOnlyOnCreate) {
 		lastMessage := user.bridge.DB.Message.GetLastInChat(chat.Portal.Key)
 		if lastMessage != nil {
-			err := intent.MarkRead(chat.Portal.MXID, lastMessage.MXID)
+			err := intent.MarkReadWithContent(chat.Portal.MXID, lastMessage.MXID, &CustomReadReceipt{DoublePuppet: true})
 			if err != nil {
 				user.log.Warnln("Failed to mark %s in %s as read after backfill: %v", lastMessage.MXID, chat.Portal.MXID, err)
 			}
@@ -1225,7 +1231,7 @@ func (user *User) HandleMsgInfo(info whatsapp.JSONMsgInfo) {
 				continue
 			}
 
-			err := intent.MarkRead(portal.MXID, msg.MXID)
+			err := intent.MarkReadWithContent(portal.MXID, msg.MXID, &CustomReadReceipt{DoublePuppet: intent.IsCustomPuppet})
 			if err != nil {
 				user.log.Warnln("Failed to mark message %s as read by %s: %v", msg.MXID, info.SenderJID, err)
 			}
@@ -1276,7 +1282,7 @@ func (user *User) markSelfRead(jid, messageID string) {
 		}
 		user.log.Debugfln("User read message %s/%s in %s/%s in WhatsApp mobile", message.JID, message.MXID, portal.Key.JID, portal.MXID)
 	}
-	err := intent.MarkRead(portal.MXID, message.MXID)
+	err := intent.MarkReadWithContent(portal.MXID, message.MXID, &CustomReadReceipt{DoublePuppet: true})
 	if err != nil {
 		user.log.Warnfln("Failed to bridge own read receipt in %s: %v", jid, err)
 	}