X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a274726f468b482b1553dd8fbbc3e3bc8f6a7a5f..c6ef508874a1a75db692214dfc7712e46796f461:/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 a9e80630e..4a96ec3bb 100644 --- a/app/controllers/api/changeset_comments_controller.rb +++ b/app/controllers/api/changeset_comments_controller.rb @@ -1,7 +1,6 @@ module Api class ChangesetCommentsController < ApiController before_action :check_api_writable - before_action :check_api_readable, :except => [:create] before_action :authorize authorize_resource @@ -17,7 +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 current_user.changeset_comments.where("created_at >= ?", Time.now.utc - 1.hour).count >= current_user.max_changeset_comments_per_hour + raise OSM::APIRateLimitExceeded if rate_limit_exceeded? # Extract the arguments id = params[:id].to_i @@ -42,7 +41,7 @@ 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 @@ -67,7 +66,7 @@ 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 @@ -92,12 +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