mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-19 17:56:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Attempt at fix 1"

Browse source 
This reverts commit 668206155.

This didn't work because of course it didn't. See Attempt 2 for details.
This commit is contained in:
Travis Ralston 2019-03-05 22:53:41 -07:00
parent b93bdb8e4e
commit 89b5876a00
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/handlers/room_member.py
View file

@ -455,7 +455,6 @@ class RoomMemberHandler(object):
logger.info("Is host in room? %s" % is_host_in_room) logger.info("Is host in room? %s" % is_host_in_room)
logger.info("effective_membership_state %s" % effective_membership_state) logger.info("effective_membership_state %s" % effective_membership_state)
logger.info("remote_room_hosts %s" % remote_room_hosts) logger.info("remote_room_hosts %s" % remote_room_hosts)
logger.info("hs_is_mine %s" % self.hs.is_mine(target))
if effective_membership_state == Membership.JOIN: if effective_membership_state == Membership.JOIN:
if requester.is_guest: if requester.is_guest:
@ -486,14 +485,6 @@ class RoomMemberHandler(object):
defer.returnValue(ret) defer.returnValue(ret)
elif effective_membership_state == Membership.LEAVE: elif effective_membership_state == Membership.LEAVE:
# Send disinvite events to remotes
remote_invite = self.hs.is_mine(target)
if remote_invite and is_host_in_room:
remote_room_hosts = remote_room_hosts + [target.domain]
res = yield self._remote_reject_invite(
requester, remote_room_hosts, room_id, target,
)
defer.returnValue(res)
if not is_host_in_room: if not is_host_in_room:
# perhaps we've been invited # perhaps we've been invited
inviter = yield self._get_inviter(target.to_string(), room_id) inviter = yield self._get_inviter(target.to_string(), room_id)