Fix all rubocop warnings

.rubocop.yml

@@ -2,8 +2,9 @@ require:
   - rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   NewCops: disable
+  SuggestExtensions: false
   Exclude:
     - 'spec/**/*'
     - 'db/**/*'
@@ -41,6 +42,10 @@ Layout/FirstHashElementIndentation:
 Layout/HashAlignment:
   Enabled: false
 
+Layout/LineLength:
+  AllowURI: true
+  Enabled: false
+
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 
@@ -56,6 +61,9 @@ Lint/DuplicateElsifCondition:
 Lint/MixedRegexpCaptureTypes:
   Enabled: true
 
+Lint/NonLocalExitFromIterator:
+  Enabled: false
+
 Lint/RaiseException:
   Enabled: true
 
@@ -93,10 +101,6 @@ Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/mastodon/*_cli.rb'
 
-Layout/LineLength:
-  AllowURI: true
-  Enabled: false
-
 Metrics/MethodLength:
   CountComments: false
   Max: 65
@@ -108,11 +112,14 @@ Metrics/ModuleLength:
   Max: 200
 
 Metrics/ParameterLists:
-  Max: 5
+  Max: 6
   CountKeywordArgs: true
+  MaxOptionalParameters: 4
 
 Metrics/PerceivedComplexity:
   Max: 25
+  Exclude:
+    - 'lib/mastodon/*_cli.rb'
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false
@@ -166,6 +173,10 @@ Rails/InverseOf:
 Rails/LexicallyScopedActionFilter:
   Enabled: false
 
+Rails/Output:
+  Exclude:
+    - 'lib/mastodon/*_cli.rb'
+
 Rails/OutputSafety:
   Enabled: true
 
@@ -204,6 +215,9 @@ Style/CollectionMethods:
   PreferredMethods:
     find_all: 'select'
 
+Style/CombinableLoops:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 
@@ -255,6 +269,9 @@ Style/Lambda:
 Style/MutableConstant:
   Enabled: false
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%i': '()'
@@ -307,3 +324,7 @@ Style/TrailingCommaInHashLiteral:
 
 Style/UnpackFirst:
   Enabled: false
+
+Style/WordArray:
+  Exclude:
+    - 'app/helpers/languages_helper.rb'

Gemfile

@@ -132,7 +132,7 @@ group :development do
   gem 'letter_opener', '~> 1.8'
   gem 'letter_opener_web', '~> 2.0'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 1.30', require: false
+  gem 'rubocop', '~> 1.31', require: false
   gem 'rubocop-rails', '~> 2.15', require: false
   gem 'brakeman', '~> 5.2', require: false
   gem 'bundler-audit', '~> 0.9', require: false

Gemfile.lock

@@ -305,7 +305,7 @@ GEM
     httplog (1.5.0)
       rack (>= 1.0)
       rainbow (>= 2.0.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.11)
       activesupport (>= 4.0.2)
@@ -396,7 +396,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.0)
+    minitest (5.16.2)
     msgpack (1.5.2)
     multi_json (1.15.0)
     multipart-post (2.1.1)
@@ -569,7 +569,8 @@ GEM
     rspec-support (3.11.0)
     rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.30.1)
+    rubocop (1.31.2)
+      json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -578,9 +579,9 @@ GEM
       rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.19.1)
       parser (>= 3.1.1.0)
-    rubocop-rails (2.15.0)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -678,7 +679,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     uniform_notifier (1.16.0)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -822,7 +823,7 @@ DEPENDENCIES
   rspec-rails (~> 5.1)
   rspec-sidekiq (~> 3.1)
   rspec_junit_formatter (~> 0.5)
-  rubocop (~> 1.30)
+  rubocop (~> 1.31)
   rubocop-rails (~> 2.15)
   ruby-progressbar (~> 1.11)
   sanitize (~> 6.0)
@@ -848,3 +849,9 @@ DEPENDENCIES
   webpacker (~> 5.4)
   webpush (~> 0.3)
   xorcist (~> 1.1)
+
+RUBY VERSION
+   ruby 3.0.4p208
+
+BUNDLED WITH
+   2.2.33

app/controllers/api/v1/accounts_controller.rb

@@ -30,7 +30,7 @@ class Api::V1::AccountsController < Api::BaseController
     self.response_body = Oj.dump(response.body)
     self.status        = response.status
   rescue ActiveRecord::RecordInvalid => e
-    render json: ValidationErrorFormatter.new(e, :'account.username' => :username, :'invite_request.text' => :reason).as_json, status: :unprocessable_entity
+    render json: ValidationErrorFormatter.new(e, 'account.username': :username, 'invite_request.text': :reason).as_json, status: :unprocessable_entity
   end
 
   def follow

app/controllers/auth/sessions_controller.rb

@@ -122,7 +122,7 @@ class Auth::SessionsController < Devise::SessionsController
     redirect_to new_user_session_path, alert: I18n.t('devise.failure.timeout')
   end
 
-  def set_attempt_session(user)
+  def set_attempt_session(user) # rubocop:disable Naming/AccessorMethodName
     session[:attempt_user_id]         = user.id
     session[:attempt_user_updated_at] = user.updated_at.to_s
   end

app/helpers/jsonld_helper.rb

@@ -112,7 +112,7 @@ module JsonLdHelper
       if value.is_a?(Hash) && compacted_value.is_a?(Hash)
         patch_for_forwarding!(value, compacted_value)
       elsif value.is_a?(Array)
-        compacted_value = [compacted_value] unless compacted_value.is_a?(Array)
+        compacted_value = [compacted_value] unless compacted_value.is_a?(Array) # rubocop:disable Style/ArrayCoercion
         return if value.size != compacted_value.size
 
         compacted[key] = value.zip(compacted_value).map do |v, vc|
@@ -143,7 +143,7 @@ module JsonLdHelper
   def safe_for_forwarding?(original, compacted)
     original.without('@context', 'signature').all? do |key, value|
       compacted_value = compacted[key]
-      return false unless value.class == compacted_value.class
+      return false unless value.class == compacted_value.class # rubocop:disable Style/ClassEqualityComparison
 
       if value.is_a?(Hash)
         safe_for_forwarding?(value, compacted_value)

app/helpers/languages_helper.rb

 # frozen_string_literal: true
 
-module LanguagesHelper
+module LanguagesHelper # rubocop:disable Metrics/ModuleLength
   ISO_639_1 = {
     aa: ['Afar', 'Afaraf'].freeze,
     ab: ['Abkhaz', 'аҧсуа бызшәа'].freeze,

app/lib/activitypub/case_transform.rb

@@ -13,7 +13,7 @@ module ActivityPub::CaseTransform
       when Symbol then camel_lower(value.to_s).to_sym
       when String
         camel_lower_cache[value] ||= if value.start_with?('_:')
-                                       '_:' + value.gsub(/\A_:/, '').underscore.camelize(:lower)
+                                       "_:#{value.gsub(/\A_:/, '').underscore.camelize(:lower)}"
                                      else
                                        value.underscore.camelize(:lower)
                                      end

app/lib/emoji_formatter.rb

@@ -62,7 +62,7 @@ class EmojiFormatter
       end
     end
 
-    result << html[last_index..-1]
+    result << html[last_index..]
 
     result.html_safe # rubocop:disable Rails/OutputSafety
   end

app/lib/extractor.rb

@@ -29,7 +29,7 @@ module Extractor
 
     text.scan(Account::MENTION_RE) do |screen_name, _|
       match_data = $LAST_MATCH_INFO
-      after      = $'
+      after      = Regexp.last_match.post_match
 
       unless Twitter::TwitterText::Regex[:end_mention_match].match?(after)
         _, domain = screen_name.split('@')
@@ -64,7 +64,7 @@ module Extractor
       match_data     = $LAST_MATCH_INFO
       start_position = match_data.char_begin(1) - 1
       end_position   = match_data.char_end(1)
-      after          = $'
+      after          = Regexp.last_match.post_match
 
       if %r{\A://}.match?(after)
         hash_text.match(/(.+)(https?\Z)/) do |matched|

app/lib/redis_configuration.rb

@@ -7,8 +7,8 @@ class RedisConfiguration
       @pool = ConnectionPool.new(size: new_pool_size) { new.connection }
     end
 
-    def with
-      pool.with { |redis| yield redis }
+    def with(&block)
+      pool.with(&block)
     end
 
     def pool

app/lib/text_formatter.rb

@@ -64,7 +64,7 @@ class TextFormatter
       indices.last
     end
 
-    result << h(text[last_index..-1])
+    result << h(text[last_index..])
 
     result
   end
@@ -75,8 +75,8 @@ class TextFormatter
 
     prefix      = url.match(URL_PREFIX_REGEX).to_s
     display_url = url[prefix.length, 30]
-    suffix      = url[prefix.length + 30..-1]
-    cutoff      = url[prefix.length..-1].length > 30
+    suffix      = url[prefix.length + 30..]
+    cutoff      = url[prefix.length..].length > 30
 
     <<~HTML.squish
       <a href="#{h(url)}" target="_blank" rel="#{rel.join(' ')}"><span class="invisible">#{h(prefix)}</span><span class="#{cutoff ? 'ellipsis' : ''}">#{h(display_url)}</span><span class="invisible">#{h(suffix)}</span></a>

app/lib/toc_generator.rb

@@ -53,7 +53,7 @@ class TOCGenerator
 
       next unless LISTED_ELEMENTS.include?(node.name)
 
-      depth          = node.name[1..-1]
+      depth          = node.name[1..]
       latest_section = @headers.last
 
       if latest_section.nil? || latest_section.depth >= depth

app/lib/user_settings_decorator.rb

@@ -14,7 +14,7 @@ class UserSettingsDecorator
 
   private
 
-  def process_update
+  def process_update # rubocop:disable Metrics/AbcSize
     user.settings['notification_emails'] = merged_notification_emails if change?('notification_emails')
     user.settings['interactions']        = merged_interactions if change?('interactions')
     user.settings['default_privacy']     = default_privacy_preference if change?('setting_default_privacy')

app/lib/validation_error_formatter.rb

@@ -19,7 +19,7 @@ class ValidationErrorFormatter
       messages = errors.messages[attribute_name]
 
       h[@aliases[attribute_name] || attribute_name] = attribute_errors.map.with_index do |error, index|
-        { error: 'ERR_' + error[:error].to_s.upcase, description: messages[index] }
+        { error: "ERR_#{error[:error].to_s.upcase}", description: messages[index] }
       end
     end
 

app/lib/webfinger.rb

@@ -99,7 +99,7 @@ class Webfinger
   end
 
   def standard_url
-    if @domain.end_with? ".onion"
+    if @domain.end_with? '.onion'
       "http://#{@domain}/.well-known/webfinger?resource=#{@uri}"
     else
       "https://#{@domain}/.well-known/webfinger?resource=#{@uri}"
@@ -107,7 +107,7 @@ class Webfinger
   end
 
   def host_meta_url
-    if @domain.end_with? ".onion"
+    if @domain.end_with? '.onion'
       "http://#{@domain}/.well-known/host-meta"
     else
       "https://#{@domain}/.well-known/host-meta"

app/mailers/application_mailer.rb

@@ -9,9 +9,7 @@ class ApplicationMailer < ActionMailer::Base
 
   protected
 
-  def locale_for_account(account)
-    I18n.with_locale(account.user_locale || I18n.default_locale) do
-      yield
-    end
+  def locale_for_account(account, &block)
+    I18n.with_locale(account.user_locale || I18n.default_locale, &block)
   end
 end

app/models/account_alias.rb

@@ -25,7 +25,7 @@ class AccountAlias < ApplicationRecord
 
   def acct=(val)
     val = val.to_s.strip
-    super(val.start_with?('@') ? val[1..-1] : val)
+    super(val.start_with?('@') ? val[1..] : val)
   end
 
   def pretty_acct

app/models/account_warning.rb

@@ -16,6 +16,7 @@
 #
 
 class AccountWarning < ApplicationRecord
+  # rubocop:disable Lint/RedundantCopDisableDirective, Layout/FirstHashElementIndentation
   enum action: {
     none:                       0,
     disable:                    1_000,
@@ -25,6 +26,7 @@ class AccountWarning < ApplicationRecord
     silence:                    3_000,
     suspend:                    4_000,
   }, _suffix: :action
+  # rubocop:enable Lint/RedundantCopDisableDirective, Layout/FirstHashElementIndentation
 
   belongs_to :account, inverse_of: :account_warnings
   belongs_to :target_account, class_name: 'Account', inverse_of: :strikes

app/models/concerns/account_interactions.rb

 # frozen_string_literal: true
 
-module AccountInteractions
+module AccountInteractions # rubocop:disable Metrics/ModuleLength
   extend ActiveSupport::Concern
 
   class_methods do