From b9bc536a79549940938ac3ffa7d6239c3f48c993 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Mon, 18 Sep 2017 11:11:29 -0700 Subject: [PATCH] force s3 backup on post replacements if md5 doesn't change (ref #3290) --- app/models/post_replacement.rb | 2 ++ script/fixes/049_spam_1.rb | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/models/post_replacement.rb b/app/models/post_replacement.rb index 133c63865..3ce7b5aac 100644 --- a/app/models/post_replacement.rb +++ b/app/models/post_replacement.rb @@ -57,6 +57,8 @@ class PostReplacement < ApplicationRecord if md5_changed post.comments.create!({creator: User.system, body: comment_replacement_message, do_not_bump_post: true}, without_protection: true) ModAction.log(modaction_replacement_message) + else + post.queue_backup end post.save! diff --git a/script/fixes/049_spam_1.rb b/script/fixes/049_spam_1.rb index b74f9c743..69038881c 100644 --- a/script/fixes/049_spam_1.rb +++ b/script/fixes/049_spam_1.rb @@ -32,20 +32,6 @@ end new_new_spammers = Set.new(Dmail.where("from_id >= ? and title in (?) and from_id not in (?)", MIN_USER_ID, BAD_TITLES, (spammers + new_spammers).to_a).pluck(:from_id)) combined_spammers = spammers + new_spammers + new_new_spammers -User.without_timeout do - combined_spammers.each do |uid| - user = User.find(uid) - tag_change_count = PostArchive.where(updater_id: uid).count - vote_count = PostVote.where(user_id: uid).count - comment_count = Comment.where(creator_id: uid).count - dmail_count = Dmail.where(from_id: uid).count - - if tag_change_count + vote_count + comment_count > 0 - puts "#{user.name},#{uid},#{tag_change_count},#{vote_count},#{comment_count},#{dmail_count}" - end - end -end - combined_spammers.each do |uid| unless Ban.where(user_id: uid).exists? Ban.create(duration: 10000, reason: "Spam (automated ref f6147ace)", user_id: uid)