~cytrogen/masto-fe

25d36b6edd77ed161b2f496101f7127f7c1c9e5c — Nick Schonning 3 years ago 0566c81
Autofix Rubocop Style/RedundantArgument (#23798)

M .rubocop_todo.yml => .rubocop_todo.yml +0 -9
@@ 2050,15 2050,6 @@ Style/OptionalBooleanParameter:
    - 'app/workers/unfollow_follow_worker.rb'
    - 'lib/mastodon/redis_config.rb'

# Offense count: 5
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Methods.
Style/RedundantArgument:
  Exclude:
    - 'app/controllers/concerns/signature_verification.rb'
    - 'app/helpers/application_helper.rb'
    - 'lib/tasks/emojis.rake'

# Offense count: 16
# This cop supports safe autocorrection (--autocorrect).
Style/RedundantRegexpCharacterClass:

M app/controllers/concerns/signature_verification.rb => app/controllers/concerns/signature_verification.rb +1 -1
@@ 138,7 138,7 @@ module SignatureVerification
  end

  def signed_headers
    signature_params.fetch('headers', signature_algorithm == 'hs2019' ? '(created)' : 'date').downcase.split(' ')
    signature_params.fetch('headers', signature_algorithm == 'hs2019' ? '(created)' : 'date').downcase.split
  end

  def verify_signature_strength!

M app/helpers/application_helper.rb => app/helpers/application_helper.rb +2 -2
@@ 112,7 112,7 @@ module ApplicationHelper
  def fa_icon(icon, attributes = {})
    class_names = attributes[:class]&.split(' ') || []
    class_names << 'fa'
    class_names += icon.split(' ').map { |cl| "fa-#{cl}" }
    class_names += icon.split.map { |cl| "fa-#{cl}" }

    content_tag(:i, nil, attributes.merge(class: class_names.join(' ')))
  end


@@ 164,7 164,7 @@ module ApplicationHelper
  end

  def body_classes
    output = (@body_classes || '').split(' ')
    output = (@body_classes || '').split
    output << "theme-#{current_theme.parameterize}"
    output << 'system-font' if current_account&.user&.setting_system_font_ui
    output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')

M lib/tasks/emojis.rake => lib/tasks/emojis.rake +2 -2
@@ 6,7 6,7 @@ def gen_border(codepoint, color)
  doc = File.open(input) { |f| Nokogiri::XML(f) }
  svg = doc.at_css('svg')
  if svg.key?('viewBox')
    view_box = svg['viewBox'].split(' ').map(&:to_i)
    view_box = svg['viewBox'].split.map(&:to_i)
    view_box[0] -= 2
    view_box[1] -= 2
    view_box[2] += 4


@@ 36,7 36,7 @@ end

def codepoints_to_unicode(codepoints)
  if codepoints.include?(' ')
    codepoints.split(' ').map(&:hex).pack('U*')
    codepoints.split.map(&:hex).pack('U*')
  else
    [codepoints.hex].pack('U')
  end