bridgev2/portal: re-id outgoing reactions too

mautrix · Oct 22, 2024 · 9b82442 · 9b82442
1 parent 8a81631
commit 9b82442
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/bridgev2/portal.go b/bridgev2/portal.go
@@ -1143,14 +1143,18 @@ func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogi
 		portal.sendErrorStatus(ctx, evt, err)
 		return
 	}
+	var deterministicID id.EventID
+	if portal.Bridge.Config.OutgoingMessageReID {
+		deterministicID = portal.Bridge.Matrix.GenerateReactionEventID(portal.MXID, reactionTarget, preResp.SenderID, preResp.EmojiID)
+	}
 	existing, err := portal.Bridge.DB.Reaction.GetByID(ctx, reactionTarget.ID, reactionTarget.PartID, preResp.SenderID, preResp.EmojiID)
 	if err != nil {
 		log.Err(err).Msg("Failed to check if reaction is a duplicate")
 		return
 	} else if existing != nil {
 		if existing.EmojiID != "" || existing.Emoji == preResp.Emoji {
 			log.Debug().Msg("Ignoring duplicate reaction")
-			portal.sendSuccessStatus(ctx, evt, 0, "")
+			portal.sendSuccessStatus(ctx, evt, 0, deterministicID)
 			return
 		}
 		react.ReactionToOverride = existing
@@ -1209,7 +1213,9 @@ func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogi
 		dbReaction.MessageID = reactionTarget.ID
 		dbReaction.MessagePartID = reactionTarget.PartID
 	}
-	if dbReaction.MXID == "" {
+	if deterministicID != "" {
+		dbReaction.MXID = deterministicID
+	} else if dbReaction.MXID == "" {
 		dbReaction.MXID = evt.ID
 	}
 	if dbReaction.Timestamp.IsZero() {
@@ -1232,7 +1238,7 @@ func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogi
 	if err != nil {
 		log.Err(err).Msg("Failed to save reaction to database")
 	}
-	portal.sendSuccessStatus(ctx, evt, 0, "")
+	portal.sendSuccessStatus(ctx, evt, 0, deterministicID)
 }
 
 func handleMatrixRoomMeta[APIType any, ContentType any](