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

clean things up

Browse source
This commit is contained in:
Andrew Morgan 2019-10-02 15:41:25 +01:00
parent 9429cb10ce
commit 2cf77fd5fa
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/handlers/room_member.py
View file

@ -464,19 +464,18 @@ class RoomMemberHandler(object):
if requester.is_guest: if requester.is_guest:
content["kind"] = "guest" content["kind"] = "guest"
ret = yield self._remote_join( remote_join_response = yield self._remote_join(
requester, remote_room_hosts, room_id, target, content requester, remote_room_hosts, room_id, target, content
) )
# Copy over direct message status and room tags if this is a join # Copy over direct message status and room tags if this is a join
# on an upgraded room # on an upgraded room
logger.info("### Checking Predecessor")
# Check if this is an upgraded room # Check if this is an upgraded room
predecessor = yield self.store.get_room_predecessor(room_id) predecessor = yield self.store.get_room_predecessor(room_id)
logger.info("###! Predecessor for %s: %s", room_id, predecessor) logger.debug("Found predecessor for %s: %s. Copying over room tags and push "
"rules", room_id, predecessor)
if predecessor: if predecessor:
# It is an upgraded room. Copy over old tags # It is an upgraded room. Copy over old tags
@ -488,7 +487,7 @@ class RoomMemberHandler(object):
predecessor["room_id"], room_id, requester.user.to_string() predecessor["room_id"], room_id, requester.user.to_string()
) )
return ret return remote_join_response
elif effective_membership_state == Membership.LEAVE: elif effective_membership_state == Membership.LEAVE:
if not is_host_in_room: if not is_host_in_room: