From f32b4bc044944c725ed24a46cd6ca806f2c36cf6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 30 Aug 2023 18:28:32 +0100 Subject: [PATCH] Move changeset comment rate limit check to a predicate method --- app/controllers/api/changeset_comments_controller.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb index a9e80630e..bb77e1106 100644 --- a/app/controllers/api/changeset_comments_controller.rb +++ b/app/controllers/api/changeset_comments_controller.rb @@ -17,7 +17,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 @@ -99,5 +99,15 @@ module Api 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 -- 2.45.1