Browse Source

Fix rubocop warning (#14288)

* Fix rubocop warning

* use limit variable

* use ContextCreatingMethods option
master
abcang 1 year ago
committed by GitHub
parent
commit
6a96af4d20
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 7 deletions
  1. +4
    -0
      .rubocop.yml
  2. +1
    -0
      app/controllers/auth/sessions_controller.rb
  3. +1
    -1
      app/controllers/tags_controller.rb
  4. +1
    -1
      app/lib/activitypub/activity/create.rb
  5. +1
    -1
      app/lib/proof_provider/keybase/config_serializer.rb
  6. +1
    -0
      app/lib/request.rb
  7. +2
    -3
      app/lib/settings/scoped_settings.rb
  8. +1
    -1
      app/models/concerns/omniauthable.rb

+ 4
- 0
.rubocop.yml View File

@ -28,6 +28,10 @@ Layout/EmptyLineAfterMagicComment:
Layout/SpaceInsideHashLiteralBraces:
EnforcedStyle: space
Lint/UselessAccessModifier:
ContextCreatingMethods:
- class_methods
Metrics/AbcSize:
Max: 100

+ 1
- 0
app/controllers/auth/sessions_controller.rb View File

@ -46,6 +46,7 @@ class Auth::SessionsController < Devise::SessionsController
user = User.authenticate_with_ldap(user_params) if Devise.ldap_authentication
user ||= User.authenticate_with_pam(user_params) if Devise.pam_authentication
user ||= User.find_for_authentication(email: user_params[:email])
user
end
end

+ 1
- 1
app/controllers/tags_controller.rb View File

@ -27,7 +27,7 @@ class TagsController < ApplicationController
expires_in 0, public: true
limit = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
@statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(PAGE_SIZE)
@statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(limit)
@statuses = cache_collection(@statuses, Status)
render xml: RSS::TagSerializer.render(@tag, @statuses)

+ 1
- 1
app/lib/activitypub/activity/create.rb View File

@ -45,7 +45,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
RedisLock.acquire(lock_options) do |lock|
if lock.acquired?
return if delete_arrived_first?(object_uri) || poll_vote?
return if delete_arrived_first?(object_uri) || poll_vote? # rubocop:disable Lint/NonLocalExitFromIterator
@status = find_existing_status

+ 1
- 1
app/lib/proof_provider/keybase/config_serializer.rb View File

@ -55,7 +55,7 @@ class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer
end
def profile_url
CGI.unescape(short_account_url('%{username}')) # rubocop:disable Style/FormatStringToken
CGI.unescape(short_account_url('%{username}'))
end
def check_url

+ 1
- 0
app/lib/request.rb View File

@ -231,6 +231,7 @@ class Request
begin
sock.connect_nonblock(addr_by_socket[sock])
rescue Errno::EISCONN
# Do nothing
rescue => e
sock.close
outer_e = e

+ 2
- 3
app/lib/settings/scoped_settings.rb View File

@ -11,7 +11,7 @@ module Settings
@object = object
end
# rubocop:disable Style/MethodMissing
# rubocop:disable Style/MethodMissingSuper
def method_missing(method, *args)
method_name = method.to_s
# set a value for a variable
@ -24,7 +24,7 @@ module Settings
self[method_name]
end
end
# rubocop:enable Style/MethodMissing
# rubocop:enable Style/MethodMissingSuper
def respond_to_missing?(*)
true
@ -48,7 +48,6 @@ module Settings
record.update!(value: value)
Rails.cache.write(Setting.cache_key(key, @object), value)
value
end
def [](key)

+ 1
- 1
app/models/concerns/omniauthable.rb View File

@ -57,7 +57,7 @@ module Omniauthable
user = User.new(user_params_from_auth(email, auth))
user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI.regexp(%w(http https))}\z/
user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/
user.skip_confirmation!
user.save!
user

Loading…
Cancel
Save