diff options
| author | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
| commit | b5feaa5a494e7f3fb1a0607002df54e4f17d20da (patch) | |
| tree | eae4a91e78c9215631fde08c69c4b2dd093c44e6 /synapse/handlers/federation.py | |
| parent | Merge pull request #2430 from matrix-org/erikj/groups_profile_cache (diff) | |
| parent | Fix overzealous kicking of guest users (#2453) (diff) | |
| download | synapse-b5feaa5a494e7f3fb1a0607002df54e4f17d20da.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index b790a7c2ef..4669199b2d 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1606,7 +1606,7 @@ class FederationHandler(BaseHandler): context.rejected = RejectedReason.AUTH_ERROR - if event.type == EventTypes.GuestAccess: + if event.type == EventTypes.GuestAccess and not context.rejected: yield self.maybe_kick_guest_users(event) defer.returnValue(context) |