Skip to content

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

DEV: Require saved revision evidence for review queue edits (#44477)

Alan Guo Xiang Tane1f6bd5617c9
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index a3470292b42..7ef83c150e4 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -3,8 +3,14 @@
class ReviewableFlaggedPost < Reviewable
include ReviewableActionBuilder
- def self.additional_args(params)
- ReviewableActionBuilder.penalty_args(params)
+ class << self
+ def additional_args(params)
+ args = ReviewableActionBuilder.penalty_args(params)
+
+ args[:post_version] = params[:post_version] if params[:action_id] == "agree_and_edit"
+
+ args
+ end
end
scope :pending_and_default_visible, -> { pending.default_visible }
@@ -13,7 +19,6 @@ class ReviewableFlaggedPost < Reviewable
{
agree_and_keep_hidden: :agree_and_keep,
agree_and_keep_deleted: :agree_and_keep,
- agree_and_edit: :agree_and_keep,
disagree_and_restore: :disagree,
disagree_and_keep_deleted: :disagree,
ignore_and_do_nothing: :ignore,
@@ -265,6 +270,21 @@ class ReviewableFlaggedPost < Reviewable
perform_agree_and_keep(performed_by, args)
end
+ def perform_agree_and_edit(performed_by, args)
+ post_version = performed_by.staff? ? post.version : post.public_version
+ revision = post.revisions.find_by(number: post.version)
+ latest_flag_at = reviewable_scores.pending.maximum(:created_at) || created_at
+
+ unless args[:post_version].to_s == post_version.to_s && revision &&
+ revision.updated_at >= latest_flag_at && revision.modifications.present?
+ raise Discourse::InvalidParameters.new(:post_version)
+ end
+
+ result = perform_agree_and_keep(performed_by, args)
+ result.post_revision = revision
+ result
+ end
+
def perform_agree_and_keep(performed_by, args)
agree(performed_by, args)
end
diff --git a/frontend/discourse/app/components/reviewable/item.gjs b/frontend/discourse/app/components/reviewable/item.gjs
index 745ecc15fcc..623f9ca1795 100644
--- a/frontend/discourse/app/components/reviewable/item.gjs
+++ b/frontend/discourse/app/components/reviewable/item.gjs
@@ -353,7 +353,10 @@ export default class ReviewableItem extends Component {
draftKey: topic.draft_key,
draftSequence: topic.draft_sequence,
skipJumpOnSave: true,
- onSaved: () => performAction().catch(popupAjaxError),
+ onSaved: (result) =>
+ performAction({ post_version: result.payload.version }).catch(
+ popupAjaxError
+ ),
});
}
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.js
index e1d310cddf4..d34c79792f0 100644
--- a/frontend/discourse/app/services/composer.js
+++ b/frontend/discourse/app/services/composer.js
@@ -1435,7 +1435,7 @@ export default class ComposerService extends Service {
});
}
- onSaved?.();
+ onSaved?.(result);
})
.catch((error) => {
composer.set("disableDrafts", false);
diff --git a/lib/reviewable/perform_result.rb b/lib/reviewable/perform_result.rb
index 28f052cdbd9..39143ad626b 100644
--- a/lib/reviewable/perform_result.rb
+++ b/lib/reviewable/perform_result.rb
@@ -13,6 +13,7 @@ class Reviewable < ActiveRecord::Base
:recalculate_score,
:update_flag_stats,
:after_commit,
+ :post_revision,
)
def initialize(reviewable, status)
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index 8016f067bfd..28f01eb615c 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -538,6 +538,43 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
end
end
+ describe "#perform" do
+ context "when performing agree_and_edit on a flagged post reviewable" do
+ fab!(:flagged, :reviewable_flagged_post)
+
+ it "approves the flagged post reviewable through agree_and_edit using the author's saved revision" do
+ PostRevisor.new(flagged.post).revise!(
+ flagged.post.user,
+ { raw: "The author corrected this flagged post." },
+ force_new_version: true,
+ )
+ revision = flagged.post.revisions.last
+
+ result = flagged.perform(moderator, :agree_and_edit, post_version: revision.number)
+
+ expect(result).to be_success
+ expect(result.post_revision).to eq(revision)
+ expect(flagged.reload).to be_approved
+ end
+
+ it "rejects agree_and_edit on a flagged post reviewable when the revision predates its latest flag" do
+ PostRevisor.new(flagged.post).revise!(
+ moderator,
+ raw: "The moderator corrected this post before the latest flag.",
+ )
+ revision = flagged.post.revisions.last
+ freeze_time 1.minute.from_now
+ flagged.add_score(Fabricate(:user), PostActionType.types[:spam])
+
+ expect do
+ flagged.perform(moderator, :agree_and_edit, post_version: revision.number)
+ end.to raise_error(Discourse::InvalidParameters)
+
+ expect(flagged.reload).to be_pending
+ end
+ end
+ end
+
describe "#perform_delete_and_agree" do
it "notifies the user about the flagged post deletion" do
reviewable = Fabricate(:reviewable_flagged_post)
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index f36138b3436..29542e9f082 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -885,6 +885,37 @@ RSpec.describe ReviewablesController do
fab!(:reviewable)
before { sign_in(Fabricate(:moderator)) }
+ context "when performing agree_and_edit on a flagged post reviewable" do
+ it "rejects agree_and_edit on a flagged post reviewable without saved revision evidence" do
+ flagged = Fabricate(:reviewable_flagged_post)
+
+ put "/review/#{flagged.id}/perform/agree_and_edit.json",
+ params: {
+ version: flagged.version,
+ }
+
+ expect(response).to have_http_status(:bad_request)
+ expect(flagged.reload).to be_pending
+ end
+
+ it "approves a flagged post reviewable through agree_and_edit with the saved post version" do
+ sign_in(admin)
+ flagged_post = Fabricate(:post, version: 2, public_version: 2)
+ flagged = Fabricate(:reviewable_flagged_post, target: flagged_post)
+ Fabricate(:post_revision, post: flagged_post, number: flagged_post.version)
+
+ put "/review/#{flagged.id}/perform/agree_and_edit.json",
+ params: {
+ version: flagged.version,
+ post_version: flagged_post.version,
+ }
+
+ expect(response).to have_http_status(:ok)
+ expect(response.parsed_body.dig("reviewable_perform_result", "success")).to eq(true)
+ expect(flagged.reload).to be_approved
+ end
+ end
+
it "suspends a flagged post's author and deletes the post when the moderator selects both actions" do
flagged_post = Fabricate(:post)
flagged =
diff --git a/spec/system/reviewables_spec.rb b/spec/system/reviewables_spec.rb
index 5b31053ddf5..3e01f8d6cc7 100644
--- a/spec/system/reviewables_spec.rb
+++ b/spec/system/reviewables_spec.rb
@@ -10,20 +10,21 @@ describe "Reviewables" do
let(:suspend_user_modal) { PageObjects::Modals::PenalizeUser.new("suspend") }
let(:dialog) { PageObjects::Components::Dialog.new }
+ let(:topic_page) { PageObjects::Pages::Topic.new }
+
before { sign_in(admin) }
describe "when there is a flagged post reviewable with a short post" do
- fab!(:short_reviewable) { Fabricate(:reviewable_flagged_post, target: post) }
+ fab!(:short_reviewable) { Fabricate(:reviewable_flagged_post, target: post, topic: post.topic) }
describe "reviewable actions" do
let(:discard_draft_modal) { PageObjects::Modals::DiscardDraft.new }
def open_agree_and_edit
- PageObjects::Components::SelectKit.new(".dropdown-select-box.post-agree-and-hide").expand
- find("[data-value='post-agree_and_edit']").click
+ review_page.select_bundled_action(short_reviewable, "post-agree_and_edit", bundle_index: 1)
end
- it "agree_and_edit does not touch the flag until the edit is saved" do
+ it "keeps a flagged post reviewable pending when staff discard changes from Agree and edit" do
visit("/review")
open_agree_and_edit
@@ -31,6 +32,7 @@ describe "Reviewables" do
expect(composer).to have_value(post.raw)
expect(review_page).to have_reviewable_with_pending_status(short_reviewable)
+ composer.fill_title("A title change that should be discarded")
composer.fill_content("The moderator changed their mind about this.")
composer.discard
@@ -40,25 +42,33 @@ describe "Reviewables" do
expect(composer).to be_closed
expect(review_page).to have_reviewable_with_pending_status(short_reviewable)
- expect(short_reviewable.reload).to be_pending
- expect(post.reload.revisions.count).to eq(0)
+ topic_page.visit_topic(post.topic)
+ expect(topic_page).to have_topic_title(post.topic.title)
+ expect(topic_page).to have_post_content(post_number: post.post_number, content: post.raw)
end
- it "agree_and_edit agrees with the flag once the edit is saved" do
+ it "resolves a flagged post reviewable when staff save title and body changes with Agree and edit" do
+ SiteSetting.reviewable_claiming = "required"
visit("/review")
+ review_page.click_claim_reviewable
open_agree_and_edit
expect(composer).to have_value(post.raw)
+ composer.fill_title("A topic title corrected by a moderator")
composer.fill_content("This post has been edited by a moderator.")
composer.submit
expect(composer).to be_closed
expect(toasts).to have_success(I18n.t("reviewables.actions.agree_and_edit.complete"))
expect(review_page).to have_reviewable_with_approved_status(short_reviewable)
- expect(short_reviewable.reload).to be_approved
- expect(post.reload.raw).to eq("This post has been edited by a moderator.")
+ topic_page.visit_topic(post.topic)
+ expect(topic_page).to have_topic_title("A topic title corrected by a moderator")
+ expect(topic_page).to have_post_content(
+ post_number: post.post_number,
+ content: "This post has been edited by a moderator.",
+ )
end
it "opens a modal when suspending a user" do