diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-25 17:50:06 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-25 19:10:24 +0100 |
| commit | e1948175ee7fc469c985b58a01ecc2eb577e5e0a (patch) | |
| tree | cf90c3a49add874b830781df478d05b0a617443c /synapse | |
| parent | Make room_member_handler a member of RoomCreationHandler (diff) | |
| download | synapse-e1948175ee7fc469c985b58a01ecc2eb577e5e0a.tar.xz | |
Allow power_level_content_override=None for _send_events_for_new_room
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/room.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index d03d2cd7be..d42c2c41c4 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -204,7 +204,7 @@ class RoomCreationHandler(BaseHandler): initial_state=initial_state, creation_content=creation_content, room_alias=room_alias, - power_level_content_override=config.get("power_level_content_override", {}), + power_level_content_override=config.get("power_level_content_override"), creator_join_profile=creator_join_profile, ) @@ -282,9 +282,9 @@ class RoomCreationHandler(BaseHandler): invite_list, initial_state, creation_content, - room_alias, - power_level_content_override, - creator_join_profile, + room_alias=None, + power_level_content_override=None, + creator_join_profile=None, ): def create(etype, content, **kwargs): e = { @@ -364,7 +364,8 @@ class RoomCreationHandler(BaseHandler): for invitee in invite_list: power_level_content["users"][invitee] = 100 - power_level_content.update(power_level_content_override) + if power_level_content_override: + power_level_content.update(power_level_content_override) yield send( etype=EventTypes.PowerLevels, |