Skip to content

A platform for community discussion. Free, open, simple.

FIX: Preserve removed likes when deleting posts from review (#43974)

Régis Hanol8b6dbba12dde
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 14e5fb08316..90809bf8b08 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -8,7 +8,7 @@ class ReviewablesController < ApplicationController
before_action :version_required, only: %i[update perform]
before_action :ensure_can_see, except: [:destroy]
- around_action :with_deleted_content, only: %i[index show perform]
+ around_action :with_deleted_content, only: %i[index show]
def index
offset = params[:offset].to_i
@@ -257,7 +257,7 @@ class ReviewablesController < ApplicationController
result = nil
begin
- reviewable = find_reviewable
+ reviewable = with_deleted_content { find_reviewable }
if error = claim_error?(reviewable)
return render_json_error(error)
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index d1536f644a3..1d270b67b72 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -999,6 +999,47 @@ RSpec.describe ReviewablesController do
expect(job).to be_blank
end
+ it "keeps removed likes removed after deleting and recovering a flagged post" do
+ admin = Fabricate(:admin)
+ flagger = Fabricate(:user, refresh_auto_groups: true)
+ post = Fabricate(:post)
+ like = PostActionCreator.like(flagger, post).post_action
+ PostActionDestroyer.destroy(flagger, post, :like)
+ flagged_reviewable = PostActionCreator.spam(flagger, post).reviewable
+ sign_in(admin)
+
+ put "/review/#{flagged_reviewable.id}/perform/delete_and_agree.json",
+ params: {
+ version: flagged_reviewable.version,
+ }
+
+ expect(response).to have_http_status(:ok)
+ PostDestroyer.new(admin, post.reload).recover
+
+ expect(like.reload).to be_trashed
+ end
+
+ it "releases a deleted topic's claim when agreeing before a silence" do
+ SiteSetting.reviewable_claiming = "optional"
+ admin = Fabricate(:admin)
+ flagger = Fabricate(:user, refresh_auto_groups: true)
+ post = Fabricate(:post)
+ flagged_reviewable = PostActionCreator.spam(flagger, post).reviewable
+ claim = Fabricate(:reviewable_claimed_topic, topic: post.topic, user: admin)
+ PostDestroyer.new(admin, post, reviewable_id: flagged_reviewable.id).destroy
+ sign_in(admin)
+
+ put "/review/#{flagged_reviewable.id}/perform/agree_and_silence.json",
+ params: {
+ version: flagged_reviewable.reload.version,
+ }
+
+ expect(response).to have_http_status(:ok)
+ expect(flagged_reviewable.reload).to be_approved
+ expect(ReviewableClaimedTopic.exists?(claim.id)).to eq(false)
+ expect(post.reload).to be_trashed
+ end
+
context "with claims" do
fab!(:qp, :reviewable_queued_post)