Browse Source

Autofix Rubocop Style/FormatString (#23743)

closed-social-glitch-2
Nick Schonning 1 year ago
committed by GitHub
parent
commit
af4c95100c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 13 deletions
  1. +0
    -10
      .rubocop_todo.yml
  2. +1
    -1
      app/serializers/rest/privacy_policy_serializer.rb
  3. +1
    -1
      lib/mastodon/maintenance_cli.rb
  4. +1
    -1
      lib/paperclip/color_extractor.rb

+ 0
- 10
.rubocop_todo.yml View File

@ -2026,16 +2026,6 @@ Style/FetchEnvVar:
- 'lib/tasks/repo.rake'
- 'spec/features/profile_spec.rb'
# Offense count: 3
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: format, sprintf, percent
Style/FormatString:
Exclude:
- 'app/serializers/rest/privacy_policy_serializer.rb'
- 'lib/mastodon/maintenance_cli.rb'
- 'lib/paperclip/color_extractor.rb'
# Offense count: 15
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.

+ 1
- 1
app/serializers/rest/privacy_policy_serializer.rb View File

@ -8,7 +8,7 @@ class REST::PrivacyPolicySerializer < ActiveModel::Serializer
end
def content
markdown.render(object.text % { domain: Rails.configuration.x.local_domain })
markdown.render(format(object.text, domain: Rails.configuration.x.local_domain))
end
private

+ 1
- 1
lib/mastodon/maintenance_cli.rb View File

@ -550,7 +550,7 @@ module Mastodon
@prompt.warn 'All those accounts are distinct accounts but only the most recently-created one is fully-functional.'
accounts.each_with_index do |account, idx|
@prompt.say '%2d. %s: created at: %s; updated at: %s; last logged in at: %s; statuses: %5d; last status at: %s' % [idx, account.username, account.created_at, account.updated_at, account.user&.last_sign_in_at&.to_s || 'N/A', account.account_stat&.statuses_count || 0, account.account_stat&.last_status_at || 'N/A']
@prompt.say format('%2d. %s: created at: %s; updated at: %s; last logged in at: %s; statuses: %5d; last status at: %s', idx, account.username, account.created_at, account.updated_at, account.user&.last_sign_in_at&.to_s || 'N/A', account.account_stat&.statuses_count || 0, account.account_stat&.last_status_at || 'N/A')
end
@prompt.say 'Please chose the one to keep unchanged, other ones will be automatically renamed.'

+ 1
- 1
lib/paperclip/color_extractor.rb View File

@ -183,7 +183,7 @@ module Paperclip
end
def rgb_to_hex(rgb)
'#%02x%02x%02x' % [rgb.r, rgb.g, rgb.b]
format('#%02x%02x%02x', rgb.r, rgb.g, rgb.b)
end
end
end

Loading…
Cancel
Save