as_user->app_service, less redundant comments, better positioned comments

This commit is contained in:
Luke Barnard 2016-10-20 12:04:54 +01:00
parent 8bfd01f619
commit f09db236b1
3 changed files with 11 additions and 14 deletions

View file

@ -57,17 +57,14 @@ class BaseHandler(object):
time_now = self.clock.time()
user_id = requester.user.to_string()
# Disable rate limiting of users belonging to any AS that is configured
# not to be rate limited in its registration file (rate_limited: true|false).
# The AS user itself is never rate limited.
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
if requester.as_user and not requester.as_user.is_rate_limited():
# do not ratelimit users of which a non-rate-limited AS is
# acting on behalf
# Disable rate limiting of users belonging to any AS that is configured
# not to be rate limited in its registration file (rate_limited: true|false).
if requester.app_service and not requester.app_service.is_rate_limited():
return
allowed, time_allowed = self.ratelimiter.send_message(