about summary refs log tree commit diff
path: root/app/lib/extractor.rb
diff options
context:
space:
mode:
authorluigi <007.lva@gmail.com>2021-01-22 04:09:08 -0500
committerGitHub <noreply@github.com>2021-01-22 10:09:08 +0100
commiteb51e43fb4386120f77f2ff99581f15018a81bd4 (patch)
treeac52a3d084a3eafc1a1943be8ab2393465abc1ec /app/lib/extractor.rb
parent7d0031a515a9ccd552fab9ad55b6edb7e0e5ba32 (diff)
Optimize some regex matching (#15528)
* Use Regex#match?

* Replace =~ too

* Avoid to call match? from Nil

* Keep value of Regexp.last_match
Diffstat (limited to 'app/lib/extractor.rb')
-rw-r--r--app/lib/extractor.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/lib/extractor.rb b/app/lib/extractor.rb
index 479689d60..6076458ad 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