- Delete the current image and replace it with another one, keeping - everything else in the post intact. This is meant for upgrading - lower-quality images, such as image samples, to higher-quality versions. -
- <%= f.input :replacement_url, label: "New Source", input_html: { value: "" } %> <% end %> diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 5e5d4be8e..63bbf297a 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -271,6 +271,10 @@ module Danbooru "help:appeal_notice" end + def replacement_notice_wiki_page + "help:replacement_notice" + end + # The number of posts displayed per page. def posts_per_page 20 diff --git a/test/unit/post_replacement_test.rb b/test/unit/post_replacement_test.rb new file mode 100644 index 000000000..3bba669f6 --- /dev/null +++ b/test/unit/post_replacement_test.rb @@ -0,0 +1,157 @@ +require 'test_helper' +require 'helpers/iqdb_test_helper' + +class PostReplacementTest < ActiveSupport::TestCase + include IqdbTestHelper + + def setup + mock_iqdb_service! + Delayed::Worker.delay_jobs = true # don't delete the old images right away + + @system = FactoryGirl.create(:user, created_at: 2.weeks.ago) + Danbooru.config.stubs(:system_user).returns(@system) + + @uploader = FactoryGirl.create(:user, created_at: 2.weeks.ago, can_upload_free: true) + @replacer = FactoryGirl.create(:user, created_at: 2.weeks.ago, can_approve_posts: true) + CurrentUser.user = @replacer + CurrentUser.ip_addr = "127.0.0.1" + end + + def teardown + CurrentUser.user = nil + CurrentUser.ip_addr = nil + Delayed::Worker.delay_jobs = false + end + + context "Replacing" do + setup do + CurrentUser.scoped(@uploader, "127.0.0.2") do + upload = FactoryGirl.create(:jpg_upload, as_pending: "0") + upload.process! + @post = upload.post + end + end + + context "a post from a generic source" do + setup do + @post.update(source: "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png") + @post.replace!(replacement_url: "https://www.google.com/intl/en_ALL/images/logo.gif") + @upload = Upload.last + @mod_action = ModAction.last + end + + context "that is then undone" do + setup do + Timecop.travel(Time.now + PostReplacement::DELETION_GRACE_PERIOD + 1.day) do + Delayed::Worker.new.work_off + end + + @replacement = @post.replacements.first + @replacement.undo! + @post.reload + end + + should "update the attributes" do + assert_equal(272, @post.image_width) + assert_equal(92, @post.image_height) + assert_equal(5969, @post.file_size) + assert_equal("png", @post.file_ext) + assert_equal("8f9327db2597fa57d2f42b4a6c5a9855", @post.md5) + assert_equal("8f9327db2597fa57d2f42b4a6c5a9855", Digest::MD5.file(@post.file_path).hexdigest) + assert_equal("https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png", @post.source) + end + end + + should "create a post replacement record" do + assert_equal(@post.id, PostReplacement.last.post_id) + end + + should "correctly update the attributes" do + assert_equal(@post.id, @upload.post.id) + assert_equal("completed", @upload.status) + + assert_equal(276, @post.image_width) + assert_equal(110, @post.image_height) + assert_equal(8558, @post.file_size) + assert_equal("gif", @post.file_ext) + assert_equal("e80d1c59a673f560785784fb1ac10959", @post.md5) + assert_equal("e80d1c59a673f560785784fb1ac10959", Digest::MD5.file(@post.file_path).hexdigest) + assert_equal("https://www.google.com/intl/en_ALL/images/logo.gif", @post.source) + end + + should "not change the post status or uploader" do + assert_equal("127.0.0.2", @post.uploader_ip_addr.to_s) + assert_equal(@uploader.id, @post.uploader_id) + assert_equal(false, @post.is_pending) + end + + should "log a mod action" do + assert_match(/replaced post ##{@post.id}/, @mod_action.description) + end + + should "leave a system comment" do + comment = @post.comments.last + + assert_not_nil(comment) + assert_equal(User.system.id, comment.creator_id) + assert_match(/replaced this post/, comment.body) + end + + should "not send an @mention to the replacer" do + assert_equal(0, @replacer.dmails.size) + end + end + + context "a post with notes" do + setup do + @post.update({image_width: 160, image_height: 164}, without_protection: true) + CurrentUser.scoped(@uploader, "127.0.0.1") do + @note = @post.notes.create(x: 80, y: 82, width: 80, height: 82, body: "test") + end + end + + should "rescale the notes" do + assert_equal([80, 82, 80, 82], [@note.x, @note.y, @note.width, @note.height]) + + assert_difference("@replacer.note_versions.count") do + # replacement image is 80x82, so we're downscaling by 50% (160x164 -> 80x82). + @post.replace!(replacement_url: "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247350") + @note.reload + end + + assert_equal([40, 41, 40, 41], [@note.x, @note.y, @note.width, @note.height]) + end + end + + context "a post with a pixiv html source" do + should "replace with the full size image" do + @post.replace!(replacement_url: "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247350") + + assert_equal(80, @post.image_width) + assert_equal(82, @post.image_height) + assert_equal(16275, @post.file_size) + assert_equal("png", @post.file_ext) + assert_equal("4ceadc314938bc27f3574053a3e1459a", @post.md5) + assert_equal("4ceadc314938bc27f3574053a3e1459a", Digest::MD5.file(@post.file_path).hexdigest) + assert_equal("https://i.pximg.net/img-original/img/2017/04/04/08/54/15/62247350_p0.png", @post.source) + end + + should "delete the old files after three days" do + old_file_path, old_preview_file_path, old_large_file_path = @post.file_path, @post.preview_file_path, @post.large_file_path + @post.replace!(replacement_url: "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247350") + + assert(File.exists?(old_file_path)) + assert(File.exists?(old_preview_file_path)) + assert(File.exists?(old_large_file_path)) + + Timecop.travel(Time.now + PostReplacement::DELETION_GRACE_PERIOD + 1.day) do + Delayed::Worker.new.work_off + end + + assert_not(File.exists?(old_file_path)) + assert_not(File.exists?(old_preview_file_path)) + assert_not(File.exists?(old_large_file_path)) + end + end + end +end diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb index 1cc8d4f0a..b0d3046bc 100644 --- a/test/unit/post_test.rb +++ b/test/unit/post_test.rb @@ -1588,129 +1588,6 @@ class PostTest < ActiveSupport::TestCase end end - context "Replacing: " do - setup do - mock_iqdb_service! - Delayed::Worker.delay_jobs = true # don't delete the old images right away - Danbooru.config.stubs(:use_s3_proxy?).returns(false) # don't fail on post ids < 10000 - - @system = FactoryGirl.create(:user, created_at: 2.weeks.ago) - Danbooru.config.stubs(:system_user).returns(@system) - - @uploader = FactoryGirl.create(:user, created_at: 2.weeks.ago, can_upload_free: true) - @replacer = FactoryGirl.create(:user, created_at: 2.weeks.ago, can_approve_posts: true) - CurrentUser.user = @replacer - CurrentUser.ip_addr = "127.0.0.1" - - CurrentUser.scoped(@uploader, "127.0.0.2") do - upload = FactoryGirl.create(:jpg_upload, as_pending: "0") - upload.process! - @post = upload.post - end - end - - teardown do - Delayed::Worker.delay_jobs = false - end - - context "replacing a post from a generic source" do - setup do - @post.update(source: "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png") - @post.replace!("https://www.google.com/intl/en_ALL/images/logo.gif") - @upload = Upload.last - @mod_action = ModAction.last - end - - context "that is then undone" do - setup do - Timecop.travel(Time.now + PostReplacement::DELETION_GRACE_PERIOD + 1.day) do - Delayed::Worker.new.work_off - end - - @replacement = @post.replacements.first - @replacement.undo! - @post.reload - end - - should "update the attributes" do - assert_equal(272, @post.image_width) - assert_equal(92, @post.image_height) - assert_equal(5969, @post.file_size) - assert_equal("png", @post.file_ext) - assert_equal("8f9327db2597fa57d2f42b4a6c5a9855", @post.md5) - assert_equal("8f9327db2597fa57d2f42b4a6c5a9855", Digest::MD5.file(@post.file_path).hexdigest) - assert_equal("https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png", @post.source) - end - end - - should "create a post replacement record" do - assert_equal(@post.id, PostReplacement.last.post_id) - end - - should "correctly update the attributes" do - assert_equal(@post.id, @upload.post.id) - assert_equal("completed", @upload.status) - - assert_equal(276, @post.image_width) - assert_equal(110, @post.image_height) - assert_equal(8558, @post.file_size) - assert_equal("gif", @post.file_ext) - assert_equal("e80d1c59a673f560785784fb1ac10959", @post.md5) - assert_equal("e80d1c59a673f560785784fb1ac10959", Digest::MD5.file(@post.file_path).hexdigest) - assert_equal("https://www.google.com/intl/en_ALL/images/logo.gif", @post.source) - end - - should "not change the post status or uploader" do - assert_equal("127.0.0.2", @post.uploader_ip_addr.to_s) - assert_equal(@uploader.id, @post.uploader_id) - assert_equal(false, @post.is_pending) - end - - should "log a mod action" do - assert_match(/replaced post ##{@post.id}/, @mod_action.description) - end - - should "leave a system comment" do - comment = @post.comments.last - - assert_not_nil(comment) - assert_equal(User.system.id, comment.creator_id) - assert_match(/@#{@replacer.name} replaced this post/, comment.body) - end - end - - context "replacing a post with a pixiv html source" do - should "replace with the full size image" do - @post.replace!("https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247350") - - assert_equal(80, @post.image_width) - assert_equal(82, @post.image_height) - assert_equal(16275, @post.file_size) - assert_equal("png", @post.file_ext) - assert_equal("4ceadc314938bc27f3574053a3e1459a", @post.md5) - assert_equal("4ceadc314938bc27f3574053a3e1459a", Digest::MD5.file(@post.file_path).hexdigest) - assert_equal("https://i.pximg.net/img-original/img/2017/04/04/08/54/15/62247350_p0.png", @post.source) - end - - should "delete the old files after three days" do - old_file_path, old_preview_file_path, old_large_file_path = @post.file_path, @post.preview_file_path, @post.large_file_path - @post.replace!("https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247350") - - assert(File.exists?(old_file_path)) - assert(File.exists?(old_preview_file_path)) - assert(File.exists?(old_large_file_path)) - - Timecop.travel(Time.now + PostReplacement::DELETION_GRACE_PERIOD + 1.day) do - Delayed::Worker.new.work_off - end - - assert_not(File.exists?(old_file_path)) - assert_not(File.exists?(old_preview_file_path)) - assert_not(File.exists?(old_large_file_path)) - end - end - end - context "Searching:" do setup do mock_pool_archive_service!