Skip to content

Commit 3ccf77b

Browse files
committed
portal: remove reactions that fail to be pre-handled
Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
1 parent edae083 commit 3ccf77b

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

bridgev2/portal.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,14 @@ func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogi
10711071
if err != nil {
10721072
log.Err(err).Msg("Failed to pre-handle Matrix reaction")
10731073
portal.sendErrorStatus(ctx, evt, err)
1074+
_, err := sender.User.DoublePuppet(ctx).SendMessage(ctx, portal.MXID, event.EventRedaction, &event.Content{
1075+
Parsed: &event.RedactionEventContent{
1076+
Redacts: evt.ID,
1077+
},
1078+
}, nil)
1079+
if err != nil {
1080+
log.Err(err).Msg("Failed to remove errored reaction")
1081+
}
10741082
return
10751083
}
10761084
existing, err := portal.Bridge.DB.Reaction.GetByID(ctx, reactionTarget.ID, reactionTarget.PartID, preResp.SenderID, preResp.EmojiID)
@@ -1126,6 +1134,14 @@ func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogi
11261134
if err != nil {
11271135
log.Err(err).Msg("Failed to handle Matrix reaction")
11281136
portal.sendErrorStatus(ctx, evt, err)
1137+
_, err := sender.User.DoublePuppet(ctx).SendMessage(ctx, portal.MXID, event.EventRedaction, &event.Content{
1138+
Parsed: &event.RedactionEventContent{
1139+
Redacts: evt.ID,
1140+
},
1141+
}, nil)
1142+
if err != nil {
1143+
log.Err(err).Msg("Failed to remove errored reaction")
1144+
}
11291145
return
11301146
}
11311147
if dbReaction == nil {

0 commit comments

Comments
 (0)