jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autocomplete: fix completion of ai: metatag.

Browse Source 
Fix it so we don't show the `ai:` prefix in front of results in the
autocomplete menu when completing the `ai: metatag.
This commit is contained in:
evazion
2022-09-03 20:26:00 -05:00
parent f83af31a00
commit 4a77d67d1f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/components/autocomplete_component.rb
View File

@@ -32,16 +32,18 @@ class AutocompleteComponent < ApplicationComponent
end end
def highlight_result(result) def highlight_result(result)
if result.type == "tag-word" if metatag.present? && metatag.value.include?("*")
highlight_matching_words(result.value, query)
elsif result.type == "mention"
highlight_wildcard_match(result.label, query + "*")
elsif metatag.present? && metatag.value.include?("*")
highlight_wildcard_match(result.label, metatag.value) highlight_wildcard_match(result.label, metatag.value)
elsif metatag.present? && metatag.name.in?(%w[pool favgroup]) elsif metatag.present? && metatag.name.in?(%w[pool favgroup])
highlight_wildcard_match(result.label, "*" + metatag.value + "*") highlight_wildcard_match(result.label, "*" + metatag.value + "*")
elsif metatag.present? && metatag.name.in?(%w[ai unaliased])
highlight_matching_words(result.label, metatag.value)
elsif metatag.present? elsif metatag.present?
highlight_wildcard_match(result.label, metatag.value + "*") highlight_wildcard_match(result.label, metatag.value + "*")
elsif result.type == "tag-word"
highlight_matching_words(result.value, query)
elsif result.type == "mention"
highlight_wildcard_match(result.label, query + "*")
elsif query.include?("*") elsif query.include?("*")
highlight_wildcard_match(result.value, query) highlight_wildcard_match(result.value, query)
else else

2
app/models/tag.rb
View File

@@ -256,7 +256,7 @@ class Tag < ApplicationRecord
def split_words(name) def split_words(name)
return [name] if !parsable_into_words?(name) return [name] if !parsable_into_words?(name)
name.split(WORD_DELIMITER_REGEX).compact_blank name.split(WORD_DELIMITER_REGEX).reject(&:empty?)
end end
# Parse the tag into plain words, removing punctuation and delimiters. # Parse the tag into plain words, removing punctuation and delimiters.