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

Merge pull request #3504 from BrokenEagle/fix-3494

Browse Source 
Fix how cosplay tags are handled
This commit is contained in:
Albert Yi
2018-01-18 12:47:02 -08:00
committed by GitHub
parent 989854b3dd f626c7ebd7
commit 9f578b3270
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/post.rb
View File

@@ -705,6 +705,8 @@ class Post < ApplicationRecord
normalized_tags = TagAlias.to_aliased(normalized_tags)
normalized_tags = %w(tagme) if normalized_tags.empty?
normalized_tags = add_automatic_tags(normalized_tags)
normalized_tags = remove_invalid_tags(normalized_tags)
normalized_tags = Tag.convert_cosplay_tags(normalized_tags)
normalized_tags = normalized_tags + Tag.create_for_list(TagImplication.automatic_tags_for(normalized_tags))
normalized_tags = TagImplication.with_descendants(normalized_tags)
normalized_tags = normalized_tags.compact.uniq.sort
@@ -712,6 +714,14 @@ class Post < ApplicationRecord
set_tag_string(normalized_tags.join(" "))
end
def remove_invalid_tags(tags)
invalid_tags = Tag.invalid_cosplay_tags(tags)
if invalid_tags.present?
self.warnings[:base] << "The root tag must be a character tag: #{invalid_tags.map {|tag| "[b]#{tag}[/b]" }.join(", ")}"
end
tags - invalid_tags
end
def remove_negated_tags(tags)
@negated_tags, tags = tags.partition {|x| x =~ /\A-/i}
@negated_tags = @negated_tags.map {|x| x[1..-1]}