summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-02-07 11:12:14 +0000
committerGitHub <noreply@github.com>2018-02-07 11:12:14 +0000
commit053255f36cf322cf66efc677d233c0a54d9a9219 (patch)
tree2c8b8fde91909448e82b6309a81d1c7c275c0e60 /synapse
parentMerge pull request #2847 from matrix-org/erikj/separate_event_creation (diff)
parentRemove pointless ratelimit check (diff)
downloadsynapse-053255f36cf322cf66efc677d233c0a54d9a9219.tar.xz
Merge pull request #2856 from matrix-org/erikj/remove_ratelimit
Remove pointless ratelimit check
Diffstat (limited to 'synapse')
-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,)