A platform for community discussion. Free, open, simple.
FIX: Ignore pending reviewables when their target user is deleted (#42335)
Krzysztof Kotlarekb0d1bbe39f40
diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rbindex 90b61b2f0a3..664068b0bd1 100644--- a/app/models/reviewable_queued_post.rb+++ b/app/models/reviewable_queued_post.rb@@ -53,7 +53,9 @@ class ReviewableQueuedPost < Reviewable)build_action(actions, :reject_post, bundle: reject_bundle, icon: "xmark")- build_action(actions, :revise_and_reject_post, bundle: reject_bundle, icon: "envelope")+ if target_created_by.present?+ build_action(actions, :revise_and_reject_post, bundle: reject_bundle, icon: "envelope")+ endbuild_penalty_actions(actions,diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rbindex d3efb194c4d..4dc074b701d 100644--- a/app/services/user_destroyer.rb+++ b/app/services/user_destroyer.rb@@ -46,6 +46,8 @@ class UserDestroyerdelete_posts(user, category_topic_ids, opts)end+ resolve_reviewables_targeting(user)+user.post_actions.find_each { |post_action| post_action.remove_act!(Discourse.system_user) }# Add info about the user to staff action logs@@ -168,6 +170,19 @@ class UserDestroyerendend+ def resolve_reviewables_targeting(user)+ Reviewable+ .pending+ .where(target_created_by: user)+ .find_each do |reviewable|+ reviewable.reviewable_notes.create!(+ user: Discourse.system_user,+ content: I18n.t("reviewables.target_user_deleted"),+ )+ reviewable.transition_to(:ignored, Discourse.system_user)+ end+ end+def delete_posts(user, category_topic_ids, opts)user.posts.find_each do |post|if post.is_first_post? && category_topic_ids.include?(post.topic_id)diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex f037f5b7c92..936781825d0 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -6107,6 +6107,7 @@ en:post_restored_by_author: "Post was restored by the author"post_deleted_by_author_after_penalty: >-Post was deleted by the author after the user was penalized for it. Review the penalty without restoring the post.+ target_user_deleted: "Automatically ignored because the user account was deleted."priorities:low: "Low"medium: "Medium"diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rbindex 0d2c5debe1b..fa674f33109 100644--- a/spec/models/reviewable_queued_post_spec.rb+++ b/spec/models/reviewable_queued_post_spec.rb@@ -455,6 +455,20 @@ RSpec.describe ReviewableQueuedPost, type: :model doendend+ describe "actions when the author no longer exists" do+ fab!(:reviewable, :reviewable_queued_post)++ it "only offers rejecting the post" do+ reviewable.update_column(:target_created_by_id, nil)++ actions = reviewable.actions_for(Guardian.new(moderator))+ bundle = actions.bundles.find { |bundle| bundle.id == "#{reviewable.id}-reject-post" }++ expect(actions.has?(:approve_post)).to eq(false)+ expect(bundle.actions.map(&:server_action)).to eq(%w[reject_post])+ end+ end+describe "penalty actions" dofab!(:reviewable, :reviewable_queued_post)diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rbindex 29e5efd73e1..b0e23620040 100644--- a/spec/services/user_destroyer_spec.rb+++ b/spec/services/user_destroyer_spec.rb@@ -149,6 +149,36 @@ RSpec.describe UserDestroyer doendend+ context "with a pending reviewable targeting the user" do+ fab!(:queued_post) { Fabricate(:reviewable_queued_post, target_created_by: user) }+ fab!(:flagged_post) do+ Fabricate(+ :reviewable_flagged_post,+ target_created_by: user,+ target: Fabricate(:post, user: user),+ )+ end++ it "ignores them and notes why" do+ UserDestroyer.new(admin).destroy(user, delete_posts: true)++ expect(queued_post.reload).to be_ignored+ expect(flagged_post.reload).to be_ignored+ expect(queued_post.reviewable_notes.last.content).to eq(+ I18n.t("reviewables.target_user_deleted"),+ )+ end++ it "leaves reviewables that were already handled alone" do+ queued_post.update!(status: :approved)++ UserDestroyer.new(admin).destroy(user, delete_posts: true)++ expect(queued_post.reload).to be_approved+ expect(queued_post.reviewable_notes).to be_empty+ end+ end+context "with a reviewable user" dolet(:reviewable) { Fabricate(:reviewable, created_by: admin) }