A platform for community discussion. Free, open, simple.
FIX: Treat a flag re-opening a handled reviewable as a transition to pending
Régis Hanol06ca4ae7f94d
diff --git a/app/jobs/regular/create_user_reviewable.rb b/app/jobs/regular/create_user_reviewable.rbindex 1a85e4f0f63..5b461241065 100644--- a/app/jobs/regular/create_user_reviewable.rb+++ b/app/jobs/regular/create_user_reviewable.rb@@ -29,7 +29,7 @@ class Jobs::CreateUserReviewable < ::Jobs::Base@reviewable.update!(payload: payload) unless @reviewable.created_newend- if @reviewable.created_new+ if @reviewable.created_new || @reviewable.reopened@reviewable.add_score(Discourse.system_user,ReviewableScore.types[:needs_approval],diff --git a/app/jobs/scheduled/auto_queue_handler.rb b/app/jobs/scheduled/auto_queue_handler.rbindex 01f8cb79c25..2d821a5cb9b 100644--- a/app/jobs/scheduled/auto_queue_handler.rb+++ b/app/jobs/scheduled/auto_queue_handler.rb@@ -7,11 +7,21 @@ module Jobsevery 1.daydef execute(args)- return if SiteSetting.auto_handle_queued_age.to_i.zero?+ age = SiteSetting.auto_handle_queued_age.to_i+ return if age.zero?++ cutoff = age.days.ago+ recently_reopened =+ ReviewableHistory+ .transitioned+ .pending+ .where(created_at: cutoff..)+ .where("reviewable_histories.reviewable_id = reviewables.id")Reviewable.pending- .where("created_at < ?", SiteSetting.auto_handle_queued_age.to_i.days.ago)+ .where("created_at < ?", cutoff)+ .where.not(recently_reopened.arel.exists).find_each do |reviewable|if reviewable.is_a?(ReviewableFlaggedPost)reviewable.perform(Discourse.system_user, :ignore_and_do_nothing, expired: true)diff --git a/app/models/reviewable.rb b/app/models/reviewable.rbindex a0b8e2a5038..24454a938ba 100644--- a/app/models/reviewable.rb+++ b/app/models/reviewable.rb@@ -21,7 +21,7 @@ class Reviewable < ActiveRecord::Baseendend- attr_accessor :created_new+ attr_accessor :created_new, :reopenedvalidates :type, :status, :created_by_id, presence: truebelongs_to :target, polymorphic: truebelongs_to :created_by, class_name: "User"@@ -238,8 +238,9 @@ class Reviewable < ActiveRecord::Baseif old_status != statuses[:pending]# If we're transitioning back from reviewed to pending, we should recalculate# the score to prevent posts from being hidden.- reviewable.recalculate_score- reviewable.log_history(:transitioned, created_by)+ reviewable.recalculate_score(event: :skip)+ reviewable.log_history(:transitioned, Discourse.system_user)+ reviewable.reopened = trueendendend@@ -289,7 +290,11 @@ class Reviewable < ActiveRecord::Base# Used flags cannot be deleted or update by admins, only disabled.Flag.reset_flag_settings! if PostActionType.notify_flag_type_ids.include?(reviewable_score_type)- DiscourseEvent.trigger(:reviewable_score_updated, self)+ if reopened && !take_action+ DiscourseEvent.trigger(:reviewable_transitioned_to, :pending, self)+ else+ DiscourseEvent.trigger(:reviewable_score_updated, self)+ endrsend@@ -489,9 +494,9 @@ class Reviewable < ActiveRecord::Baseresultend- # Includes pending scores plus disagreed ones, so re-approving a previously- # rejected reviewable correctly flips those scores back to "agreed".def updatable_reviewable_scores+ return reviewable_scores.pending if !rejected?+reviewable_scores.pending.or(reviewable_scores.disagreed)end@@ -502,6 +507,7 @@ class Reviewable < ActiveRecord::BaseReviewableClaimedTopic.release_manual_claim(topic_id, performed_by)end+ scores = updatable_reviewable_scoresself.status = status_symbolsave!@@ -509,7 +515,7 @@ class Reviewable < ActiveRecord::BaseDiscourseEvent.trigger(:reviewable_transitioned_to, status_symbol, self)if score_status = ReviewableScore.score_transitions[status_symbol]- updatable_reviewable_scores.update_all(+ scores.update_all(status: score_status,reviewed_by_id: performed_by.id,reviewed_at: Time.zone.now,@@ -881,7 +887,7 @@ class Reviewable < ActiveRecord::BaseSQLend- def recalculate_score+ def recalculate_score(event: :trigger)# pending/agreed scores countsql = <<~SQLUPDATE reviewables@@ -923,8 +929,9 @@ class Reviewable < ActiveRecord::Base)self.score = result[0].score+ clear_attribute_changes([:score])- DiscourseEvent.trigger(:reviewable_score_updated, self)+ DiscourseEvent.trigger(:reviewable_score_updated, self) if event == :triggerscoreenddiff --git a/plugins/discourse-workflows/spec/integration/status_event_triggers_spec.rb b/plugins/discourse-workflows/spec/integration/status_event_triggers_spec.rbindex 6e95c1d7a84..e5d984bb6ba 100644--- a/plugins/discourse-workflows/spec/integration/status_event_triggers_spec.rb+++ b/plugins/discourse-workflows/spec/integration/status_event_triggers_spec.rb@@ -73,6 +73,24 @@ RSpec.describe "Workflow status event triggers" doendend+ it "dispatches flags re-opening a handled reviewable with the new score" do+ post = Fabricate(:post, topic:)+ PostActionCreator+ .inappropriate(Fabricate(:user, refresh_auto_groups: true), post)+ .reviewable+ .perform(admin, :ignore_and_do_nothing)+ create_workflow("pending", "trigger:reviewable_pending")++ result = PostActionCreator.spam(Fabricate(:user, refresh_auto_groups: true), post)++ expect(enqueued_jobs.map { |job| job["trigger_node_id"] }).to eq(%w[pending])+ expect(enqueued_jobs.first.dig("trigger_data", "reviewable")).to include(+ "id" => result.reviewable.id,+ "status" => "pending",+ "score" => result.reviewable_score.score,+ )+ end+it "dispatches promotions with both trust levels and the execution user" douser.update!(trust_level: TrustLevel.levels[:basic])create_workflow(diff --git a/spec/jobs/auto_queue_handler_spec.rb b/spec/jobs/auto_queue_handler_spec.rbindex faa3327d900..ef11f3a664e 100644--- a/spec/jobs/auto_queue_handler_spec.rb+++ b/spec/jobs/auto_queue_handler_spec.rb@@ -61,4 +61,36 @@ RSpec.describe Jobs::AutoQueueHandler doexpect(old_user.reload.pending?).to eq(true)endend++ describe "re-opened flag" do+ fab!(:moderator)+ fab!(:post)+ fab!(:flagger) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:other_flagger) { Fabricate(:user, refresh_auto_groups: true) }++ let!(:reviewable) do+ freeze_time(100.days.ago) do+ PostActionCreator+ .spam(flagger, post)+ .reviewable+ .tap { |flag| flag.perform(moderator, :ignore_and_do_nothing) }+ end+ end++ before { SiteSetting.auto_handle_queued_age = 60 }++ it "leaves a flag re-opened within auto_handle_queued_age days pending" do+ PostActionCreator.spam(other_flagger, post)++ job++ expect(reviewable.reload).to be_pending+ end++ it "ignores a flag re-opened more than auto_handle_queued_age days ago" do+ freeze_time(61.days.ago) { PostActionCreator.spam(other_flagger, post) }++ expect { job }.to change { reviewable.reload.status }.from("pending").to("ignored")+ end+ endenddiff --git a/spec/jobs/create_user_reviewable_spec.rb b/spec/jobs/create_user_reviewable_spec.rbindex 4f9eb215061..36677417cff 100644--- a/spec/jobs/create_user_reviewable_spec.rb+++ b/spec/jobs/create_user_reviewable_spec.rb@@ -24,18 +24,25 @@ RSpec.describe Jobs::CreateUserReviewable doexpect(reviewable.reviewable_scores.size).to eq(1)end- it "shows staff the current email when a user returns to the review queue" do+ it "re-queues a returning user with the current email and a new score" doSiteSetting.must_approve_users = truedescribed_class.new.execute(user_id: user.id)reviewable = Reviewable.find_by(target: user)- reviewable.update!(status: Reviewable.statuses[:approved])-+ reviewable.transition_to(:rejected, Discourse.system_user)user.primary_email.update!(email: "[email protected]")- described_class.new.execute(user_id: user.id)- reviewable.reload- expect(reviewable).to be_pending- expect(reviewable.payload["email"]).to eq("[email protected]")+ events =+ DiscourseEvent.track_events(:reviewable_transitioned_to) do+ described_class.new.execute(user_id: user.id)+ end++ expect(events.map { |event| event[:params].last.payload["email"] }).to eq(+ ["[email protected]"],+ )+ expect(reviewable.reload).to be_pending+ expect(reviewable.reviewable_scores.pending.map(&:reviewable_score_type)).to eq(+ [ReviewableScore.types[:needs_approval]],+ )enddescribe "reasons" dodiff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rbindex 68a57aba9ef..5abd5ec032f 100644--- a/spec/models/reviewable_flagged_post_spec.rb+++ b/spec/models/reviewable_flagged_post_spec.rb@@ -272,6 +272,20 @@ RSpec.describe ReviewableFlaggedPost, type: :model doexpect(post).not_to be_hiddenend+ it "agree_and_keep keeps flags rejected in an earlier review rejected" do+ reviewable.perform(moderator, :disagree)+ new_score =+ PostActionCreator.inappropriate(+ Fabricate(:user, refresh_auto_groups: true),+ post,+ ).reviewable_score++ reviewable.reload.perform(moderator, :agree_and_keep)++ expect(score.reload).to be_disagreed+ expect(new_score.reload).to be_agreed+ end+describe "with reviewable claiming enabled" dofab!(:claimed) { Fabricate(:reviewable_claimed_topic, topic: post.topic, user: moderator) }diff --git a/spec/models/reviewable_history_spec.rb b/spec/models/reviewable_history_spec.rbindex 6b3dc5b1d92..2c2774b4750 100644--- a/spec/models/reviewable_history_spec.rb+++ b/spec/models/reviewable_history_spec.rb@@ -31,7 +31,7 @@ RSpec.describe ReviewableHistory, type: :model doexpect(history[2]).to be_transitionedexpect(history[2]).to be_pending- expect(history[2].created_by).to eq(admin)+ expect(history[2].created_by).to eq(Discourse.system_user)endit "does not log a transition to the current state" dodiff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rbindex 404ee1061ca..ffbabfd4563 100644--- a/spec/models/reviewable_spec.rb+++ b/spec/models/reviewable_spec.rb@@ -104,6 +104,52 @@ RSpec.describe Reviewable, type: :model doexpect(r1.pending?).to eq(true)end+ it "triggers one transition to pending once the re-opening score is added" do+ ReviewableUser.needs_review!(target: user, created_by: admin).transition_to(:approved, admin)++ events =+ DiscourseEvent.track_events do+ 2.times do+ ReviewableUser.needs_review!(target: user, created_by: admin).add_score(+ admin,+ ReviewableScore.types[:needs_approval],+ )+ end+ end++ expect(events.map { |event| event[:event_name] }).to eq(+ %i[reviewable_transitioned_to reviewable_score_updated],+ )+ expect(events.first[:params]).to eq([:pending, Reviewable.find_by(target: user)])+ end++ it "does not trigger a transition to pending when the re-opening score takes action" do+ ReviewableUser.needs_review!(target: user, created_by: admin).transition_to(:approved, admin)++ events =+ DiscourseEvent.track_events(:reviewable_transitioned_to) do+ ReviewableUser.needs_review!(target: user, created_by: admin).add_score(+ admin,+ ReviewableScore.types[:needs_approval],+ take_action: true,+ )+ end++ expect(events).to be_empty+ end++ it "saves the score added after re-opening an ignored reviewable" do+ post = Fabricate(:post)+ reviewable = ReviewableFlaggedPost.needs_review!(target: post, created_by: admin)+ reviewable.add_score(user, PostActionType.types[:off_topic])+ reviewable.transition_to(:ignored, admin)++ reopened = ReviewableFlaggedPost.needs_review!(target: post, created_by: admin)+ reviewable_score = reopened.add_score(user, PostActionType.types[:off_topic])++ expect(reopened.reload.score).to eq(reviewable_score.score)+ end+it "preserves an approved queued reviewable when reusing the target's flagged reviewable" dor0 = Fabricate(:reviewable_queued_post)r0.perform(admin, :approve_post)