From 6a96af4d20129cea06c716393338aa4f730b7b35 Mon Sep 17 00:00:00 2001 From: abcang Date: Wed, 15 Jul 2020 02:05:07 +0900 Subject: [PATCH] Fix rubocop warning (#14288) * Fix rubocop warning * use limit variable * use ContextCreatingMethods option --- .rubocop.yml | 4 ++++ app/controllers/auth/sessions_controller.rb | 1 + app/controllers/tags_controller.rb | 2 +- app/lib/activitypub/activity/create.rb | 2 +- app/lib/proof_provider/keybase/config_serializer.rb | 2 +- app/lib/request.rb | 1 + app/lib/settings/scoped_settings.rb | 5 ++--- app/models/concerns/omniauthable.rb | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 3a11f70009..25e0fa940b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -28,6 +28,10 @@ Layout/EmptyLineAfterMagicComment: Layout/SpaceInsideHashLiteralBraces: EnforcedStyle: space +Lint/UselessAccessModifier: + ContextCreatingMethods: + - class_methods + Metrics/AbcSize: Max: 100 diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 2415e2ef32..1fd755334b 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -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 diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 234a0c4117..6426a7d695 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -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) diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index d3d4605516..e81452e3ca 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -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 diff --git a/app/lib/proof_provider/keybase/config_serializer.rb b/app/lib/proof_provider/keybase/config_serializer.rb index fbce7aeee8..c6c364d316 100644 --- a/app/lib/proof_provider/keybase/config_serializer.rb +++ b/app/lib/proof_provider/keybase/config_serializer.rb @@ -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 diff --git a/app/lib/request.rb b/app/lib/request.rb index 247c32958a..bcba1eebf6 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -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 diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb index 9ca39510ac..3bec9bd569 100644 --- a/app/lib/settings/scoped_settings.rb +++ b/app/lib/settings/scoped_settings.rb @@ -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) diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 736da6c1de..4ea219537a 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -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