mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 18:45:41 +01:00
Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)
This commit is contained in:
parent
e2567df860
commit
a6f77aa28a
7 changed files with 16 additions and 27 deletions
|
@ -183,17 +183,6 @@ Lint/AmbiguousBlockAssociation:
|
||||||
- 'spec/services/unsuspend_account_service_spec.rb'
|
- 'spec/services/unsuspend_account_service_spec.rb'
|
||||||
- 'spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb'
|
- 'spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb'
|
||||||
|
|
||||||
# Offense count: 17
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
Lint/AmbiguousOperatorPrecedence:
|
|
||||||
Exclude:
|
|
||||||
- 'app/controllers/concerns/rate_limit_headers.rb'
|
|
||||||
- 'app/lib/rate_limiter.rb'
|
|
||||||
- 'app/models/system_key.rb'
|
|
||||||
- 'app/models/webauthn_credential.rb'
|
|
||||||
- 'app/workers/concerns/exponential_backoff.rb'
|
|
||||||
- 'lib/paperclip/color_extractor.rb'
|
|
||||||
|
|
||||||
# Offense count: 15
|
# Offense count: 15
|
||||||
# Configuration parameters: AllowedMethods.
|
# Configuration parameters: AllowedMethods.
|
||||||
# AllowedMethods: enums
|
# AllowedMethods: enums
|
||||||
|
|
|
@ -67,6 +67,6 @@ module RateLimitHeaders
|
||||||
end
|
end
|
||||||
|
|
||||||
def reset_period_offset
|
def reset_period_offset
|
||||||
api_throttle_data[:period] - request_time.to_i % api_throttle_data[:period]
|
api_throttle_data[:period] - (request_time.to_i % api_throttle_data[:period])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -48,7 +48,7 @@ class RateLimiter
|
||||||
{
|
{
|
||||||
'X-RateLimit-Limit' => @limit.to_s,
|
'X-RateLimit-Limit' => @limit.to_s,
|
||||||
'X-RateLimit-Remaining' => (@limit - (redis.get(key) || 0).to_i).to_s,
|
'X-RateLimit-Remaining' => (@limit - (redis.get(key) || 0).to_i).to_s,
|
||||||
'X-RateLimit-Reset' => (now + (@period - now.to_i % @period)).iso8601(6),
|
'X-RateLimit-Reset' => (now + (@period - (now.to_i % @period))).iso8601(6),
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ class SystemKey < ApplicationRecord
|
||||||
|
|
||||||
before_validation :set_key
|
before_validation :set_key
|
||||||
|
|
||||||
scope :expired, ->(now = Time.now.utc) { where(arel_table[:created_at].lt(now - ROTATION_PERIOD * 3)) }
|
scope :expired, ->(now = Time.now.utc) { where(arel_table[:created_at].lt(now - (ROTATION_PERIOD * 3))) }
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
def current_key
|
def current_key
|
||||||
|
|
|
@ -18,5 +18,5 @@ class WebauthnCredential < ApplicationRecord
|
||||||
validates :external_id, uniqueness: true
|
validates :external_id, uniqueness: true
|
||||||
validates :nickname, uniqueness: { scope: :user_id }
|
validates :nickname, uniqueness: { scope: :user_id }
|
||||||
validates :sign_count,
|
validates :sign_count,
|
||||||
numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 2**63 - 1 }
|
numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: (2**63) - 1 }
|
||||||
end
|
end
|
||||||
|
|
|
@ -5,7 +5,7 @@ module ExponentialBackoff
|
||||||
|
|
||||||
included do
|
included do
|
||||||
sidekiq_retry_in do |count|
|
sidekiq_retry_in do |count|
|
||||||
15 + 10 * (count**4) + rand(10 * (count**4))
|
15 + (10 * (count**4)) + rand(10 * (count**4))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -79,8 +79,8 @@ module Paperclip
|
||||||
private
|
private
|
||||||
|
|
||||||
def w3c_contrast(color1, color2)
|
def w3c_contrast(color1, color2)
|
||||||
luminance1 = color1.to_xyz.y * 0.01 + 0.05
|
luminance1 = (color1.to_xyz.y * 0.01) + 0.05
|
||||||
luminance2 = color2.to_xyz.y * 0.01 + 0.05
|
luminance2 = (color2.to_xyz.y * 0.01) + 0.05
|
||||||
|
|
||||||
if luminance1 > luminance2
|
if luminance1 > luminance2
|
||||||
luminance1 / luminance2
|
luminance1 / luminance2
|
||||||
|
@ -109,11 +109,11 @@ module Paperclip
|
||||||
|
|
||||||
case max
|
case max
|
||||||
when r
|
when r
|
||||||
h = (g - b) / d + (g < b ? 6.0 : 0)
|
h = ((g - b) / d) + (g < b ? 6.0 : 0)
|
||||||
when g
|
when g
|
||||||
h = (b - r) / d + 2.0
|
h = ((b - r) / d) + 2.0
|
||||||
when b
|
when b
|
||||||
h = (r - g) / d + 4.0
|
h = ((r - g) / d) + 4.0
|
||||||
end
|
end
|
||||||
|
|
||||||
h /= 6.0
|
h /= 6.0
|
||||||
|
@ -126,9 +126,9 @@ module Paperclip
|
||||||
t += 1 if t.negative?
|
t += 1 if t.negative?
|
||||||
t -= 1 if t > 1
|
t -= 1 if t > 1
|
||||||
|
|
||||||
return (p + (q - p) * 6 * t) if t < 1 / 6.0
|
return (p + ((q - p) * 6 * t)) if t < 1 / 6.0
|
||||||
return q if t < 1 / 2.0
|
return q if t < 1 / 2.0
|
||||||
return (p + (q - p) * (2 / 3.0 - t) * 6) if t < 2 / 3.0
|
return (p + ((q - p) * ((2 / 3.0) - t) * 6)) if t < 2 / 3.0
|
||||||
|
|
||||||
p
|
p
|
||||||
end
|
end
|
||||||
|
@ -147,11 +147,11 @@ module Paperclip
|
||||||
g = l.to_f
|
g = l.to_f
|
||||||
b = l.to_f # achromatic
|
b = l.to_f # achromatic
|
||||||
else
|
else
|
||||||
q = l < 0.5 ? l * (s + 1) : l + s - l * s
|
q = l < 0.5 ? l * (s + 1) : l + s - (l * s)
|
||||||
p = 2 * l - q
|
p = (2 * l) - q
|
||||||
r = hue_to_rgb(p, q, h + 1 / 3.0)
|
r = hue_to_rgb(p, q, h + (1 / 3.0))
|
||||||
g = hue_to_rgb(p, q, h)
|
g = hue_to_rgb(p, q, h)
|
||||||
b = hue_to_rgb(p, q, h - 1 / 3.0)
|
b = hue_to_rgb(p, q, h - (1 / 3.0))
|
||||||
end
|
end
|
||||||
|
|
||||||
[(r * 255).round, (g * 255).round, (b * 255).round]
|
[(r * 255).round, (g * 255).round, (b * 255).round]
|
||||||
|
|
Loading…
Reference in a new issue