implement token bucket rate limiting

app/controllers/application_controller.rb

@@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base
   rescue_from SessionLoader::AuthenticationFailure, :with => :authentication_failed
   rescue_from Danbooru::Paginator::PaginationError, :with => :render_pagination_limit
 
-protected
+  protected
   def show_moderation_notice?
     CurrentUser.can_approve_posts? && (cookies[:moderated].blank? || Time.at(cookies[:moderated].to_i) < 1.day.ago)
   end
@@ -40,19 +40,37 @@ protected
   end
   
   def api_check
-    if request.format.to_s =~ /\/json|\/xml/ || params[:controller] == "iqdb"
-      if ApiLimiter.throttled?(CurrentUser.id || request.remote_ip, request.request_method)
-        render :text => "429 Too Many Requests\n", :layout => false, :status => 429
+    if !CurrentUser.is_anonymous? && !request.get? && !request.head?
+      if CurrentUser.user.token_bucket.nil?
+        TokenBucket.create_default(CurrentUser.user)
+        CurrentUser.user.reload
+      end
+
+      throttled = CurrentUser.user.token_bucket.throttled?
+      headers["X-Api-Limit"] = CurrentUser.user.token_bucket.token_count
+
+      if throttled
+        respond_to do |format|
+          format.json do
+            render json: {success: false, reason: "too many requests"}.to_json, status: 429
+          end
+
+          format.xml do
+            render xml: {success: false, reason: "too many requests"}.to_xml(:root => "response"), status: 429
+          end
+
+          format.html do
+            render :template => "static/too_many_requests", :status => 429
+          end
+        end
+
         return false
       end
-    # elsif request.format.to_s =~ /\/html/ && !ApiLimiter.idempotent?(request.request_method)
-    #   if ApiLimiter.throttled?(CurrentUser.id || request.remote_ip, request.request_method)
-    #     render :template => "static/too_many_requests", :status => 429
-    #   end
     end
-    
+
     return true
   end
+
   def rescue_exception(exception)
     @exception = exception
 

app/controllers/favorites_controller.rb

@@ -1,6 +1,7 @@
 class FavoritesController < ApplicationController
   before_filter :member_only
   respond_to :html, :xml, :json
+  skip_before_filter :api_check
 
   def index
     if params[:tags]

app/controllers/post_votes_controller.rb

@@ -1,5 +1,6 @@
 class PostVotesController < ApplicationController
   before_filter :voter_only
+  skip_before_filter :api_check
 
   def create
     @post = Post.find(params[:post_id])

app/controllers/users_controller.rb

@@ -2,6 +2,7 @@ class UsersController < ApplicationController
   respond_to :html, :xml, :json
   before_filter :member_only, :only => [:edit, :update, :upgrade]
   rescue_from User::PrivilegeError, :with => :access_denied
+  skip_before_filter :api_check
 
   def new
     @user = User.new