Exempt support users from consent

changelog.d/5902.feature

@@ -0,0 +1 @@
+Users with the type of "support" or "bot" are no longer required to consent.

changelog.d/5903.feature

@@ -0,0 +1 @@
+Add bot user type.

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):

synapse/handlers/message.py

@@ -24,7 +24,7 @@
 from twisted.internet.defer import succeed
 
 from synapse import event_auth
-from synapse.api.constants import EventTypes, Membership, RelationTypes
+from synapse.api.constants import EventTypes, Membership, RelationTypes, UserTypes
 from synapse.api.errors import (
     AuthError,
     Codes,
@@ -469,6 +469,9 @@ def assert_accepted_privacy_policy(self, requester):
 
         u = yield self.store.get_user_by_id(user_id)
         assert u is not None
+        if u["user_type"] == UserTypes.SUPPORT or u["user_type"] == UserTypes.BOT:
+            # support users are not required to consent
+            return
         if u["appservice_id"] is not None:
             # users registered by an appservice are exempt
             return

synapse/storage/registration.py

@@ -56,6 +56,7 @@ def get_user_by_id(self, user_id):
                 "consent_server_notice_sent",
                 "appservice_id",
                 "creation_ts",
+                "user_type",
             ],
             allow_none=True,
             desc="get_user_by_id",

tests/storage/test_registration.py

@@ -49,6 +49,7 @@ def test_register(self):
                 "consent_server_notice_sent": None,
                 "appservice_id": None,
                 "creation_ts": 1000,
+                "user_type": None,
             },
             (yield self.store.get_user_by_id(self.user_id)),
         )