summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-11-27 15:04:38 +0000
committerGitHub <noreply@github.com>2019-11-27 15:04:38 +0000
commitd31f69afa09e53a4b8e4df829b6b9b28d8acbd48 (patch)
tree020a6bfde6148c17c900740a45ad680f76b139c7 /synapse/handlers/message.py
parentclean up buildkite output (diff)
parentMerge branch 'develop' into babolivier/message_retention (diff)
downloadsynapse-d31f69afa09e53a4b8e4df829b6b9b28d8acbd48.tar.xz
Merge pull request #6358 from matrix-org/babolivier/message_retention
Implement message retention policies (MSC1763)
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index d682dc2b7a..155ed6e06a 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -417,7 +417,7 @@ class EventCreationHandler(object):
                     403, "You must be in the room to create an alias for it"
                 )
 
-        self.validator.validate_new(event)
+        self.validator.validate_new(event, self.config)
 
         return (event, context)
 
@@ -634,7 +634,7 @@ class EventCreationHandler(object):
         if requester:
             context.app_service = requester.app_service
 
-        self.validator.validate_new(event)
+        self.validator.validate_new(event, self.config)
 
         # If this event is an annotation then we check that that the sender
         # can't annotate the same way twice (e.g. stops users from liking an