Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent

2019-08-23 09:55:57 +01:00 · 2019-08-23 09:55:57 +01:00 · ffa5b757c7
parent 0fb5189072 971c980c6e
commit ffa5b757c7
2 changed files with 3 additions and 1 deletions
--- a/changelog.d/5903.feature
+++ b/changelog.d/5903.feature
@ -0,0 +1 @@
+Add bot user type.
--- 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):