From 46abe9df3ad6bc15045f18e993be14c2c21da585 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 17 Jun 2025 17:43:58 +0100 Subject: [PATCH] Fix new rubocop warnings --- app/controllers/api/changeset_comments_controller.rb | 2 +- app/controllers/api/messages_controller.rb | 2 +- app/controllers/follows_controller.rb | 2 +- app/controllers/messages_controller.rb | 2 +- app/models/user.rb | 4 ++-- script/update-spam-blocks | 2 +- test/controllers/api/messages/inboxes_controller_test.rb | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb index 2f4a361ba..63b2aeba5 100644 --- a/app/controllers/api/changeset_comments_controller.rb +++ b/app/controllers/api/changeset_comments_controller.rb @@ -64,7 +64,7 @@ module Api ## # 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.changeset_comments.where(:created_at => (Time.now.utc - 1.hour)..).count recent_comments >= current_user.max_changeset_comments_per_hour end diff --git a/app/controllers/api/messages_controller.rb b/app/controllers/api/messages_controller.rb index ea5abe8df..0864b503f 100644 --- a/app/controllers/api/messages_controller.rb +++ b/app/controllers/api/messages_controller.rb @@ -40,7 +40,7 @@ module Api raise OSM::APIBadUserInput, "No recipient was given" end - raise OSM::APIRateLimitExceeded if current_user.sent_messages.where(:sent_on => Time.now.utc - 1.hour..).count >= current_user.max_messages_per_hour + raise OSM::APIRateLimitExceeded if current_user.sent_messages.where(:sent_on => (Time.now.utc - 1.hour)..).count >= current_user.max_messages_per_hour @message = Message.new(:sender => current_user, :recipient => recipient, diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb index a8da933df..c1ba11346 100644 --- a/app/controllers/follows_controller.rb +++ b/app/controllers/follows_controller.rb @@ -22,7 +22,7 @@ class FollowsController < ApplicationController follow.following = @user if current_user.follows?(@user) flash[:warning] = t ".already_followed", :name => @user.display_name - elsif current_user.follows.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_follows_per_hour + elsif current_user.follows.where(:created_at => (Time.now.utc - 1.hour)..).count >= current_user.max_follows_per_hour flash[:error] = t ".limit_exceeded" elsif follow.save flash[:notice] = t ".success", :name => @user.display_name diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index cb72d4d57..ae3c6eb8e 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -43,7 +43,7 @@ class MessagesController < ApplicationController @message.sender = current_user @message.sent_on = Time.now.utc - if current_user.sent_messages.where(:sent_on => Time.now.utc - 1.hour..).count >= current_user.max_messages_per_hour + if current_user.sent_messages.where(:sent_on => (Time.now.utc - 1.hour)..).count >= current_user.max_messages_per_hour flash.now[:error] = t ".limit_exceeded" render :action => "new" elsif @message.save diff --git a/app/models/user.rb b/app/models/user.rb index 5d1ed4d03..400ce864c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -424,7 +424,7 @@ class User < ApplicationRecord def max_messages_per_hour account_age_in_seconds = Time.now.utc - created_at account_age_in_hours = account_age_in_seconds / 3600 - recent_messages = messages.where(:sent_on => Time.now.utc - 3600..).count + recent_messages = messages.where(:sent_on => (Time.now.utc - 3600)..).count max_messages = account_age_in_hours.ceil + recent_messages - (active_reports * 10) max_messages.clamp(0, Settings.max_messages_per_hour) end @@ -432,7 +432,7 @@ class User < ApplicationRecord def max_follows_per_hour account_age_in_seconds = Time.now.utc - created_at account_age_in_hours = account_age_in_seconds / 3600 - recent_follows = Follow.where(:following => self).where(:created_at => Time.now.utc - 3600..).count + recent_follows = Follow.where(:following => self).where(:created_at => (Time.now.utc - 3600)..).count max_follows = account_age_in_hours.ceil + recent_follows - (active_reports * 10) max_follows.clamp(0, Settings.max_follows_per_hour) end diff --git a/script/update-spam-blocks b/script/update-spam-blocks index 4f56b8928..7526ed0a3 100755 --- a/script/update-spam-blocks +++ b/script/update-spam-blocks @@ -6,7 +6,7 @@ require "generator" addresses = User.count( :conditions => { :status => %w[suspended deleted], - :creation_time => Time.now.utc - 28.days..Time.now.utc + :creation_time => (Time.now.utc - 28.days)..Time.now.utc }, :group => :creation_address ) diff --git a/test/controllers/api/messages/inboxes_controller_test.rb b/test/controllers/api/messages/inboxes_controller_test.rb index f863146ca..65c61f94d 100644 --- a/test/controllers/api/messages/inboxes_controller_test.rb +++ b/test/controllers/api/messages/inboxes_controller_test.rb @@ -109,7 +109,7 @@ module Api assert_operator(jsm[0]["id"], :>=, params[:from_id]) unless params[:from_id].nil? # ensure ascending order - (0..jsm.count - 1).each do |i| + (0..(jsm.count - 1)).each do |i| assert_operator(jsm[i]["id"], :<, jsm[i + 1]["id"]) unless i == jsm.count - 1 msgs_read[jsm[i]["id"]] = jsm[i] end @@ -147,7 +147,7 @@ module Api assert_operator jsm[0]["id"], :<=, params[:from_id] end # ensure descending order - (0..jsm.count - 1).each do |i| + (0..(jsm.count - 1)).each do |i| assert_operator(jsm[i]["id"], :>, jsm[i + 1]["id"]) unless i == jsm.count - 1 msgs_read[jsm[i]["id"]] = jsm[i] end -- 2.39.5