diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:27 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:27 +0100 |
| commit | f7ececb0acca62d969c197df66f9864a49a75b78 (patch) | |
| tree | c1254c69f384eb7d3559936f956aa21c7e85755d /synapse/handlers/message.py | |
| parent | Merge pull request #5890 from matrix-org/rei/rss_inc3 (diff) | |
| parent | Fix coverage in sytest and use plugins for buildkite (#5922) (diff) | |
| download | synapse-f7ececb0acca62d969c197df66f9864a49a75b78.tar.xz | |
Merge branch 'develop' into rei/rss_target
Diffstat (limited to '')
| -rw-r--r-- | synapse/handlers/message.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index a5e23c4caf..111f7c7e2f 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"] in (UserTypes.SUPPORT, UserTypes.BOT): + # support and bot users are not required to consent + return if u["appservice_id"] is not None: # users registered by an appservice are exempt return |