diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-05 16:43:19 +0000 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-11-05 16:43:19 +0000 |
commit | 2cebe5354504b3baf987c08a5c0098602b38ff84 (patch) | |
tree | 03b35b28adc2f66bd094fe0c52a9f9a2a25b8f46 /synapse/handlers/_base.py | |
parent | Merge pull request #351 from matrix-org/daniel/fixtox (diff) | |
download | synapse-2cebe5354504b3baf987c08a5c0098602b38ff84.tar.xz |
Exchange 3pid invites for m.room.member invites
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r-- | synapse/handlers/_base.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index a9e43052b7..eef325a94b 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -21,7 +21,6 @@ from synapse.api.constants import Membership, EventTypes from synapse.types import UserID, RoomAlias from synapse.util.logcontext import PreserveLoggingContext -from synapse.util import third_party_invites import logging @@ -192,16 +191,6 @@ class BaseHandler(object): ) ) - if ( - event.type == EventTypes.Member and - event.content["membership"] == Membership.JOIN and - third_party_invites.join_has_third_party_invite(event.content) - ): - yield third_party_invites.check_key_valid( - self.hs.get_simple_http_client(), - event - ) - federation_handler = self.hs.get_handlers().federation_handler if event.type == EventTypes.Member: |