Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatable

Copy over non-federatable trait on room upgrade
This commit is contained in:
Andrew Morgan 2019-01-31 20:28:37 +00:00 committed by GitHub
commit c45fd0dda0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 11 deletions

View file

@ -263,6 +263,16 @@ class RoomCreationHandler(BaseHandler):
}
}
# Check if old room was non-federatable
# Get old room's create event
old_room_create_event = yield self.store.get_create_event_for_room(old_room_id)
# Check if the create event specified a non-federatable room
if not old_room_create_event.content.get("m.federate", True):
# If so, mark the new room as non-federatable as well
creation_content["m.federate"] = False
initial_state = dict()
# Replicate relevant room events