forked from fedi/mastodon
Autofix Rubocop Style/FormatString (#23743)
This commit is contained in:
parent
a9472f8ff1
commit
af4c95100c
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.'
|
||||
|
|
|
@ -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…
Reference in a new issue