Skip to content

bridgev2: allow relayed reactions #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keithah wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −12
Open

bridgev2: allow relayed reactions #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions bridgev2/portal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,11 +859,7 @@ func (portal *Portal) handleMatrixEvent(ctx context.Context, sender *User, evt *
case event.EventMessage, event.EventSticker, event.EventUnstablePollStart, event.EventUnstablePollResponse:
return portal.handleMatrixMessage(ctx, login, origSender, evt)
case event.EventReaction:
if origSender != nil {
log.Debug().Msg("Ignoring reaction event from relayed user")
return EventHandlingResultIgnored.WithMSSError(ErrIgnoringReactionFromRelayedUser)
}
return portal.handleMatrixReaction(ctx, login, evt)
return portal.handleMatrixReaction(ctx, login, origSender, evt)
case event.EventRedaction:
return portal.handleMatrixRedaction(ctx, login, origSender, evt)
case event.StateRoomName:
Expand Down Expand Up @@ -1569,7 +1565,7 @@ func (portal *Portal) handleMatrixEdit(
return EventHandlingResultSuccess
}

func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogin, evt *event.Event) (handleRes EventHandlingResult) {
func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogin, origSender *OrigSender, evt *event.Event) (handleRes EventHandlingResult) {
log := zerolog.Ctx(ctx)
reactingAPI, ok := sender.Client.(ReactionHandlingNetworkAPI)
if !ok {
Expand All @@ -1593,7 +1589,7 @@ func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogi
return EventHandlingResultFailed.WithMSSError(fmt.Errorf("reaction %w", ErrTargetMessageNotFound))
}
caps := sender.Client.GetCapabilities(ctx, portal)
err = portal.autoAcceptMessageRequest(ctx, evt, sender, nil, caps)
err = portal.autoAcceptMessageRequest(ctx, evt, sender, origSender, caps)
if err != nil {
log.Warn().Err(err).Msg("Failed to auto-accept message request on reaction")
// TODO stop processing?
Expand All @@ -1603,11 +1599,12 @@ func (portal *Portal) handleMatrixReaction(ctx context.Context, sender *UserLogi
})
react := &MatrixReaction{
MatrixEventBase: MatrixEventBase[*event.ReactionEventContent]{
Event: evt,
Content: content,
Portal: portal,
Event: evt,
Content: content,
Portal: portal,
OrigSender: origSender,

InputTransactionID: portal.parseInputTransactionID(nil, evt),
InputTransactionID: portal.parseInputTransactionID(origSender, evt),
},
TargetMessage: reactionTarget,
}
Expand Down
2 changes: 1 addition & 1 deletion bridgev2/portalinternal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (portal *PortalInternals) HandleMatrixEdit(ctx context.Context, sender *Use
}

func (portal *PortalInternals) HandleMatrixReaction(ctx context.Context, sender *UserLogin, evt *event.Event) (handleRes EventHandlingResult) {
return (*Portal)(portal).handleMatrixReaction(ctx, sender, evt)
return (*Portal)(portal).handleMatrixReaction(ctx, sender, nil, evt)
}

func (portal *PortalInternals) GetTargetUser(ctx context.Context, userID id.UserID) (GhostOrUserLogin, error) {
Expand Down