summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-09-23 10:26:45 +0100
committerMark Haines <mark.haines@matrix.org>2015-09-23 10:26:45 +0100
commit57338a97683de16b325a2e62b4dee4b4a6b77aa2 (patch)
tree12f0ed28e427ed99eaad1af27954e1db45141187 /synapse/handlers
parentsynapse/handlers/federation.py:_handle_auth_events was unused (diff)
downloadsynapse-57338a97683de16b325a2e62b4dee4b4a6b77aa2.tar.xz
synapse/handlers/room.py:_should_invite_join was unused
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py26
1 files changed, 0 insertions, 26 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 243623190f..d60f86bbd0 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -493,32 +493,6 @@ class RoomMemberHandler(BaseHandler):
         )
 
     @defer.inlineCallbacks
-    def _should_invite_join(self, room_id, prev_state, do_auth):
-        logger.debug("_should_invite_join: room_id: %s", room_id)
-
-        # XXX: We don't do an auth check if we are doing an invite
-        # join dance for now, since we're kinda implicitly checking
-        # that we are allowed to join when we decide whether or not we
-        # need to do the invite/join dance.
-
-        # Only do an invite join dance if a) we were invited,
-        # b) the person inviting was from a differnt HS and c) we are
-        # not currently in the room
-        room_host = None
-        if prev_state and prev_state.membership == Membership.INVITE:
-            room = yield self.store.get_room(room_id)
-            inviter = UserID.from_string(
-                prev_state.sender
-            )
-
-            is_remote_invite_join = not self.hs.is_mine(inviter) and not room
-            room_host = inviter.domain
-        else:
-            is_remote_invite_join = False
-
-        defer.returnValue((is_remote_invite_join, room_host))
-
-    @defer.inlineCallbacks
     def get_joined_rooms_for_user(self, user):
         """Returns a list of roomids that the user has any of the given
         membership states in."""