mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +00:00
Fix rubocop warning (#14288)
* Fix rubocop warning * use limit variable * use ContextCreatingMethods option
This commit is contained in:
parent
a8e84a18f1
commit
6a96af4d20
|
@ -28,6 +28,10 @@ Layout/EmptyLineAfterMagicComment:
|
|||
Layout/SpaceInsideHashLiteralBraces:
|
||||
EnforcedStyle: space
|
||||
|
||||
Lint/UselessAccessModifier:
|
||||
ContextCreatingMethods:
|
||||
- class_methods
|
||||
|
||||
Metrics/AbcSize:
|
||||
Max: 100
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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…
Reference in a new issue