Prevent checkpoints for double puppeted events

appservice/intent.go

@@ -142,12 +142,16 @@ func (intent *IntentAPI) EnsureJoined(ctx context.Context, roomID id.RoomID, ext
 	return nil
 }
 
+func (intent *IntentAPI) IsDoublePuppet() bool {
+	return intent.IsCustomPuppet && intent.as.DoublePuppetValue != ""
+}
+
 func (intent *IntentAPI) AddDoublePuppetValue(into any) any {
 	return intent.AddDoublePuppetValueWithTS(into, 0)
 }
 
 func (intent *IntentAPI) AddDoublePuppetValueWithTS(into any, ts int64) any {
-	if !intent.IsCustomPuppet || intent.as.DoublePuppetValue == "" {
+	if !intent.IsDoublePuppet() {
 		return into
 	}
 	// Only use ts deduplication feature with appservice double puppeting

bridgev2/database/message.go

@@ -33,11 +33,12 @@ type Message struct {
 	PartID   networkid.PartID
 	MXID     id.EventID
 
-	Room       networkid.PortalKey
-	SenderID   networkid.UserID
-	SenderMXID id.UserID
-	Timestamp  time.Time
-	EditCount  int
+	Room             networkid.PortalKey
+	SenderID         networkid.UserID
+	SenderMXID       id.UserID
+	Timestamp        time.Time
+	EditCount        int
+	IsDoublePuppeted bool
 
 	ThreadRoot networkid.MessageID
 	ReplyTo    networkid.MessageOptionalPartID
@@ -48,7 +49,7 @@ type Message struct {
 const (
 	getMessageBaseQuery = `
 		SELECT rowid, bridge_id, id, part_id, mxid, room_id, room_receiver, sender_id, sender_mxid,
-		       timestamp, edit_count, thread_root_id, reply_to_id, reply_to_part_id, metadata
+		       timestamp, edit_count, double_puppeted, thread_root_id, reply_to_id, reply_to_part_id, metadata
 		FROM message
 	`
 	getAllMessagePartsByIDQuery  = getMessageBaseQuery + `WHERE bridge_id=$1 AND (room_receiver=$2 OR room_receiver='') AND id=$3`
@@ -72,15 +73,16 @@ const (
 	insertMessageQuery = `
 		INSERT INTO message (
 			bridge_id, id, part_id, mxid, room_id, room_receiver, sender_id, sender_mxid,
-			timestamp, edit_count, thread_root_id, reply_to_id, reply_to_part_id, metadata
+			timestamp, edit_count, double_puppeted, thread_root_id, reply_to_id, reply_to_part_id, metadata
 		)
-		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)
 		RETURNING rowid
 	`
 	updateMessageQuery = `
 		UPDATE message SET id=$2, part_id=$3, mxid=$4, room_id=$5, room_receiver=$6, sender_id=$7, sender_mxid=$8,
-		                   timestamp=$9, edit_count=$10, thread_root_id=$11, reply_to_id=$12, reply_to_part_id=$13, metadata=$14
-		WHERE bridge_id=$1 AND rowid=$15
+		                   timestamp=$9, edit_count=$10, double_puppeted=$11, thread_root_id=$12, reply_to_id=$13,
+                           reply_to_part_id=$14, metadata=$15
+		WHERE bridge_id=$1 AND rowid=$16
 	`
 	deleteAllMessagePartsByIDQuery = `
 		DELETE FROM message WHERE bridge_id=$1 AND (room_receiver=$2 OR room_receiver='') AND id=$3
@@ -174,7 +176,7 @@ func (m *Message) Scan(row dbutil.Scannable) (*Message, error) {
 	var threadRootID, replyToID, replyToPartID sql.NullString
 	err := row.Scan(
 		&m.RowID, &m.BridgeID, &m.ID, &m.PartID, &m.MXID, &m.Room.ID, &m.Room.Receiver, &m.SenderID, &m.SenderMXID,
-		&timestamp, &m.EditCount, &threadRootID, &replyToID, &replyToPartID, dbutil.JSON{Data: m.Metadata},
+		&timestamp, &m.EditCount, &m.IsDoublePuppeted, &threadRootID, &replyToID, &replyToPartID, dbutil.JSON{Data: m.Metadata},
 	)
 	if err != nil {
 		return nil, err
@@ -200,8 +202,8 @@ func (m *Message) ensureHasMetadata(metaType MetaTypeCreator) *Message {
 func (m *Message) sqlVariables() []any {
 	return []any{
 		m.BridgeID, m.ID, m.PartID, m.MXID, m.Room.ID, m.Room.Receiver, m.SenderID, m.SenderMXID,
-		m.Timestamp.UnixNano(), m.EditCount, dbutil.StrPtr(m.ThreadRoot), dbutil.StrPtr(m.ReplyTo.MessageID), m.ReplyTo.PartID,
-		dbutil.JSON{Data: m.Metadata},
+		m.Timestamp.UnixNano(), m.EditCount, m.IsDoublePuppeted, dbutil.StrPtr(m.ThreadRoot),
+		dbutil.StrPtr(m.ReplyTo.MessageID), m.ReplyTo.PartID, dbutil.JSON{Data: m.Metadata},
 	}
 }
 

bridgev2/database/upgrades/00-latest.sql

@@ -87,7 +87,7 @@ CREATE TABLE message (
 	-- would try to set bridge_id to null as well.
 
 	-- only: sqlite (line commented)
---	rowid      INTEGER PRIMARY KEY,
+--	rowid              INTEGER PRIMARY KEY,
 	-- only: postgres
 	rowid            BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
 
@@ -102,6 +102,7 @@ CREATE TABLE message (
 	sender_mxid      TEXT    NOT NULL,
 	timestamp        BIGINT  NOT NULL,
 	edit_count       INTEGER NOT NULL,
+	double_puppeted  BOOLEAN,
 	thread_root_id   TEXT,
 	reply_to_id      TEXT,
 	reply_to_part_id TEXT,

bridgev2/database/upgrades/19-add-double-puppeted-to-message.sql

@@ -0,0 +1,2 @@
+-- v19 (compatible with v9+): Add double puppeted state to messages
+ALTER TABLE message ADD COLUMN double_puppeted BOOLEAN;

bridgev2/matrix/connector.go

@@ -450,13 +450,17 @@ func (br *Connector) internalSendMessageStatus(ctx context.Context, ms *bridgev2
 		return ""
 	}
 	log := zerolog.Ctx(ctx)
-	err := br.SendMessageCheckpoints([]*status.MessageCheckpoint{ms.ToCheckpoint(evt)})
-	if err != nil {
-		log.Err(err).Msg("Failed to send message checkpoint")
+
+	if !evt.IsSourceEventDoublePuppeted {
+		err := br.SendMessageCheckpoints([]*status.MessageCheckpoint{ms.ToCheckpoint(evt)})
+		if err != nil {
+			log.Err(err).Msg("Failed to send message checkpoint")
+		}
 	}
+
 	if !ms.DisableMSS && br.Config.Matrix.MessageStatusEvents {
 		mssEvt := ms.ToMSSEvent(evt)
-		_, err = br.Bot.SendMessageEvent(ctx, evt.RoomID, event.BeeperMessageStatus, mssEvt)
+		_, err := br.Bot.SendMessageEvent(ctx, evt.RoomID, event.BeeperMessageStatus, mssEvt)
 		if err != nil {
 			log.Err(err).
 				Stringer("room_id", evt.RoomID).
@@ -482,7 +486,7 @@ func (br *Connector) internalSendMessageStatus(ctx context.Context, ms *bridgev2
 		}
 	}
 	if ms.Status == event.MessageStatusSuccess && br.Config.Matrix.DeliveryReceipts {
-		err = br.Bot.SendReceipt(ctx, evt.RoomID, evt.SourceEventID, event.ReceiptTypeRead, nil)
+		err := br.Bot.SendReceipt(ctx, evt.RoomID, evt.SourceEventID, event.ReceiptTypeRead, nil)
 		if err != nil {
 			log.Err(err).
 				Stringer("room_id", evt.RoomID).

bridgev2/matrix/intent.go

@@ -478,6 +478,10 @@ func (as *ASIntent) GetMXID() id.UserID {
 	return as.Matrix.UserID
 }
 
+func (as *ASIntent) IsDoublePuppet() bool {
+	return as.Matrix.IsDoublePuppet()
+}
+
 func (as *ASIntent) EnsureJoined(ctx context.Context, roomID id.RoomID) error {
 	err := as.Matrix.EnsureJoined(ctx, roomID)
 	if err != nil {

bridgev2/matrixinterface.go

@@ -126,6 +126,7 @@ func (ce CallbackError) Unwrap() error {
 
 type MatrixAPI interface {
 	GetMXID() id.UserID
+	IsDoublePuppet() bool
 
 	SendMessage(ctx context.Context, roomID id.RoomID, eventType event.Type, content *event.Content, extra *MatrixSendExtra) (*mautrix.RespSendEvent, error)
 	SendState(ctx context.Context, roomID id.RoomID, eventType event.Type, stateKey string, content *event.Content, ts time.Time) (*mautrix.RespSendEvent, error)

bridgev2/messagestatus.go

@@ -12,6 +12,7 @@ import (
 
 	"go.mau.fi/util/jsontime"
 
+	"maunium.net/go/mautrix/appservice"
 	"maunium.net/go/mautrix/bridge/status"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
@@ -26,20 +27,27 @@ type MessageStatusEventInfo struct {
 	Sender        id.UserID
 	ThreadRoot    id.EventID
 	StreamOrder   int64
+
+	IsSourceEventDoublePuppeted bool
 }
 
 func StatusEventInfoFromEvent(evt *event.Event) *MessageStatusEventInfo {
 	var threadRoot id.EventID
 	if relatable, ok := evt.Content.Parsed.(event.Relatable); ok {
 		threadRoot = relatable.OptionalGetRelatesTo().GetThreadParent()
 	}
+
+	_, isDoublePuppeted := evt.Content.Raw[appservice.DoublePuppetKey]
+
 	return &MessageStatusEventInfo{
 		RoomID:        evt.RoomID,
 		SourceEventID: evt.ID,
 		EventType:     evt.Type,
 		MessageType:   evt.Content.AsMessage().MsgType,
 		Sender:        evt.Sender,
 		ThreadRoot:    threadRoot,
+
+		IsSourceEventDoublePuppeted: isDoublePuppeted,
 	}
 }
 

bridgev2/portal.go

@@ -1827,15 +1827,16 @@ func (portal *Portal) sendConvertedMessage(
 	for i, part := range converted.Parts {
 		portal.applyRelationMeta(part.Content, replyTo, threadRoot, prevThreadEvent)
 		dbMessage := &database.Message{
-			ID:         id,
-			PartID:     part.ID,
-			Room:       portal.PortalKey,
-			SenderID:   senderID,
-			SenderMXID: intent.GetMXID(),
-			Timestamp:  ts,
-			ThreadRoot: ptr.Val(converted.ThreadRoot),
-			ReplyTo:    ptr.Val(converted.ReplyTo),
-			Metadata:   part.DBMetadata,
+			ID:               id,
+			PartID:           part.ID,
+			Room:             portal.PortalKey,
+			SenderID:         senderID,
+			SenderMXID:       intent.GetMXID(),
+			Timestamp:        ts,
+			ThreadRoot:       ptr.Val(converted.ThreadRoot),
+			ReplyTo:          ptr.Val(converted.ReplyTo),
+			Metadata:         part.DBMetadata,
+			IsDoublePuppeted: intent.IsDoublePuppet(),
 		}
 		if part.DontBridge {
 			dbMessage.SetFakeMXID()
@@ -2603,6 +2604,8 @@ func (portal *Portal) handleRemoteDeliveryReceipt(ctx context.Context, source *U
 				RoomID:        portal.MXID,
 				SourceEventID: part.MXID,
 				Sender:        part.SenderMXID,
+
+				IsSourceEventDoublePuppeted: part.IsDoublePuppeted,
 			})
 		}
 	}

bridgev2/portalbackfill.go

@@ -333,16 +333,17 @@ func (portal *Portal) compileBatchMessage(ctx context.Context, source *UserLogin
 		portal.applyRelationMeta(part.Content, replyTo, threadRoot, prevThreadEvent)
 		evtID := portal.Bridge.Matrix.GenerateDeterministicEventID(portal.MXID, portal.PortalKey, msg.ID, part.ID)
 		dbMessage := &database.Message{
-			ID:         msg.ID,
-			PartID:     part.ID,
-			MXID:       evtID,
-			Room:       portal.PortalKey,
-			SenderID:   msg.Sender.Sender,
-			SenderMXID: intent.GetMXID(),
-			Timestamp:  msg.Timestamp,
-			ThreadRoot: ptr.Val(msg.ThreadRoot),
-			ReplyTo:    ptr.Val(msg.ReplyTo),
-			Metadata:   part.DBMetadata,
+			ID:               msg.ID,
+			PartID:           part.ID,
+			MXID:             evtID,
+			Room:             portal.PortalKey,
+			SenderID:         msg.Sender.Sender,
+			SenderMXID:       intent.GetMXID(),
+			Timestamp:        msg.Timestamp,
+			ThreadRoot:       ptr.Val(msg.ThreadRoot),
+			ReplyTo:          ptr.Val(msg.ReplyTo),
+			Metadata:         part.DBMetadata,
+			IsDoublePuppeted: intent.IsDoublePuppet(),
 		}
 		if part.DontBridge {
 			dbMessage.SetFakeMXID()