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

1 files changed, 3 insertions, 6 deletions

diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py

index ba62746214..90f96209f8 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -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(