mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-03-03 17:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e228441e603427d136efc210eb441bbf0a4dded9'

Browse source
This commit is contained in:
Brian Meek 2022-09-02 23:10:30 -07:00
parent a3c5174598 e228441e60
commit bc792d832a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appservice/consumers/roomserver.go
View file

@ -134,7 +134,7 @@ func (s *OutputRoomEventConsumer) onMessage(
} }
case api.OutputTypeNewInviteEvent: case api.OutputTypeNewInviteEvent:
if output.NewInviteEvent == nil { if output.NewInviteEvent == nil || !s.appserviceIsInterestedInEvent(ctx, output.NewInviteEvent.Event, state.ApplicationService) {
continue continue
} }
events = append(events, output.NewInviteEvent.Event) events = append(events, output.NewInviteEvent.Event)
@ -281,9 +281,11 @@ func (s *OutputRoomEventConsumer) appserviceJoinedAtEvent(ctx context.Context, e
case err != nil: case err != nil:
continue continue
case membership.Membership == gomatrixserverlib.Join: case membership.Membership == gomatrixserverlib.Join:
if appservice.IsInterestedInUserID(*ev.StateKey) {
return true return true
} }
} }
}
} else { } else {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"appservice": appservice.ID, "appservice": appservice.ID,