Skip to content

Commit

Permalink
Fixed code quality issues (mastodon#15541)
Browse files Browse the repository at this point in the history
* Added .deepsource.toml

* Removed bad use of `alias`

* Fixed operand order in the binary expression

* Prefixed unused method arguments with an underscore

* Replaced the old OpenSSL algorithmic constants with the newer strings initializers.

* Removed unnecessary UTF-8 encoding comment
  • Loading branch information
withshubh authored Jan 31, 2021
1 parent 3efa0c5 commit c8d11b8
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 10 deletions.
18 changes: 18 additions & 0 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version = 1

test_patterns = ["/app/javascript/mastodon/**/__tests__/**"]

[[analyzers]]
name = "ruby"
enabled = true

[[analyzers]]
name = "javascript"
enabled = true

[analyzers.meta]
environment = [
"nodejs",
"browser",
"jest"
]
2 changes: 1 addition & 1 deletion config/initializers/fast_blank.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if String.method_defined?(:blank_as?)
class String
alias_method :blank?, :blank_as?
alias blank? blank_as?
end
end
4 changes: 2 additions & 2 deletions config/initializers/simple_form.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Use this setup block to configure all options available in SimpleForm.

module AppendComponent
def append(wrapper_options = nil)
def append(_wrapper_options = nil)
@append ||= begin
options[:append].to_s.html_safe if options[:append].present?
end
end
end

module RecommendedComponent
def recommended(wrapper_options = nil)
def recommended(_wrapper_options = nil)
return unless options[:recommended]
options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) }
nil
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/twitter_regex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module Extractor
# XMPP or magnet URIs an empty array will be returned.
#
# If a block is given then it will be called for each XMPP URI.
def extract_extra_uris_with_indices(text, options = {}) # :yields: uri, start, end
def extract_extra_uris_with_indices(text, _options = {}) # :yields: uri, start, end
return [] unless text && text.index(":")
urls = []

Expand Down
1 change: 0 additions & 1 deletion lib/json_ld/identity.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# frozen_string_literal: true
# This file generated automatically from http://w3id.org/identity/v1
require 'json/ld'
Expand Down
1 change: 0 additions & 1 deletion lib/json_ld/security.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# frozen_string_literal: true
# This file generated automatically from http://w3id.org/security/v1
require 'json/ld'
Expand Down
2 changes: 1 addition & 1 deletion lib/mastodon/email_domain_blocks_cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def remove(*domains)
result = entry.destroy

if result
processed += 1 + children_count
processed += children_count + 1
else
say("#{domain} could not be unblocked.", :red)
failed += 1
Expand Down
4 changes: 2 additions & 2 deletions lib/paperclip/color_extractor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def make
# If we don't have enough colors for accent and foreground, generate
# new ones by manipulating the background color
(2 - foreground_colors.size).times do |i|
foreground_colors << lighten_or_darken(background_color, 35 + (15 * i))
foreground_colors << lighten_or_darken(background_color, 35 + (i * 15))
end

# We want the color with the highest contrast to background to be the foreground one,
Expand Down Expand Up @@ -147,7 +147,7 @@ def hsl_to_rgb(h, s, l)
g = l.to_f
b = l.to_f # achromatic
else
q = l < 0.5 ? l * (1 + s) : l + s - l * s
q = l < 0.5 ? l * (s + 1) : l + s - l * s
p = 2 * l - q
r = hue_to_rgb(p, q, h + 1 / 3.0)
g = hue_to_rgb(p, q, h)
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/activitypub/linked_data_signature_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ def sign(from_account, options, document)
options_hash = Digest::SHA256.hexdigest(canonicalize(options.merge('@context' => ActivityPub::LinkedDataSignature::CONTEXT)))
document_hash = Digest::SHA256.hexdigest(canonicalize(document))
to_be_verified = options_hash + document_hash
Base64.strict_encode64(from_account.keypair.sign(OpenSSL::Digest::SHA256.new, to_be_verified))
Base64.strict_encode64(from_account.keypair.sign(OpenSSL::Digest.new('SHA256'), to_be_verified))
end
end

0 comments on commit c8d11b8

Please sign in to comment.