handlegmessages: only send initial MSS success for outgoing messages

mautrix · Sep 30, 2024 · 9c9da85 · 9c9da85
1 parent ccb3c66
commit 9c9da85
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/pkg/connector/dbmeta.go b/pkg/connector/dbmeta.go
@@ -74,6 +74,7 @@ type MessageMetadata struct {
 	MediaID      string `json:"media_id,omitempty"`
 	MediaPending bool   `json:"media_pending,omitempty"`
 
+	IsOutgoing      bool `json:"is_outgoing,omitempty"`
 	MSSSent         bool `json:"mss_sent,omitempty"`
 	MSSFailSent     bool `json:"mss_fail_sent,omitempty"`
 	MSSDeliverySent bool `json:"mss_delivery_sent,omitempty"`

diff --git a/pkg/connector/handlegmessages.go b/pkg/connector/handlegmessages.go
@@ -505,6 +505,7 @@ func (m *MessageUpdateEvent) ConvertEdit(ctx context.Context, portal *bridgev2.P
 
 	prevMainMeta := existing[0].Metadata.(*MessageMetadata)
 	newMainMeta := converted.Parts[0].DBMetadata.(*MessageMetadata)
+	newMainMeta.IsOutgoing = prevMainMeta.IsOutgoing
 	newMainMeta.MSSSent = prevMainMeta.MSSSent
 	newMainMeta.MSSFailSent = prevMainMeta.MSSFailSent
 	newMainMeta.MSSDeliverySent = prevMainMeta.MSSDeliverySent
@@ -878,7 +879,7 @@ func (m *MessageEvent) HandleExisting(ctx context.Context, portal *bridgev2.Port
 		(hasPendingMedia && updatedMediaIsComplete) ||
 		messageWasEdited ||
 		existingMeta.GlobalPartCount != len(m.MessageInfo)
-	needsMSSEvent := !existingMeta.MSSSent && isSuccessfullySentStatus(newStatus)
+	needsMSSEvent := existingMeta.IsOutgoing && !existingMeta.MSSSent && isSuccessfullySentStatus(newStatus)
 	needsMSSFailureEvent := !existingMeta.MSSFailSent && !existingMeta.MSSSent && getFailMessage(newStatus) != ""
 	needsMSSDeliveryEvent := !existingMeta.MSSDeliverySent && portal.RoomType == database.RoomTypeDM && (newStatus == gmproto.MessageStatusType_OUTGOING_DELIVERED || newStatus == gmproto.MessageStatusType_OUTGOING_DISPLAYED)
 	needsReadReceipt := !existingMeta.ReadReceiptSent && portal.RoomType == database.RoomTypeDM && newStatus == gmproto.MessageStatusType_OUTGOING_DISPLAYED

diff --git a/pkg/connector/handlematrix.go b/pkg/connector/handlematrix.go
@@ -70,6 +70,7 @@ func (gc *GMClient) handleRemoteEcho(rawEvt bridgev2.RemoteMessage, dbMessage *d
 	evt := rawEvt.(*MessageEvent)
 	_, textHash := getTextPart(evt.Message)
 	dbMessage.Metadata = &MessageMetadata{
+		IsOutgoing:      true,
 		Type:            evt.GetMessageStatus().GetStatus(),
 		TextHash:        textHash,
 		GlobalPartCount: len(evt.MessageInfo),