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

Fix #5200: non-web_source, bad_source, etc. not removed when using source: metatag

Browse Source
This commit is contained in:
evazion
2022-09-11 02:50:41 -05:00
parent 2eead46ad4
commit 10cb97dbd5
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/post.rb
View File

@@ -28,8 +28,8 @@ class Post < ApplicationRecord
normalize :source, :normalize_source
before_validation :merge_old_changes
before_validation :normalize_tags
before_validation :apply_pre_metatags
before_validation :normalize_tags
before_validation :blank_out_nonexistent_parents
before_validation :remove_parent_loops
validates :md5, uniqueness: { message: ->(post, _data) { "Duplicate of post ##{Post.find_by_md5(post.md5).id}" }}, on: :create
@@ -385,10 +385,11 @@ class Post < ApplicationRecord
if old_rating == rating
self.rating = rating_before_last_save || rating_was
end
@post_edit = PostEdit.new(self, tag_string_was, old_tag_string || tag_string_was, tag_string)
end
def normalize_tags
@post_edit = PostEdit.new(self, tag_string_was, old_tag_string || tag_string_was, tag_string)
self.tag_string = Tag.create_for_list(post_edit.tag_names).uniq.sort.join(" ")
end

35
test/unit/post_test.rb
View File

@@ -977,19 +977,19 @@ class PostTest < ActiveSupport::TestCase
should 'set the source with source:"foo bar baz"' do
@post.update(tag_string: 'aaa source:"foo bar baz" bbb')
assert_equal("foo bar baz", @post.source)
assert_equal("aaa bbb", @post.tag_string)
assert_equal("aaa bbb non-web_source", @post.tag_string)
end
should "set the source with source:'foo bar baz'" do
@post.update(tag_string: "aaa source:'foo bar baz' bbb")
assert_equal("foo bar baz", @post.source)
assert_equal("aaa bbb", @post.tag_string)
assert_equal("aaa bbb non-web_source", @post.tag_string)
end
should "set the source with source:foo\\ bar\\ baz" do
@post.update(tag_string: "aaa source:foo\\ bar\\ baz bbb")
assert_equal("foo bar baz", @post.source)
assert_equal("aaa bbb", @post.tag_string)
assert_equal("aaa bbb non-web_source", @post.tag_string)
end
should 'strip the source with source:" foo bar baz "' do
@@ -1003,6 +1003,11 @@ class PostTest < ActiveSupport::TestCase
assert_equal("", @post.source)
end
should "give priority to the source: metatag over the source field" do
@post.update(tag_string: "source:me", source: "I made it up")
assert_equal("me", @post.source)
end
should "set the pixiv id with source:https://img18.pixiv.net/img/evazion/14901720.png" do
@post.update(:tag_string => "source:https://img18.pixiv.net/img/evazion/14901720.png")
assert_equal("https://img18.pixiv.net/img/evazion/14901720.png", @post.source)
@@ -1174,6 +1179,14 @@ class PostTest < ActiveSupport::TestCase
@post.update!(source: "this was once revealed to me in a dream")
assert_equal("non-web_source tag1 tag2", @post.tag_string)
end
should "remove the non-web_source tag when using the source: metatag" do
@post.update!(tag_string: "aaa source:me")
assert_equal("aaa non-web_source", @post.tag_string)
@post.update!(tag_string: "aaa source:https://www.example.com")
assert_equal("aaa", @post.tag_string)
end
end
context "a post with a bad_link source" do
@@ -1200,6 +1213,14 @@ class PostTest < ActiveSupport::TestCase
@post.update!(tag_string: "bad_link tag1 tag2", source: "https://www.example.com/image.jpg")
assert_equal("bad_link tag1 tag2", @post.tag_string)
end
should "remove the bad_link tag when using the source: metatag" do
@post.update!(tag_string: "aaa source:https://pbs.twimg.com/media/FQjQA1mVgAMcHLv.jpg:orig")
assert_equal("aaa bad_link", @post.tag_string)
@post.update!(tag_string: "aaa source:https://i.pximg.net/img-original/img/2022/04/25/08/03/14/97867015_p0.png")
assert_equal("aaa", @post.tag_string)
end
end
context "a post with a bad source" do
@@ -1226,6 +1247,14 @@ class PostTest < ActiveSupport::TestCase
@post.update!(tag_string: "bad_source tag1 tag2", source: "https://www.example.com/image.html")
assert_equal("bad_source tag1 tag2", @post.tag_string)
end
should "remove the bad_source tag when using the source: metatag" do
@post.update!(tag_string: "aaa source:https://twitter.com/danboorubot/")
assert_equal("aaa bad_source", @post.tag_string)
@post.update!(tag_string: "aaa source:https://twitter.com/kafun/status/1520766650907521024")
assert_equal("aaa", @post.tag_string)
end
end
context "a post with a blank source" do