summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-09-12 16:57:16 +0100
committerGitHub <noreply@github.com>2016-09-12 16:57:16 +0100
commit1c9da43a959763d007d3e35b0d66d447e8175ece (patch)
tree0324992bcc99548fb16e00fa6d61848c3634209a /synapse/handlers/room.py
parentMerge pull request #1107 from matrix-org/erikj/backfill_none (diff)
parentAdd is_direct param to /createRoom (diff)
downloadsynapse-1c9da43a959763d007d3e35b0d66d447e8175ece.tar.xz
Merge pull request #1108 from matrix-org/erikj/create_dm
Add is_direct param to /createRoom
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8758af4ca1..d40ada60c1 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -196,6 +196,11 @@ class RoomCreationHandler(BaseHandler):
                 },
                 ratelimit=False)
 
+        content = {}
+        is_direct = config.get("is_direct", None)
+        if is_direct:
+            content["is_direct"] = is_direct
+
         for invitee in invite_list:
             yield room_member_handler.update_membership(
                 requester,
@@ -203,6 +208,7 @@ class RoomCreationHandler(BaseHandler):
                 room_id,
                 "invite",
                 ratelimit=False,
+                content=content,
             )
 
         for invite_3pid in invite_3pid_list: