summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorHalf-Shot <will@half-shot.uk>2019-08-23 09:55:57 +0100
committerHalf-Shot <will@half-shot.uk>2019-08-23 09:55:57 +0100
commitffa5b757c7775b1fffa4b2d998407be61369ce7f (patch)
treeb332966f46b979b9e068b6547768ae20378366cf /synapse
parentFix registration test (diff)
parentAdd changelog (diff)
downloadsynapse-ffa5b757c7775b1fffa4b2d998407be61369ce7f.tar.xz
Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent
Diffstat (limited to 'synapse')
-rw-r--r--synapse/api/constants.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 3ffde0d7fc..f29bce560c 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -122,7 +122,8 @@ class UserTypes(object):
     """
 
     SUPPORT = "support"
-    ALL_USER_TYPES = (SUPPORT,)
+    BOT = "bot"
+    ALL_USER_TYPES = (SUPPORT, BOT)
 
 
 class RelationTypes(object):