From ca893c1153e968c1c8a03286ec5450e31e451948 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 21 May 2024 18:21:56 +0100 Subject: [PATCH] Fix new rubocop warnings --- app/controllers/api/changeset_comments_controller.rb | 2 +- app/controllers/api/changesets_controller.rb | 2 +- app/controllers/changesets_controller.rb | 4 ++-- app/controllers/friendships_controller.rb | 2 +- app/controllers/messages_controller.rb | 2 +- app/models/issue.rb | 4 ++-- app/models/user.rb | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb index 756e56dcc..e8d3f4c3a 100644 --- a/app/controllers/api/changeset_comments_controller.rb +++ b/app/controllers/api/changeset_comments_controller.rb @@ -105,7 +105,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/changesets_controller.rb b/app/controllers/api/changesets_controller.rb index 616d3fdec..2e21f0c75 100644 --- a/app/controllers/api/changesets_controller.rb +++ b/app/controllers/api/changesets_controller.rb @@ -331,7 +331,7 @@ module Api changesets.where("closed_at >= ? and created_at <= ?", from, to) else # if there is no comma, assume its a lower limit on time - changesets.where("closed_at >= ?", Time.parse(time).utc) + changesets.where(:closed_at => Time.parse(time).utc..) end # stupid Time seems to throw both of these for bad parsing, so # we have to catch both and ensure the correct code path is taken. diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index 19ec9c91e..a5ddaf364 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -60,7 +60,7 @@ class ChangesetsController < ApplicationController changesets = changesets.where(:user => current_user.nearby) end - changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id] + changesets = changesets.where(:changesets => { :id => ..@params[:max_id] }) if @params[:max_id] @changesets = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments) @@ -88,7 +88,7 @@ class ChangesetsController < ApplicationController if @changeset.user.active? && @changeset.user.data_public? changesets = conditions_nonempty(@changeset.user.changesets) @next_by_user = changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first - @prev_by_user = changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first + @prev_by_user = changesets.where(:id => ...@changeset.id).reorder(:id => :desc).first end render :layout => map_layout rescue ActiveRecord::RecordNotFound diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb index 7b14f2e82..ab54cbfd1 100644 --- a/app/controllers/friendships_controller.rb +++ b/app/controllers/friendships_controller.rb @@ -19,7 +19,7 @@ class FriendshipsController < ApplicationController friendship.befriendee = @friend if current_user.friends_with?(@friend) flash[:warning] = t ".already_a_friend", :name => @friend.display_name - elsif current_user.friendships.where("created_at >= ?", Time.now.utc - 1.hour).count >= current_user.max_friends_per_hour + elsif current_user.friendships.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_friends_per_hour flash.now[:error] = t ".limit_exceeded" elsif friendship.save flash[:notice] = t ".success", :name => @friend.display_name diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 111a31f96..adfbd9157 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -42,7 +42,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/issue.rb b/app/models/issue.rb index 54947be30..a3f82ee40 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -50,11 +50,11 @@ class Issue < ApplicationRecord scope :visible_to, ->(user) { where(:assigned_role => user.roles.map(&:role)) } def read_reports - resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil + resolved_at.present? ? reports.where(:updated_at => ...resolved_at) : nil end def unread_reports - resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports + resolved_at.present? ? reports.where(:updated_at => resolved_at..) : reports end include AASM diff --git a/app/models/user.rb b/app/models/user.rb index 192f52ac4..e4067a350 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -411,7 +411,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 @@ -419,7 +419,7 @@ class User < ApplicationRecord def max_friends_per_hour account_age_in_seconds = Time.now.utc - created_at account_age_in_hours = account_age_in_seconds / 3600 - recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count + recent_friends = Friendship.where(:befriendee => self).where(:created_at => Time.now.utc - 3600..).count max_friends = account_age_in_hours.ceil + recent_friends - (active_reports * 10) max_friends.clamp(0, Settings.max_friends_per_hour) end -- 2.39.5