From 27f4c98cac9fb2de5ce2a4e093226664cdfcdc08 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 12 Aug 2025 18:11:59 +0100 Subject: [PATCH] Fix new rubocop warnings --- app/controllers/api/changeset_comments_controller.rb | 2 +- app/controllers/api/notes_controller.rb | 10 +++++----- app/controllers/api/tracepoints_controller.rb | 2 +- app/controllers/changeset_comments/feeds_controller.rb | 2 +- app/controllers/diary_entries_controller.rb | 2 +- app/controllers/notes_controller.rb | 2 +- app/controllers/traces/feeds_controller.rb | 2 +- app/controllers/users/heatmaps_controller.rb | 2 +- app/helpers/browse_tags_helper.rb | 2 +- script/statistics | 8 ++++---- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb index 63b2aeba5..a8e9c8d1c 100644 --- a/app/controllers/api/changeset_comments_controller.rb +++ b/app/controllers/api/changeset_comments_controller.rb @@ -14,7 +14,7 @@ module Api ## # show all comments or search for a subset def index - @comments = ChangesetComment.includes(:author).where(:visible => true).order("created_at DESC") + @comments = ChangesetComment.includes(:author).where(:visible => true).order(:created_at => :desc) @comments = query_conditions_time(@comments) @comments = query_conditions_user(@comments, :author) @comments = query_limit(@comments) diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index 3b0b66757..750a7c44d 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -38,7 +38,7 @@ module Api @max_lat = bbox.max_lat # Find the notes we want to return - notes = notes.bbox(bbox).order("updated_at DESC") + notes = notes.bbox(bbox).order(:updated_at => :desc) notes = query_limit(notes) @notes = notes.preload(:comments) @@ -275,15 +275,15 @@ module Api # Choose the sort order @notes = if params[:sort] == "created_at" if params[:order] == "oldest" - @notes.order("created_at ASC") + @notes.order(:created_at) else - @notes.order("created_at DESC") + @notes.order(:created_at => :desc) end else if params[:order] == "oldest" - @notes.order("updated_at ASC") + @notes.order(:updated_at) else - @notes.order("updated_at DESC") + @notes.order(:updated_at => :desc) end end diff --git a/app/controllers/api/tracepoints_controller.rb b/app/controllers/api/tracepoints_controller.rb index e45b5968c..ee57a00fb 100644 --- a/app/controllers/api/tracepoints_controller.rb +++ b/app/controllers/api/tracepoints_controller.rb @@ -30,7 +30,7 @@ module Api end # get all the points - ordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[trackable identifiable] }).order("gpx_id DESC, trackid ASC, timestamp ASC") + ordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[trackable identifiable] }).order(:gpx_id => :desc, :trackid => :asc, :timestamp => :asc) unordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[public private] }).order("gps_points.latitude", "gps_points.longitude", "gps_points.timestamp") @points = ordered_points.union_all(unordered_points).offset(offset).limit(Settings.tracepoints_per_page).preload(:trace) diff --git a/app/controllers/changeset_comments/feeds_controller.rb b/app/controllers/changeset_comments/feeds_controller.rb index 148873eea..4aa065858 100644 --- a/app/controllers/changeset_comments/feeds_controller.rb +++ b/app/controllers/changeset_comments/feeds_controller.rb @@ -25,7 +25,7 @@ module ChangesetComments @comments = query_limit(@comments) else # Return comments - @comments = ChangesetComment.includes(:author, :changeset).where(:visible => true).order("created_at DESC") + @comments = ChangesetComment.includes(:author, :changeset).where(:visible => true).order(:created_at => :desc) @comments = query_limit(@comments) @comments = @comments.preload(:changeset) end diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index d966fd46c..ca8d38e32 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -180,7 +180,7 @@ class DiaryEntriesController < ApplicationController @link = url_for :action => "index", :host => Settings.server_url, :protocol => Settings.server_protocol end end - @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20) + @entries = @entries.visible.includes(:user).order(:created_at => :desc).limit(20) end def hide diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 38d0edc0b..44d5748f0 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -26,7 +26,7 @@ class NotesController < ApplicationController @notes = @user.notes @notes = @notes.visible unless current_user&.moderator? @notes = @notes.where(:status => params[:status]) unless params[:status] == "all" || params[:status].blank? - @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * PAGE_SIZE).limit(PAGE_SIZE + 1).preload(:comments => :author) + @notes = @notes.order(:updated_at => :desc, :id => :asc).distinct.offset((@page - 1) * PAGE_SIZE).limit(PAGE_SIZE + 1).preload(:comments => :author) @notes = @notes.to_a if @notes.size > PAGE_SIZE @notes.pop diff --git a/app/controllers/traces/feeds_controller.rb b/app/controllers/traces/feeds_controller.rb index 293fbab3b..c5384ac0e 100644 --- a/app/controllers/traces/feeds_controller.rb +++ b/app/controllers/traces/feeds_controller.rb @@ -12,7 +12,7 @@ module Traces @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name] @traces = @traces.tagged(params[:tag]) if params[:tag] - @traces = @traces.order("timestamp DESC") + @traces = @traces.order(:timestamp => :desc) @traces = @traces.limit(20) @traces = @traces.includes(:user) end diff --git a/app/controllers/users/heatmaps_controller.rb b/app/controllers/users/heatmaps_controller.rb index dd30395a3..a69a406a1 100644 --- a/app/controllers/users/heatmaps_controller.rb +++ b/app/controllers/users/heatmaps_controller.rb @@ -22,7 +22,7 @@ module Users .where(:num_changes => 1..) .group("date_trunc('day', created_at)") .select("date_trunc('day', created_at) AS date, SUM(num_changes) AS total_changes, MAX(id) AS max_id") - .order("date") + .order(:date) .map do |changeset| { :date => changeset.date.to_date, diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb index b2b0a4e3b..39e14e554 100644 --- a/app/helpers/browse_tags_helper.rb +++ b/app/helpers/browse_tags_helper.rb @@ -17,7 +17,7 @@ module BrowseTagsHelper elsif wdt = wikidata_links(key, value) # IMPORTANT: Note that wikidata_links() returns an array of hashes, unlike for example wikipedia_link(), # which just returns one such hash. - svg = button_tag :type => "button", :role => "button", :class => "btn btn-link float-end d-flex m-1 mt-0 me-n1 border-0 p-0 wdt-preview", :data => { :qids => wdt.map { |w| w[:title] } } do + svg = button_tag :type => "button", :role => "button", :class => "btn btn-link float-end d-flex m-1 mt-0 me-n1 border-0 p-0 wdt-preview", :data => { :qids => wdt.pluck(:title) } do tag.svg :width => 27, :height => 16 do concat tag.title t("browse.tag_details.wikidata_preview", :count => wdt.length) concat tag.path :fill => "currentColor", :d => "M0 16h1V0h-1Zm2 0h3V0h-3Zm4 0h3V0h-3Zm4 0h1V0h-1Zm2 0h1V0h-1Zm2 0h3V0h-3Zm4 0h1V0h-1Zm2 0h3V0h-3Zm4 0h1V0h-1Zm2 0h1V0h-1Z" diff --git a/script/statistics b/script/statistics index 151a3518f..37eb36941 100755 --- a/script/statistics +++ b/script/statistics @@ -34,7 +34,7 @@ begin puts "" puts "" - Trace.where(:inserted => true).group(:user_id).order("sum_size DESC").limit(50).sum(:size).each do |user, count| + Trace.where(:inserted => true).group(:user_id).order(:sum_size => :desc).limit(50).sum(:size).each do |user, count| display_name = User.find(user).display_name.gsub("@", " at ").gsub(".", " dot ") puts "" end @@ -63,9 +63,9 @@ begin puts "
UserNumber of Points
#{display_name}#{count}
" puts "" - day_users = OldNode.where("timestamp > NOW() - '1 DAY'::INTERVAL").joins(:changeset).order("count_all DESC").group(:user_id).count - week_users = OldNode.where("timestamp > NOW() - '7 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(60).group(:user_id).count - month_users = OldNode.where("timestamp > NOW() - '28 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(60).group(:user_id).count + day_users = OldNode.where("timestamp > NOW() - '1 DAY'::INTERVAL").joins(:changeset).order(:count_all => :desc).group(:user_id).count + week_users = OldNode.where("timestamp > NOW() - '7 DAYS'::INTERVAL").joins(:changeset).order(:count_all => :desc).limit(60).group(:user_id).count + month_users = OldNode.where("timestamp > NOW() - '28 DAYS'::INTERVAL").joins(:changeset).order(:count_all => :desc).limit(60).group(:user_id).count day_users.zip(week_users, month_users).each do |row| puts "" -- 2.39.5
DayWeekMonth