edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

[Replacements] Do not post comment on replacement

Browse Source
This commit is contained in:
Kira 2021-04-16 18:05:22 -07:00
parent e003eb67d7
commit 96c7a76bb8
2 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/logical/upload_service/replacer.rb
View File

@ -9,38 +9,6 @@ class UploadService
@replacement = replacement
end
def comment_replacement_message(post, replacement)
%("#{replacement.creator.name}":[/users/#{replacement.creator.id}] replaced this post with a new image:\n\n#{replacement_message(post, replacement)})
end
def replacement_message(post, replacement)
linked_source = replacement.source
linked_source_was = post.source_was
<<-EOS.strip_heredoc
[table]
[tbody]
[tr]
[th]Old[/th]
[td] #{linked_source_was} [/td]
[td]#{post.md5_was}[/td]
[td]#{post.file_ext_was}[/td]
[td]#{post.image_width_was} x #{post.image_height_was}[/td]
[td]#{post.file_size_was.to_s(:human_size, precision: 4)}[/td]
[/tr]
[tr]
[th]New[/th]
[td] #{linked_source} [/td]
[td]#{post.md5}[/td]
[td]#{post.file_ext}[/td]
[td]#{post.image_width} x #{post.image_height}[/td]
[td]#{post.file_size.to_s(:human_size, precision: 4)}[/td]
[/tr]
[/tbody]
[/table]
EOS
end
def find_replacement_url(repl, upload)
if repl.replacement_file.present?
return "file://#{repl.file_name}"
@ -113,7 +81,7 @@ class UploadService
post.image_width = upload.image_width
post.image_height = upload.image_height
post.file_size = upload.file_size
post.source += "\n#{replacement.source}"
post.source = "#{replacement.source}\n" + post.source
post.tag_string = upload.tag_string
# Reset ownership information on post.
post.uploader_id = replacement.creator_id
@ -122,12 +90,6 @@ class UploadService
rescale_notes(post)
update_ugoira_frame_data(post, upload)
if md5_changed
CurrentUser.as(User.system) do
post.comments.create!(body: comment_replacement_message(post, replacement), do_not_bump_post: true)
end
end
replacement.update({status: 'approved', approver_id: CurrentUser.id})
post.save!

6
test/unit/post_replacement_test.rb
View File

@ -134,12 +134,6 @@ class PostReplacementTest < ActiveSupport::TestCase
end
end
should "create comment on post signaling replacement" do
assert_difference("@post.comments.count", 1) do
@replacement.approve!
end
end
should "update post with new image" do
old_md5 = @post.md5
@replacement.approve!