X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/96f426a2eaa6009496b0f51934a497b3c970db97..bbd6140f4bdc7746ecbd4d109316b2dd0b6d047f:/app/controllers/api/changeset_comments_controller.rb?ds=inline diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb index a3a13b926..4a96ec3bb 100644 --- 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 + before_action :check_api_writable 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 @@ -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? + raise OSM::APIRateLimitExceeded if rate_limit_exceeded? # Extract the arguments id = params[:id].to_i @@ -23,7 +24,7 @@ module Api # Find the changeset and check it is valid changeset = Changeset.find(id) - raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open? + raise OSM::APIChangesetNotYetClosedError, changeset if changeset.open? # Add a comment to the changeset comment = changeset.comments.create(:changeset => changeset, @@ -40,7 +41,12 @@ module Api # 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 ## @@ -60,7 +66,12 @@ module Api # 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 ## @@ -80,7 +91,22 @@ module Api # 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