diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-11 14:08:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-11 14:08:29 +0100 |
| commit | 3061dac53eef21110d8d9f08554f28c562175a18 (patch) | |
| tree | 51a8cb5ed3f294887bdcc2d6ef36efcad186af07 /synapse/handlers/_base.py | |
| parent | Fix check of wrong variable (diff) | |
| parent | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup (diff) | |
| download | synapse-3061dac53eef21110d8d9f08554f28c562175a18.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replication_noop
Diffstat (limited to 'synapse/handlers/_base.py')
| -rw-r--r-- | synapse/handlers/_base.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index e58735294e..4981643166 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -55,8 +55,14 @@ class BaseHandler(object): def ratelimit(self, requester): time_now = self.clock.time() + user_id = requester.user.to_string() + + app_service = self.store.get_app_service_by_user_id(user_id) + if app_service is not None: + return # do not ratelimit app service senders + allowed, time_allowed = self.ratelimiter.send_message( - requester.user.to_string(), time_now, + user_id, time_now, msg_rate_hz=self.hs.config.rc_messages_per_second, burst_count=self.hs.config.rc_message_burst_count, ) |