summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-20 17:51:27 +0000
committerErik Johnston <erik@matrix.org>2019-03-20 17:51:27 +0000
commitcd62981a6a083945547100c8d0f30380ea17c6e3 (patch)
tree6ad6fbf8c446da4dc482eda854efd61a896b5c65 /synapse/handlers
parentcomment block_room (diff)
downloadsynapse-cd62981a6a083945547100c8d0f30380ea17c6e3.tar.xz
Revert spurious delete
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/message.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 587fbfbe86..9b41c7b205 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -391,6 +391,10 @@ class EventCreationHandler(object):
         if self._block_events_without_consent_error is None:
             return
 
+        # exempt AS users from needing consent
+        if requester.app_service is not None:
+            return
+
         user_id = requester.user.to_string()
 
         # exempt the system notices user