A platform for community discussion. Free, open, simple.
FIX: Hide post when agreeing with a re-flag after the author's edit (#43706)
Krisae866594471b
diff --git a/db/post_migrate/20260915204557_reset_review_fields_on_revived_flags.rb b/db/post_migrate/20260915204557_reset_review_fields_on_revived_flags.rbnew file mode 100644index 00000000000..34f631cfd02--- /dev/null+++ b/db/post_migrate/20260915204557_reset_review_fields_on_revived_flags.rb@@ -0,0 +1,49 @@+# frozen_string_literal: true++class ResetReviewFieldsOnRevivedFlags < ActiveRecord::Migration[8.0]+ def up+ # A flag reviewed before it was created is a trashed flag that a re-flag revived with its+ # old review intact. It never counts as active, so acting on its pending reviewable has no+ # effect. Reviewable status 0 = pending. Flag types 3, 4, 7, 8 mirror idx_unique_flags, which+ # a cleared flag must not collide with.+ execute <<~SQL+ UPDATE post_actions pa+ SET agreed_at = NULL,+ agreed_by_id = NULL,+ deferred_at = NULL,+ deferred_by_id = NULL,+ disagreed_at = NULL,+ disagreed_by_id = NULL+ WHERE pa.deleted_at IS NULL+ AND LEAST(pa.agreed_at, pa.deferred_at, pa.disagreed_at) < pa.created_at+ AND EXISTS (+ SELECT 1+ FROM reviewables r+ WHERE r.type = 'ReviewableFlaggedPost'+ AND r.target_type = 'Post'+ AND r.target_id = pa.post_id+ AND r.status = 0+ )+ AND NOT EXISTS (+ SELECT 1+ FROM post_actions other+ WHERE other.id <> pa.id+ AND other.user_id = pa.user_id+ AND other.post_id = pa.post_id+ AND other.targets_topic = pa.targets_topic+ AND other.deleted_at IS NULL+ AND (+ other.post_action_type_id = pa.post_action_type_id+ OR (+ other.post_action_type_id IN (3, 4, 7, 8)+ AND pa.post_action_type_id IN (3, 4, 7, 8)+ )+ )+ )+ SQL+ end++ def down+ raise ActiveRecord::IrreversibleMigration+ end+enddiff --git a/db/structure.sql b/db/structure.sqlindex 8349149b7ea..84bf08165f3 100644--- a/db/structure.sql+++ b/db/structure.sql@@ -25183,6 +25183,7 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groupsSET search_path TO "$user", public;INSERT INTO "schema_migrations" (version) VALUES+('20260915204557'),('20260915191328'),('20260914213908'),('20260914172801'),diff --git a/frontend/discourse/app/components/modal/flag.gjs b/frontend/discourse/app/components/modal/flag.gjsindex 98b85ca60e2..409e35dcbc8 100644--- a/frontend/discourse/app/components/modal/flag.gjs+++ b/frontend/discourse/app/components/modal/flag.gjs@@ -186,8 +186,7 @@ export default class Flag extends Component {// eslint-disable-next-line no-consoleconsole.error(`No handler for ${actionable.client_action} found`);} else {- this.args.model.setHidden();- this.createFlag({ takeAction: true });+ await this.#createFlagAndHide({ takeAction: true });}}@@ -196,23 +195,22 @@ export default class Flag extends Component {if (this.selected.require_message) {opts.message = this.message;}- this.args.model.flagTarget.create(this, opts);+ const created = this.args.model.flagTarget.create(this, opts);this.appEvents.trigger("flag:created", {message: opts.message,postId: this.args.model.flagModel.id,});+ return created;}@actioncreateFlagAsWarning() {- this.createFlag({ isWarning: true });- this.args.model.setHidden();+ return this.#createFlagAndHide({ isWarning: true });}@actionflagForReview() {- this.createFlag({ queue_for_review: true });- this.args.model.setHidden();+ return this.#createFlagAndHide({ queue_for_review: true });}@action@@ -220,6 +218,13 @@ export default class Flag extends Component {this.selected = actionType;}+ async #createFlagAndHide(opts) {+ // Only an explicit `false` means the flag failed: custom flag targets may resolve nothing.+ if ((await this.createFlag(opts)) !== false) {+ this.args.model.setHidden();+ }+ }+<template><DModalclass="flag-modal"diff --git a/frontend/discourse/app/lib/flag-targets/flag.js b/frontend/discourse/app/lib/flag-targets/flag.jsindex 5833f077edc..d788499231e 100644--- a/frontend/discourse/app/lib/flag-targets/flag.js+++ b/frontend/discourse/app/lib/flag-targets/flag.js@@ -9,6 +9,9 @@ export default class Flag {return true;}+ /**+ * @returns {Promise<boolean>} resolves `false` when the flag was not created+ */create(flagModal, opts) {// an instance of ActionSummaryconst postAction = this.postActionFor(flagModal);@@ -20,8 +23,12 @@ export default class Flag {);flagModal.args.closeModal();- postAction+ return postAction.act(flagModal.args.model.flagModel, opts)- .catch((error) => popupAjaxError(error));+ .then((result) => !!result?.acted)+ .catch((error) => {+ popupAjaxError(error);+ return false;+ });}}diff --git a/frontend/discourse/tests/acceptance/flag-post-test.js b/frontend/discourse/tests/acceptance/flag-post-test.jsindex 31fdac2a0e6..feaac19b61b 100644--- a/frontend/discourse/tests/acceptance/flag-post-test.js+++ b/frontend/discourse/tests/acceptance/flag-post-test.js@@ -1,6 +1,7 @@import { click, fillIn, triggerEvent, visit } from "@ember/test-helpers";import { test } from "qunit";import userFixtures from "discourse/tests/fixtures/user-fixtures";+import pretender, { response } from "discourse/tests/helpers/create-pretender";import { acceptance } from "discourse/tests/helpers/qunit-helpers";import selectKit from "discourse/tests/helpers/select-kit-helper";@@ -139,6 +140,35 @@ acceptance(`flagging`, function (needs) {assert.dom(".d-modal__body").doesNotExist();});+ test("Take action hides the post once the flag is created", async function (assert) {+ await visit("/t/internationalization-localization/280");+ await openFlagModal();+ await click("#radio_inappropriate");+ await selectKit(".reviewable-action-dropdown").expand();+ await click("[data-value='agree_and_hide']");++ assert+ .dom(".topic-post[data-post-number='1']")+ .hasClass("post--hidden", "hides the flagged post");+ });++ test("Take action leaves the post visible when the flag is rejected", async function (assert) {+ pretender.post("/post_actions", () =>+ response(422, { errors: ["The flag was rejected"] })+ );++ await visit("/t/internationalization-localization/280");+ await openFlagModal();+ await click("#radio_inappropriate");+ await selectKit(".reviewable-action-dropdown").expand();+ await click("[data-value='agree_and_hide']");++ assert.dom(".dialog-body").exists("shows the error");+ assert+ .dom(".topic-post[data-post-number='1']")+ .doesNotHaveClass("post--hidden", "does not hide the post");+ });+test("Message appears in penalty modal", async function (assert) {this.siteSettings.penalty_include_post_message = true;await visit("/t/internationalization-localization/280");diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rbindex f41cdcd213a..ab5dcdffed3 100644--- a/lib/post_action_creator.rb+++ b/lib/post_action_creator.rb@@ -299,8 +299,15 @@ class PostActionCreatorcreated_at: @created_at,}- # First try to revive a trashed record- post_action = PostAction.where(where_attrs).with_deleted.where.not(deleted_at: nil).first+ # Revive a trashed record only if it was never reviewed. A reviewed one would come back+ # already agreed with (or deferred/disagreed), so it would never count as a new flag.+ post_action =+ PostAction+ .where(where_attrs)+ .with_deleted+ .where.not(deleted_at: nil)+ .where(agreed_at: nil, disagreed_at: nil, deferred_at: nil)+ .firstif post_actionpost_action.recover!diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.jsindex ac99c814aca..ee1474d26b1 100644--- a/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js@@ -69,8 +69,10 @@ export default class ChatMessageFlag {take_action: opts.takeAction,queue_for_review: opts.queue_for_review,});+ return true;} catch (error) {popupAjaxError(error);+ return false;}}diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/lib/post-voting-flag.js b/plugins/discourse-post-voting/assets/javascripts/discourse/lib/post-voting-flag.jsindex 844339cd004..f245a405b8a 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/lib/post-voting-flag.js+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/lib/post-voting-flag.js@@ -54,6 +54,11 @@ export default class PostVotingFlag extends Flag {take_action: opts.takeAction,queue_for_review: opts.queue_for_review,},- }).catch((error) => popupAjaxError(error));+ })+ .then(() => true)+ .catch((error) => {+ popupAjaxError(error);+ return false;+ });}}diff --git a/plugins/voice/assets/javascripts/discourse/lib/voice-flag.js b/plugins/voice/assets/javascripts/discourse/lib/voice-flag.jsindex ea66929c309..836f0ccf65c 100644--- a/plugins/voice/assets/javascripts/discourse/lib/voice-flag.js+++ b/plugins/voice/assets/javascripts/discourse/lib/voice-flag.js@@ -56,8 +56,10 @@ export default class VoiceFlag {message: opts.message,},});+ return true;} catch (error) {popupAjaxError(error);+ return false;}}}diff --git a/spec/db/post_migrate/20260915204557_reset_review_fields_on_revived_flags_spec.rb b/spec/db/post_migrate/20260915204557_reset_review_fields_on_revived_flags_spec.rbnew file mode 100644index 00000000000..7ce0e507ded--- /dev/null+++ b/spec/db/post_migrate/20260915204557_reset_review_fields_on_revived_flags_spec.rb@@ -0,0 +1,72 @@+# frozen_string_literal: true++require Rails.root.join("db/post_migrate/20260915204557_reset_review_fields_on_revived_flags.rb")++RSpec.describe ResetReviewFieldsOnRevivedFlags do+ before do+ @original_verbose = ActiveRecord::Migration.verbose+ ActiveRecord::Migration.verbose = false+ end++ after { ActiveRecord::Migration.verbose = @original_verbose }++ fab!(:moderator)+ fab!(:flagger, :user)++ def flag(post, type: :inappropriate, user: flagger, **attrs)+ Fabricate(:post_action, post:, user:, post_action_type_id: PostActionType.types[type], **attrs)+ end++ it "clears the review of revived flags backing a pending reviewable" do+ post = Fabricate(:reviewable_flagged_post).target+ agreed = flag(post, created_at: 1.hour.ago, agreed_at: 2.days.ago, agreed_by_id: moderator.id)+ deferred =+ flag(+ post,+ type: :spam,+ user: Fabricate(:user),+ created_at: 1.hour.ago,+ deferred_at: 2.days.ago,+ deferred_by_id: moderator.id,+ )++ described_class.new.up++ expect([agreed.reload, deferred.reload]).to all(+ have_attributes(agreed_at: nil, agreed_by_id: nil, deferred_at: nil, deferred_by_id: nil),+ )+ end++ it "keeps reviews made after the flag was created, and revived flags on resolved reviewables" do+ pending_post = Fabricate(:reviewable_flagged_post).target+ reviewed_after_creation =+ flag(pending_post, created_at: 2.days.ago, agreed_at: 1.day.ago, agreed_by_id: moderator.id)++ resolved_post = Fabricate(:reviewable_flagged_post, status: :approved).target+ revived_on_resolved =+ flag(resolved_post, created_at: 1.hour.ago, agreed_at: 2.days.ago, agreed_by_id: moderator.id)++ described_class.new.up++ expect([reviewed_after_creation.reload, revived_on_resolved.reload]).to all(+ have_attributes(agreed_by_id: moderator.id),+ )+ end++ it "skips a revived flag that would collide with the user's other open flag on the post" do+ post = Fabricate(:reviewable_flagged_post).target+ revived =+ flag(post, created_at: 1.hour.ago, deferred_at: 2.days.ago, deferred_by_id: moderator.id)+ # Validations prevent this pair today, but older data can still hold it.+ Fabricate.build(+ :post_action,+ post:,+ user: flagger,+ post_action_type_id: PostActionType.types[:spam],+ ).save!(validate: false)++ expect { described_class.new.up }.not_to raise_error++ expect(revived.reload.deferred_by_id).to eq(moderator.id)+ end+enddiff --git a/spec/lib/post_action_creator_spec.rb b/spec/lib/post_action_creator_spec.rbindex b9848a099a2..80118dd314c 100644--- a/spec/lib/post_action_creator_spec.rb+++ b/spec/lib/post_action_creator_spec.rb@@ -236,6 +236,23 @@ RSpec.describe PostActionCreator doexpect(reviewable.reviewable_scores.pending.count).to eq(1)end+ it "lets a flag agreed with again hide the post after the author's edit removed the user's earlier flag" do+ reviewable = PostActionCreator.create(user, post, :inappropriate).reviewable+ reviewable.perform(admin, :agree_and_hide)++ freeze_time 10.minutes.from_now+ PostRevisor.new(post.reload).revise!(post.user, raw: "#{post.raw} with an edit by its author")++ freeze_time 10.minutes.from_now+ result = PostActionCreator.create(user, post.reload, :inappropriate)++ expect(PostAction.active.where(post:, user:)).to contain_exactly(result.post_action)++ result.reviewable.perform(admin, :agree_and_hide)++ expect(post.reload).to be_hidden+ end+describe "Auto hide spam flagged posts" dobefore douser.trust_level = TrustLevel[3]