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

Merge pull request #4249 from BrokenEagle/artist-wiki-links

Browse Source 
Have artist wiki links go to artist page
This commit is contained in:
evazion
2020-01-08 11:27:37 -06:00
committed by GitHub
parent 11411ab778 642e121ad9
commit 0b31a6f491
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/src/styles/common/dtext.scss
View File

@@ -109,7 +109,7 @@ div.prose {
vertical-align: 1px; vertical-align: 1px;
} }
a.dtext-wiki-does-not-exist, a.dtext-tag-does-not-exist { a.dtext-wiki-does-not-exist, a.dtext-tag-does-not-exist, a.dtext-artist-does-not-exist {
text-decoration: dotted underline; text-decoration: dotted underline;
} }

43
app/logical/d_text.rb
View File

@@ -20,11 +20,12 @@ class DText
names = dtext_messages.map { |message| parse_wiki_titles(message) }.flatten.uniq names = dtext_messages.map { |message| parse_wiki_titles(message) }.flatten.uniq
wiki_pages = WikiPage.where(title: names) wiki_pages = WikiPage.where(title: names)
tags = Tag.where(name: names) tags = Tag.where(name: names)
artists = Artist.where(name: names)
[wiki_pages, tags] [wiki_pages, tags, artists]
end end
def self.postprocess(html, wiki_pages, tags) def self.postprocess(html, wiki_pages, tags, artists)
fragment = Nokogiri::HTML.fragment(html) fragment = Nokogiri::HTML.fragment(html)
fragment.css("a.dtext-wiki-link").each do |node| fragment.css("a.dtext-wiki-link").each do |node|
@@ -34,22 +35,34 @@ class DText
name = WikiPage.normalize_title(name) name = WikiPage.normalize_title(name)
wiki = wiki_pages.find { |wiki| wiki.title == name } wiki = wiki_pages.find { |wiki| wiki.title == name }
tag = tags.find { |tag| tag.name == name } tag = tags.find { |tag| tag.name == name }
artist = artists.find { |artist| artist.name == name }
if wiki.blank? if (tag.present? && tag.category == Tag.categories.artist) || artist.present?
node["class"] += " dtext-wiki-does-not-exist" node["href"] = "/artists/show_or_new?name=#{name}"
node["title"] = "This wiki page does not exist"
end
if WikiPage.is_meta_wiki?(name) if artist.blank?
# skip (meta wikis aren't expected to have a tag) node["class"] += " dtext-artist-does-not-exist"
elsif tag.blank? node["title"] = "This artist page does not exist"
node["class"] += " dtext-tag-does-not-exist" end
node["title"] = "This wiki page does not have a tag"
elsif tag.post_count <= 0 node["class"] += " tag-type-#{Tag.categories.artist}"
node["class"] += " dtext-tag-empty"
node["title"] = "This wiki page does not have a tag"
else else
node["class"] += " tag-type-#{tag.category}" if wiki.blank?
node["class"] += " dtext-wiki-does-not-exist"
node["title"] = "This wiki page does not exist"
end
if WikiPage.is_meta_wiki?(name)
# skip (meta wikis aren't expected to have a tag)
elsif tag.blank?
node["class"] += " dtext-tag-does-not-exist"
node["title"] = "This wiki page does not have a tag"
elsif tag.post_count <= 0
node["class"] += " dtext-tag-empty"
node["title"] = "This wiki page does not have a tag"
else
node["class"] += " tag-type-#{tag.category}"
end
end end
end end