Change hashtag search to only return results that have trended in the past (#11448)
* Change hashtag search to only return results that have trended in the past A way to eliminate typos and other one-off "junk" results * Fix excluding exact matches that don't have a score * Fix tests
This commit is contained in:
parent
ff789a751a
commit
92de439c04
2 changed files with 6 additions and 4 deletions
|
@ -76,9 +76,11 @@ class Tag < ApplicationRecord
|
|||
end
|
||||
|
||||
def search_for(term, limit = 5, offset = 0)
|
||||
pattern = sanitize_sql_like(normalize(term.strip)) + '%'
|
||||
normalized_term = normalize(term.strip).mb_chars.downcase.to_s
|
||||
pattern = sanitize_sql_like(normalized_term) + '%'
|
||||
|
||||
Tag.where(arel_table[:name].lower.matches(pattern.mb_chars.downcase.to_s))
|
||||
Tag.where(arel_table[:name].lower.matches(pattern))
|
||||
.where(arel_table[:score].gt(0).or(arel_table[:name].lower.eq(normalized_term)))
|
||||
.order(Arel.sql('length(name) ASC, score DESC, name ASC'))
|
||||
.limit(limit)
|
||||
.offset(offset)
|
||||
|
|
|
@ -136,8 +136,8 @@ RSpec.describe Tag, type: :model do
|
|||
end
|
||||
|
||||
it 'finds the exact matching tag as the first item' do
|
||||
similar_tag = Fabricate(:tag, name: "matchlater")
|
||||
tag = Fabricate(:tag, name: "match")
|
||||
similar_tag = Fabricate(:tag, name: "matchlater", score: 1)
|
||||
tag = Fabricate(:tag, name: "match", score: 1)
|
||||
|
||||
results = Tag.search_for("match")
|
||||
|
||||
|
|
Loading…
Reference in a new issue