Autofix Rubocop Style/Lambda ()

This commit is contained in:
Nick Schonning 2023-02-18 06:39:00 -05:00 committed by GitHub
parent e2a3ebb271
commit ab7816a414
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 19 deletions

View file

@ -2930,18 +2930,6 @@ Style/InverseMethods:
- 'app/services/update_account_service.rb' - 'app/services/update_account_service.rb'
- 'spec/controllers/activitypub/replies_controller_spec.rb' - 'spec/controllers/activitypub/replies_controller_spec.rb'
# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: line_count_dependent, lambda, literal
Style/Lambda:
Exclude:
- 'app/models/concerns/paginable.rb'
- 'app/models/status.rb'
- 'app/models/tag.rb'
- 'lib/cli.rb'
- 'lib/mastodon/domains_cli.rb'
# Offense count: 1 # Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all). # This cop supports unsafe autocorrection (--autocorrect-all).
Style/MapToHash: Style/MapToHash:

View file

@ -4,7 +4,7 @@ module Paginable
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do
scope :paginate_by_max_id, ->(limit, max_id = nil, since_id = nil) { scope :paginate_by_max_id, lambda { |limit, max_id = nil, since_id = nil|
query = order(arel_table[:id].desc).limit(limit) query = order(arel_table[:id].desc).limit(limit)
query = query.where(arel_table[:id].lt(max_id)) if max_id.present? query = query.where(arel_table[:id].lt(max_id)) if max_id.present?
query = query.where(arel_table[:id].gt(since_id)) if since_id.present? query = query.where(arel_table[:id].gt(since_id)) if since_id.present?
@ -14,7 +14,7 @@ module Paginable
# Differs from :paginate_by_max_id in that it gives the results immediately following min_id, # Differs from :paginate_by_max_id in that it gives the results immediately following min_id,
# whereas since_id gives the items with largest id, but with since_id as a cutoff. # whereas since_id gives the items with largest id, but with since_id as a cutoff.
# Results will be in ascending order by id. # Results will be in ascending order by id.
scope :paginate_by_min_id, ->(limit, min_id = nil, max_id = nil) { scope :paginate_by_min_id, lambda { |limit, min_id = nil, max_id = nil|
query = reorder(arel_table[:id]).limit(limit) query = reorder(arel_table[:id]).limit(limit)
query = query.where(arel_table[:id].gt(min_id)) if min_id.present? query = query.where(arel_table[:id].gt(min_id)) if min_id.present?
query = query.where(arel_table[:id].lt(max_id)) if max_id.present? query = query.where(arel_table[:id].lt(max_id)) if max_id.present?

View file

@ -101,12 +101,12 @@ class Status < ApplicationRecord
scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) } scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) }
scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) } scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) } scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
scope :tagged_with_all, ->(tag_ids) { scope :tagged_with_all, lambda { |tag_ids|
Array(tag_ids).map(&:to_i).reduce(self) do |result, id| Array(tag_ids).map(&:to_i).reduce(self) do |result, id|
result.joins("INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}") result.joins("INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}")
end end
} }
scope :tagged_with_none, ->(tag_ids) { scope :tagged_with_none, lambda { |tag_ids|
where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids) where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids)
} }

View file

@ -49,7 +49,7 @@ class Tag < ApplicationRecord
scope :listable, -> { where(listable: [true, nil]) } scope :listable, -> { where(listable: [true, nil]) }
scope :trendable, -> { Setting.trendable_by_default ? where(trendable: [true, nil]) : where(trendable: true) } scope :trendable, -> { Setting.trendable_by_default ? where(trendable: [true, nil]) : where(trendable: true) }
scope :not_trendable, -> { where(trendable: false) } scope :not_trendable, -> { where(trendable: false) }
scope :recently_used, ->(account) { scope :recently_used, lambda { |account|
joins(:statuses) joins(:statuses)
.where(statuses: { id: account.statuses.select(:id).limit(1000) }) .where(statuses: { id: account.statuses.select(:id).limit(1000) })
.group(:id).order(Arel.sql('count(*) desc')) .group(:id).order(Arel.sql('count(*) desc'))

View file

@ -121,7 +121,7 @@ module Mastodon
prompt.warn('Do NOT interrupt this process...') prompt.warn('Do NOT interrupt this process...')
delete_account = ->(account) do delete_account = lambda do |account|
payload = ActiveModelSerializers::SerializableResource.new( payload = ActiveModelSerializers::SerializableResource.new(
account, account,
serializer: ActivityPub::DeleteActorSerializer, serializer: ActivityPub::DeleteActorSerializer,

View file

@ -139,7 +139,7 @@ module Mastodon
pool = Concurrent::ThreadPoolExecutor.new(min_threads: 0, max_threads: options[:concurrency], idletime: 10, auto_terminate: true, max_queue: 0) pool = Concurrent::ThreadPoolExecutor.new(min_threads: 0, max_threads: options[:concurrency], idletime: 10, auto_terminate: true, max_queue: 0)
work_unit = ->(domain) do work_unit = lambda do |domain|
next if stats.key?(domain) next if stats.key?(domain)
next if options[:exclude_suspended] && domain.match?(blocked_domains) next if options[:exclude_suspended] && domain.match?(blocked_domains)