Batch users don't have a daily limit.

It doesn't make logical sense that they would. However I am preserving
the ability to make batch requests as a separate thing from not having a
daily limit - I think batch sending requires a (perhaps marginally)
bigger level of trust.

2 files changed, 4 insertions, 2 deletions

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index d56b5d245..718a8aada 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -188,8 +188,7 @@ class RequestController < ApplicationController
             redirect_to select_authorities_path and return
         end
 
-        # TODO: I don't think batch requesters should be subject to rate limits,
-        # but I do think we should probably check for double submission of batch
+        # TODO: I do think we should probably check for double submission of batch
         # requests as we do in 'new' for ordinary requests with find_by_existing_request
 
         # TODO: Decide if we make batch requesters describe their undescribed requests
diff --git a/app/models/user.rb b/app/models/user.rb
index 2c4f87944..2052b942b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -269,6 +269,9 @@ class User < ActiveRecord::Base
         # Some users have no limit
         return false if self.no_limit
 
+        # Batch request users don't have a limit
+        return false if self.can_make_batch_requests?
+
         # Has the user issued as many as MAX_REQUESTS_PER_USER_PER_DAY requests in the past 24 hours?
         return false if AlaveteliConfiguration::max_requests_per_user_per_day.blank?
         recent_requests = InfoRequest.count(:conditions => ["user_id = ? and created_at > now() - '1 day'::interval", self.id])