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

Fix #4199: Aliased tags not included in related wiki tags.

Browse Source
This commit is contained in:
evazion
2019-10-24 19:44:59 -05:00
parent 6dcf0484f0
commit ac775e2bdd
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/wiki_page.rb
View File

@@ -220,7 +220,8 @@ class WikiPage < ApplicationRecord
def tags def tags
titles = DText.parse_wiki_titles(body).uniq titles = DText.parse_wiki_titles(body).uniq
tags = Tag.nonempty.where(name: titles).pluck(:name) tags = Tag.nonempty.where(name: titles).pluck(:name)
titles & tags tags += TagAlias.active.where(antecedent_name: titles).pluck(:antecedent_name)
TagAlias.to_aliased(titles & tags)
end end
def visible? def visible?

8
test/unit/related_tag_query_test.rb
View File

@@ -98,6 +98,14 @@ class RelatedTagQueryTest < ActiveSupport::TestCase
query = RelatedTagQuery.new(query: "wiki") query = RelatedTagQuery.new(query: "wiki")
assert_equal(%w[ccc bbb aaa], query.wiki_page_tags) assert_equal(%w[ccc bbb aaa], query.wiki_page_tags)
end end
should "return aliased tags" do
create(:tag_alias, antecedent_name: "kitten", consequent_name: "cat", status: "active")
create(:wiki_page, title: "wiki", body: "[[kitten]]")
query = RelatedTagQuery.new(query: "wiki")
assert_equal(%w[cat], query.wiki_page_tags)
end
end end
end end