summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-02-07 10:30:25 +0000
committerErik Johnston <erik@matrix.org>2018-02-07 10:30:25 +0000
commite3624fad5f0dfd3cffcbb7c996a8d29bb2c79dbd (patch)
tree2c8b8fde91909448e82b6309a81d1c7c275c0e60 /synapse/handlers/message.py
parentMerge pull request #2847 from matrix-org/erikj/separate_event_creation (diff)
downloadsynapse-e3624fad5f0dfd3cffcbb7c996a8d29bb2c79dbd.tar.xz
Remove pointless ratelimit check
The intention was for the check to be called as early as possible in the
request, but actually was called just before the main ratelimit check,
so was fairly pointless.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/message.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 1540721815..a58fc37fff 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -403,11 +403,6 @@ class EventCreationHandler(object):
                 "Tried to send member event through non-member codepath"
             )
 
-        # We check here if we are currently being rate limited, so that we
-        # don't do unnecessary work. We check again just before we actually
-        # send the event.
-        yield self.base_handler.ratelimit(requester, update=False)
-
         user = UserID.from_string(event.sender)
 
         assert self.hs.is_mine(user), "User must be our own: %s" % (user,)