Skip to content

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

FIX: Disagreeing with a flag fails to restore posts by demoted users (#40228)

Régis Hanol741afab95f49
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index c828082c8e6..a3d8903b2e6 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -242,6 +242,7 @@ class ReviewableFlaggedPost < Reviewable
# Undo hide/silence if applicable
if post&.hidden?
notify_poster(performed_by)
+ post.acting_user = performed_by
post.unhide!
UserSilencer.unsilence(post.user) if UserSilencer.was_silenced_for?(post)
end
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index 18c4fdd2897..1f7652e7dfd 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -496,6 +496,27 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
end
end
+ describe "#perform_disagree" do
+ it "restores a hidden post even when the author would no longer pass post validations" do
+ SiteSetting.newuser_max_embedded_media = 1
+
+ author = Fabricate(:user, trust_level: TrustLevel[1], refresh_auto_groups: true)
+ flagged_post =
+ create_post(
+ user: author,
+ raw: "![one](http://example.com/one.png)\n![two](http://example.com/two.png)",
+ )
+ reviewable = PostActionCreator.spam(user, flagged_post).reviewable
+ flagged_post.hide!(PostActionType.types[:spam])
+
+ author.update!(trust_level: TrustLevel[0])
+
+ expect { reviewable.perform(moderator, :disagree) }.not_to raise_error
+ expect(flagged_post.reload.hidden).to eq(false)
+ expect(flagged_post.topic.reload.visible).to eq(true)
+ end
+ end
+
describe "#perform_disagree_and_restore" do
it "notifies the user about the flagged post being restored" do
reviewable = Fabricate(:reviewable_flagged_post)