summary refs log tree commit diff
diff options
context:
space:
mode:
authorHalf-Shot <will@half-shot.uk>2019-08-23 09:14:52 +0100
committerHalf-Shot <will@half-shot.uk>2019-08-23 09:14:52 +0100
commit886eceba3e134325e6943aa63eda0a70a7aca911 (patch)
tree91eecab29298dbd86c4c310d32394ccc8b8cb852
parentPropagate opentracing contexts through EDUs (#5852) (diff)
downloadsynapse-886eceba3e134325e6943aa63eda0a70a7aca911.tar.xz
Return user_type in get_user_by_id
-rw-r--r--synapse/handlers/message.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index a5e23c4caf..97a89fe882 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -24,7 +24,7 @@ from twisted.internet import defer
 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 @@ class EventCreationHandler(object):
 
         u = yield self.store.get_user_by_id(user_id)
         assert u is not None
+        if u["user_type"] == UserTypes.SUPPORT:
+            # support users are not required to consent
+            return
         if u["appservice_id"] is not None:
             # users registered by an appservice are exempt
             return