Add social sharing functionality

[rails.git] / app / controllers / api / changeset_comments_controller.rb

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index 4cd33a92b6b3115b5b76a5e24f2cd5d69d5b2ee7..4a96ec3bbaef00087e8b03a464c7ee78e65c56c2 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -1,12 +1,12 @@
 module Api
   class ChangesetCommentsController < ApiController
 module Api
   class ChangesetCommentsController < ApiController

+    before_action :check_api_writable

     before_action :authorize
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create]
     before_action :authorize
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create]

-    before_action :check_api_writable
-    before_action :check_api_readable, :except => [:create]
+    before_action :set_request_formats

     around_action :api_call_handle_error
     around_action :api_call_timeout
 
     around_action :api_call_handle_error
     around_action :api_call_timeout
 


@@ -16,6 +16,7 @@ module Api
       # Check the arguments are sane
       raise OSM::APIBadUserInput, "No id was given" unless params[:id]
       raise OSM::APIBadUserInput, "No text was given" if params[:text].blank?
       # Check the arguments are sane
       raise OSM::APIBadUserInput, "No id was given" unless params[:id]
       raise OSM::APIBadUserInput, "No text was given" if params[:text].blank?

+      raise OSM::APIRateLimitExceeded if rate_limit_exceeded?

 
       # Extract the arguments
       id = params[:id].to_i
 
       # Extract the arguments
       id = params[:id].to_i


@@ -40,7 +41,12 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
 
       # Return a copy of the updated changeset
       @changeset = changeset

-      render "api/changesets/changeset"
+      render "api/changesets/show"
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     ##
     end
 
     ##


@@ -60,7 +66,12 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset

-      render "api/changesets/changeset"
+      render "api/changesets/show"
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     ##
     end
 
     ##


@@ -80,7 +91,22 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset

-      render "api/changesets/changeset"
+      render "api/changesets/show"
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end
+    end
+
+    private
+
+    ##
+    # Check if the current user has exceed the rate limit for comments
+    def rate_limit_exceeded?
+      recent_comments = current_user.changeset_comments.where(:created_at => Time.now.utc - 1.hour..).count
+
+      recent_comments >= current_user.max_changeset_comments_per_hour

     end
   end
 end
     end
   end
 end