summary refs log tree commit diff
path: root/synapse/api/constants.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-01 20:28:11 +0100
committerErik Johnston <erik@matrix.org>2014-09-01 20:28:11 +0100
commita85612baf834e805d9174cd2e0c45c3d2b4b74f5 (patch)
treeb9c869901d2252c42cc7a571411046f16078f2f0 /synapse/api/constants.py
parentUpdate readme with instructions on how to generate configs for homeservers (diff)
parentDon't put required power levels on permission state events (diff)
downloadsynapse-a85612baf834e805d9174cd2e0c45c3d2b4b74f5.tar.xz
Merge branch 'room_config' into develop
Diffstat (limited to 'synapse/api/constants.py')
-rw-r--r--synapse/api/constants.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index f69f2445a2..668ffa07ca 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -23,7 +23,8 @@ class Membership(object):
     JOIN = u"join"
     KNOCK = u"knock"
     LEAVE = u"leave"
-    LIST = (INVITE, JOIN, KNOCK, LEAVE)
+    BAN = u"ban"
+    LIST = (INVITE, JOIN, KNOCK, LEAVE, BAN)
 
 
 class Feedback(object):
@@ -42,3 +43,10 @@ class PresenceState(object):
     UNAVAILABLE = u"unavailable"
     ONLINE = u"online"
     FREE_FOR_CHAT = u"free_for_chat"
+
+
+class JoinRules(object):
+    PUBLIC = u"public"
+    KNOCK = u"knock"
+    INVITE = u"invite"
+    PRIVATE = u"private"