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

Merge branch 'matrix-org:main' into main

Browse source
This commit is contained in:
Brian Meek 2022-09-02 23:10:09 -07:00 committed by GitHub
parent 60f6e4630f 350a5e5393
commit e228441e60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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,7 +281,9 @@ 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:
return true if appservice.IsInterestedInUserID(*ev.StateKey) {
return true
}
} }
} }
} else { } else {