Improve performance by avoiding regex construction (#20215)

```ruby
10.times { p /#{FOO}/.object_id }
10.times { p FOO_RE.object_id }
```
This commit is contained in:
James Tucker
2022-11-09 20:49:30 -08:00
committed by GitHub
parent 0cd0786aef
commit 78a6b871fe
8 changed files with 21 additions and 12 deletions

View File

@ -3,6 +3,8 @@
class AccountSearchService < BaseService
attr_reader :query, :limit, :offset, :options, :account
MENTION_ONLY_RE = /\A#{Account::MENTION_RE}\z/i
# Min. number of characters to look for non-exact matches
MIN_QUERY_LENGTH = 5
@ -180,7 +182,7 @@ class AccountSearchService < BaseService
end
def username_complete?
query.include?('@') && "@#{query}".match?(/\A#{Account::MENTION_RE}\Z/)
query.include?('@') && "@#{query}".match?(MENTION_ONLY_RE)
end
def likely_acct?

View File

@ -4,6 +4,8 @@ class ResolveURLService < BaseService
include JsonLdHelper
include Authorization
USERNAME_STATUS_RE = %r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}
def call(url, on_behalf_of: nil)
@url = url
@on_behalf_of = on_behalf_of
@ -43,7 +45,7 @@ class ResolveURLService < BaseService
# We don't have an index on `url`, so try guessing the `uri` from `url`
parsed_url = Addressable::URI.parse(@url)
parsed_url.path.match(%r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}) do |matched|
parsed_url.path.match(USERNAME_STATUS_RE) do |matched|
parsed_url.path = "/users/#{matched[:username]}/statuses/#{matched[:status_id]}"
scope = scope.or(Status.where(uri: parsed_url.to_s, url: @url))
end