diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 41c99710fc..477f56e130 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -153,7 +153,7 @@ class Poll extends ImmutablePureComponent {
}
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 0b4431d625..4647b98b21 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -340,7 +340,7 @@ class Header extends ImmutablePureComponent {
{account.get('id') !== me && !suspended &&
}
- {account.get('note').length > 0 && account.get('note') !== '
' &&
}
+ {account.get('note').length > 0 && account.get('note') !== '
' &&
}
diff --git a/app/lib/extractor.rb b/app/lib/extractor.rb
index 479689d602..6076458ad6 100644
--- a/app/lib/extractor.rb
+++ b/app/lib/extractor.rb
@@ -7,14 +7,14 @@ module Extractor
# :yields: username, list_slug, start, end
def extract_mentions_or_lists_with_indices(text)
- return [] unless text =~ Twitter::Regex[:at_signs]
+ return [] unless Twitter::Regex[:at_signs].match?(text)
possible_entries = []
text.to_s.scan(Account::MENTION_RE) do |screen_name, _|
match_data = $LAST_MATCH_INFO
after = $'
- unless after =~ Twitter::Regex[:end_mention_match]
+ unless Twitter::Regex[:end_mention_match].match?(after)
start_position = match_data.char_begin(1) - 1
end_position = match_data.char_end(1)
possible_entries << {
@@ -33,7 +33,7 @@ module Extractor
end
def extract_hashtags_with_indices(text, **)
- return [] unless text =~ /#/
+ return [] unless /#/.match?(text)
tags = []
text.scan(Tag::HASHTAG_RE) do |hash_text, _|
@@ -41,7 +41,7 @@ module Extractor
start_position = match_data.char_begin(1) - 1
end_position = match_data.char_end(1)
after = $'
- if after =~ %r{\A://}
+ if %r{\A://}.match?(after)
hash_text.match(/(.+)(https?\Z)/) do |matched|
hash_text = matched[1]
end_position -= matched[2].char_length
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index ddd975c5f2..2e70c2ce98 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -454,8 +454,8 @@ class FeedManager
active_filters.map! do |filter|
if filter.whole_word
- sb = filter.phrase =~ /\A[[:word:]]/ ? '\b' : ''
- eb = filter.phrase =~ /[[:word:]]\z/ ? '\b' : ''
+ sb = /\A[[:word:]]/.match?(filter.phrase) ? '\b' : ''
+ eb = /[[:word:]]\z/.match?(filter.phrase) ? '\b' : ''
/(?mix:#{sb}#{Regexp.escape(filter.phrase)}#{eb})/
else
@@ -475,7 +475,7 @@ class FeedManager
status.media_attachments.map(&:description).join("\n\n"),
].compact.join("\n\n")
- !combined_regex.match(combined_text).nil?
+ combined_regex.match?(combined_text)
end
# Adds a status to an account's feed, returning true if a status was
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index e7bb0743d0..1aeedac8af 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -287,7 +287,7 @@ class Formatter
escaped = text.chars.map do |c|
output = begin
- if c.ord.to_s(16).length > 2 && UNICODE_ESCAPE_BLACKLIST_RE.match(c).nil?
+ if c.ord.to_s(16).length > 2 && !UNICODE_ESCAPE_BLACKLIST_RE.match?(c)
CGI.escape(c)
else
c
diff --git a/app/lib/request.rb b/app/lib/request.rb
index 38048dad7b..125dee3ea7 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -145,7 +145,7 @@ class Request
end
def block_hidden_service?
- !Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match(@url.host)
+ !Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match?(@url.host)
end
module ClientLimit
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index 0fb415bd11..ecaec2f841 100644
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -28,9 +28,9 @@ class Sanitize
return unless class_list
class_list.keep_if do |e|
- next true if e =~ /^(h|p|u|dt|e)-/ # microformats classes
- next true if e =~ /^(mention|hashtag)$/ # semantic classes
- next true if e =~ /^(ellipsis|invisible)$/ # link formatting classes
+ next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes
+ next true if /^(mention|hashtag)$/.match?(e) # semantic classes
+ next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes
end
node['class'] = class_list.join(' ')
diff --git a/app/lib/spam_check.rb b/app/lib/spam_check.rb
index 68e586d00b..dcb2db9ca9 100644
--- a/app/lib/spam_check.rb
+++ b/app/lib/spam_check.rb
@@ -186,9 +186,9 @@ class SpamCheck
def matching_status_ids
if nilsimsa?
- other_digests.select { |record| record.start_with?('nilsimsa') && nilsimsa_compare_value(digest, record.split(':')[1]) >= NILSIMSA_COMPARE_THRESHOLD }.filter_map { |record| record.split(':')[2] }
+ other_digests.filter_map { |record| record.split(':')[2] if record.start_with?('nilsimsa') && nilsimsa_compare_value(digest, record.split(':')[1]) >= NILSIMSA_COMPARE_THRESHOLD }
else
- other_digests.select { |record| record.start_with?('md5') && record.split(':')[1] == digest }.filter_map { |record| record.split(':')[2] }
+ other_digests.filter_map { |record| record.split(':')[2] if record.start_with?('md5') && record.split(':')[1] == digest }
end
end
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
index 4ea219537a..79d671d10a 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::DEFAULT_PARSER.make_regexp(%w(http https))}\z/
+ user.account.avatar_remote_url = auth.info.image if /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/.match?(auth.info.image)
user.skip_confirmation!
user.save!
user
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
index f4849d245b..70fb2ba900 100644
--- a/app/presenters/status_relationships_presenter.rb
+++ b/app/presenters/status_relationships_presenter.rb
@@ -15,7 +15,7 @@ class StatusRelationshipsPresenter
statuses = statuses.compact
status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact
conversation_ids = statuses.filter_map(&:conversation_id).uniq
- pinnable_status_ids = statuses.map(&:proper).select { |s| s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }.map(&:id)
+ pinnable_status_ids = statuses.map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }
@reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
@favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 43e5960405..6fe4b6593a 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -175,7 +175,7 @@ class AccountSearchService < BaseService
end
def username_complete?
- query.include?('@') && "@#{query}" =~ /\A#{Account::MENTION_RE}\Z/
+ query.include?('@') && "@#{query}".match?(/\A#{Account::MENTION_RE}\Z/)
end
def likely_acct?
diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb
index 82c861f5b8..72352aca6f 100644
--- a/app/services/activitypub/fetch_featured_collection_service.rb
+++ b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -23,11 +23,8 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
def process_items(items)
status_ids = items.map { |item| value_or_id(item) }
- .reject { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }
- .filter_map { |uri| ActivityPub::FetchRemoteStatusService.new.call(uri) }
- .select { |status| status.account_id == @account.id }
- .map(&:id)
-
+ .filter_map { |uri| ActivityPub::FetchRemoteStatusService.new.call(uri) unless ActivityPub::TagManager.instance.local_uri?(uri) }
+ .filter_map { |status| status.id if status.account_id == @account.id }
to_remove = []
to_add = status_ids
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 255490d5cd..74fe9a0a58 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -47,11 +47,11 @@ class FetchLinkCardService < BaseService
Request.new(:get, @url).add_headers('Accept' => 'text/html', 'User-Agent' => Mastodon::Version.user_agent + ' Bot').perform do |res|
if res.code == 200 && res.mime_type == 'text/html'
- @html = res.body_with_limit
@html_charset = res.charset
+ @html = res.body_with_limit
else
- @html = nil
@html_charset = nil
+ @html = nil
end
end
end
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 19500a8d46..1a76cbb388 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -72,7 +72,7 @@ class SearchService < BaseService
end
def url_query?
- @resolve && @query =~ /\Ahttps?:\/\//
+ @resolve && /\Ahttps?:\/\//.match?(@query)
end
def url_resource_results
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb
index 16e3abf129..20a1587cc6 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -22,7 +22,7 @@ class BlacklistedEmailValidator < ActiveModel::Validator
domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
- @email =~ regexp
+ regexp.match?(@email)
end
def not_on_whitelist?
diff --git a/app/validators/html_validator.rb b/app/validators/html_validator.rb
index 1c9cd303cf..b85b9769fb 100644
--- a/app/validators/html_validator.rb
+++ b/app/validators/html_validator.rb
@@ -15,6 +15,6 @@ class HtmlValidator < ActiveModel::EachValidator
def html_errors(str)
fragment = Nokogiri::HTML.fragment(options[:wrap_with] ? "<#{options[:wrap_with]}>#{str}" : str)
- fragment.errors.select { |error| ERROR_RE =~ error.message }
+ fragment.errors.select { |error| ERROR_RE.match?(error.message) }
end
end
diff --git a/config/initializers/open_uri_redirection.rb b/config/initializers/open_uri_redirection.rb
index e9de85bdc5..0e57c53c63 100644
--- a/config/initializers/open_uri_redirection.rb
+++ b/config/initializers/open_uri_redirection.rb
@@ -3,6 +3,6 @@ require 'open-uri'
module OpenURI
def self.redirectable?(uri1, uri2) # :nodoc:
uri1.scheme.casecmp(uri2.scheme).zero? ||
- (/\A(?:http|https|ftp)\z/i =~ uri1.scheme && /\A(?:http|https|ftp)\z/i =~ uri2.scheme)
+ (/\A(?:http|https|ftp)\z/i.match?(uri1.scheme) && /\A(?:http|https|ftp)\z/i.match?(uri2.scheme))
end
end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 6662ef40b0..c0db499072 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -78,7 +78,7 @@ class Rack::Attack
API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+/.freeze
throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
- req.authenticated_user_id if (req.post? && req.path =~ API_DELETE_REBLOG_REGEX) || (req.delete? && req.path =~ API_DELETE_STATUS_REGEX)
+ req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
end
throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
diff --git a/lib/mastodon/domains_cli.rb b/lib/mastodon/domains_cli.rb
index 3c2dfd4ec2..4ebd8a1e2c 100644
--- a/lib/mastodon/domains_cli.rb
+++ b/lib/mastodon/domains_cli.rb
@@ -93,7 +93,7 @@ module Mastodon
work_unit = ->(domain) do
next if stats.key?(domain)
- next if options[:exclude_suspended] && domain.match(blocked_domains)
+ next if options[:exclude_suspended] && domain.match?(blocked_domains)
stats[domain] = nil