summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-02 09:21:29 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-05-02 11:05:11 +0100
commit84196cb2310ca55100f32cfecbc62810085418e5 (patch)
treeac2ff0eb7a0ea87bbb8741269913d1a5d8eefb1f /synapse/handlers/room.py
parentMerge pull request #5116 from matrix-org/babolivier/account_expiration (diff)
downloadsynapse-84196cb2310ca55100f32cfecbc62810085418e5.tar.xz
Add some limitations to alias creation
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 17628e2684..e37ae96899 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -402,7 +402,7 @@ class RoomCreationHandler(BaseHandler):
                 yield directory_handler.create_association(
                     requester, RoomAlias.from_string(alias),
                     new_room_id, servers=(self.hs.hostname, ),
-                    send_event=False,
+                    send_event=False, check_membership=False,
                 )
                 logger.info("Moved alias %s to new room", alias)
             except SynapseError as e:
@@ -538,6 +538,7 @@ class RoomCreationHandler(BaseHandler):
                 room_alias=room_alias,
                 servers=[self.hs.hostname],
                 send_event=False,
+                check_membership=False,
             )
 
         preset_config = config.get(