diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-10-02 15:41:25 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-10-02 15:41:25 +0100 |
| commit | 2cf77fd5fa8e0fd463aa1e77e1ebcb2ee12458bd (patch) | |
| tree | 7fb72d423dad0b30c616a39f77d6ef3b1d9dfad8 | |
| parent | try doing upgrades after remote join (diff) | |
| download | synapse-anoa/tag_transfer_logging.tar.xz | |
clean things up github/anoa/tag_transfer_logging anoa/tag_transfer_logging
| -rw-r--r-- | synapse/handlers/room_member.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 6afe37c775..ce7e4f1b82 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -464,19 +464,18 @@ class RoomMemberHandler(object): if requester.is_guest: content["kind"] = "guest" - ret = yield self._remote_join( + remote_join_response = yield self._remote_join( requester, remote_room_hosts, room_id, target, content ) # Copy over direct message status and room tags if this is a join # on an upgraded room - logger.info("### Checking Predecessor") - # Check if this is an upgraded room 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: # 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() ) - return ret + return remote_join_response elif effective_membership_state == Membership.LEAVE: if not is_host_in_room: |