From 92de439c04785530ce15f55cae18590136c75216 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 30 Jul 2019 20:29:50 +0200
Subject: [PATCH] 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
---
app/models/tag.rb | 6 ++++--
spec/models/tag_spec.rb | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/models/tag.rb b/app/models/tag.rb
index a2d6078f4b..c7f0af86df 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -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)
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 5f07fd618e..9d700849bb 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -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")
--
GitLab