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

tags: don't allow aliases inside *_(cosplay) tags.

Browse Source 
Don't treat *_(cosplay) tags as being invisibly aliased when a character tag is aliased. For example,
if toosaka_rin is aliased to tohsaka_rin, and toosaka_rin_(cosplay) is later added to a post, don't
magically translate the tag to tohsaka_rin_(cosplay). Instead, treat it as an error to create a
*_(cosplay) tag for an aliased character tag.

This removes some of the complexity and magic behavior surrounding *_(cosplay) tags.
This commit is contained in:
evazion
2022-04-30 18:00:19 -05:00
parent f8aa985a16
commit 0920d2ca24
6 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/unit/bulk_update_request_test.rb
View File

@@ -392,7 +392,6 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase
should "move the *_(cosplay) tag as well" do
@post = create(:post, tag_string: "toosaka_rin_(cosplay)")
@wiki = create(:wiki_page, title: "toosaka_rin_(cosplay)")
@ta = create(:tag_alias, antecedent_name: "toosaka_rin", consequent_name: "tohsaka_rin")
create_bur!("rename toosaka_rin -> tohsaka_rin", @admin)
@@ -401,6 +400,18 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase
end
end
context "when aliasing a character tag with a *_(cosplay) tag" do
should "move the *_(cosplay) tag as well" do
@post = create(:post, tag_string: "toosaka_rin_(cosplay)")
@wiki = create(:wiki_page, title: "toosaka_rin_(cosplay)")
create_bur!("alias toosaka_rin -> tohsaka_rin", @admin)
assert_equal("cosplay tohsaka_rin tohsaka_rin_(cosplay)", @post.reload.tag_string)
assert_equal("tohsaka_rin_(cosplay)", @wiki.reload.title)
end
end
context "when renaming an artist tag with a *_(style) tag" do
should "move the *_(style) tag as well" do
create(:tag, name: "tanaka_takayuki", category: Tag.categories.artist)

7
test/unit/post_test.rb
View File

@@ -577,7 +577,11 @@ class PostTest < ActiveSupport::TestCase
@post.add_tag("jim_(cosplay)")
@post.save
assert(@post.has_tag?("james"), "expected 'jim' to be aliased to 'james'")
assert_equal(false, @post.has_tag?("jim_(cosplay)"))
assert_equal(false, @post.has_tag?("james_(cosplay)"))
assert_equal(false, @post.has_tag?("jim"))
assert_equal(false, @post.has_tag?("james"))
assert_match(/'jim_\(cosplay\)' is not allowed because 'jim' is aliased to 'james'/, @post.warnings.full_messages.join)
end
should "apply implications after the character tag is added" do
@@ -1213,6 +1217,7 @@ class PostTest < ActiveSupport::TestCase
refute(@post.has_tag?("little_red_riding_hood"))
refute(@post.has_tag?("cosplay"))
assert(@post.warnings[:base].grep(/Couldn't add tag/).present?)
assert_match(/'little_red_riding_hood_\(cosplay\)' is not allowed because 'little_red_riding_hood' is not a character tag/, @post.warnings.full_messages.join)
end
should "allow creating a _(cosplay) tag for an empty general tag" do

2
test/unit/tag_test.rb
View File

@@ -195,11 +195,13 @@ class TagTest < ActiveSupport::TestCase
setup do
create(:tag, name: "bkub", category: Tag.categories.artist)
create(:tag, name: "fumimi", category: Tag.categories.character)
create(:tag_alias, antecedent_name: "orin", consequent_name: "kaenbyou_rin")
end
should allow_value("fumimi_(cosplay)").for(:name)
should allow_value("new_tag_(cosplay)").for(:name)
should_not allow_value("bkub_(cosplay)").for(:name)
should_not allow_value("orin_(cosplay)").for(:name)
end
end
end