mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Use i-var from tsquery generation method

Browse Source
This commit is contained in:
Matt Jankowski 2024-09-17 15:20:22 -04:00
parent 87e13d1408
commit 8d1bf75cff
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/queries/account_search_query.rb
View File

@ -115,32 +115,32 @@ class AccountSearchQuery
end
def search
tsquery = generate_query_for_search(@terms)
Account.find_by_sql([BASIC_SEARCH_SQL, { limit: @limit, offset: @offset, tsquery: tsquery }]).tap do |records|
Account.find_by_sql([BASIC_SEARCH_SQL, { limit: @limit, offset: @offset, tsquery: generate_query_for_search }]).tap do |records|
ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
end
end
def advanced_search(account, following: false)
tsquery = generate_query_for_search(@terms)
sql_template = following ? ADVANCED_SEARCH_WITH_FOLLOWING : ADVANCED_SEARCH_WITHOUT_FOLLOWING
Account.find_by_sql([sql_template, { id: account.id, limit: @limit, offset: @offset, tsquery: tsquery }]).tap do |records|
Account.find_by_sql([sql_template, { id: account.id, limit: @limit, offset: @offset, tsquery: generate_query_for_search }]).tap do |records|
ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
end
end
private
def generate_query_for_search(unsanitized_terms)
terms = unsanitized_terms.gsub(DISALLOWED_TSQUERY_CHARACTERS, ' ')
def generate_query_for_search
# The final ":*" is for prefix search.
# The trailing space does not seem to fit any purpose, but `to_tsquery`
# behaves differently with and without a leading space if the terms start
# with `./`, `../`, or `.. `. I don't understand why, so, in doubt, keep
# the same query.
"' #{terms} ':*"
"' #{sanitized_search_terms} ':*"
end
def sanitized_search_terms
@terms
.gsub(DISALLOWED_TSQUERY_CHARACTERS, ' ')
end
end