summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-02 11:22:56 +0100
committerErik Johnston <erik@matrix.org>2015-10-02 11:22:56 +0100
commit40017a9a114aa917d7cb3231da08465f7500ab41 (patch)
tree24119e131c66f646431d5c2a63b52a551e9fcf27
parentMerge pull request #275 from matrix-org/erikj/invite_state (diff)
downloadsynapse-40017a9a114aa917d7cb3231da08465f7500ab41.tar.xz
Add 'trusted_private_chat' to room creation presets
Diffstat (limited to '')
-rw-r--r--synapse/api/constants.py1
-rw-r--r--synapse/handlers/room.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 3385664394..008ee64727 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -83,3 +83,4 @@ class RejectedReason(object):
 class RoomCreationPreset(object):
     PRIVATE_CHAT = "private_chat"
     PUBLIC_CHAT = "public_chat"
+    TRUSTED_PRIVATE_CHAT = "trusted_private_chat"
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index ac636255c2..3364a5de14 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -41,6 +41,11 @@ class RoomCreationHandler(BaseHandler):
             "history_visibility": "shared",
             "original_invitees_have_ops": False,
         },
+        RoomCreationPreset.TRUSTED_PRIVATE_CHAT: {
+            "join_rules": JoinRules.INVITE,
+            "history_visibility": "shared",
+            "original_invitees_have_ops": True,
+        },
         RoomCreationPreset.PUBLIC_CHAT: {
             "join_rules": JoinRules.PUBLIC,
             "history_visibility": "shared",