A platform for community discussion. Free, open, simple.
FIX: keeps force_review once set to true (#38795)
Amanda Alves Branquinhoccabd701cf93
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rbindex 0653d624506..a60413ebbca 100644--- a/app/models/reviewable.rb+++ b/app/models/reviewable.rb@@ -227,7 +227,11 @@ class Reviewable < ActiveRecord::Basers.reason = reason.to_s if reasonrs.save!- update(score: self.score + rs.score, latest_score: rs.created_at, force_review: force_review)+ update(+ score: self.score + rs.score,+ latest_score: rs.created_at,+ force_review: self.force_review || force_review,+ )topic.update(reviewable_score: topic.reviewable_score + rs.score) if topic# Flags are cached for performance reasons.diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rbindex 270ca66fc35..003d1230359 100644--- a/spec/models/reviewable_spec.rb+++ b/spec/models/reviewable_spec.rb@@ -670,6 +670,32 @@ RSpec.describe Reviewable, type: :model doendend+ describe "#add_score" do+ fab!(:user1, :user)+ fab!(:user2, :user)+ fab!(:post)++ it "does not overwrite force_review=true when set by trusted sources" do+ reviewable =+ ReviewableFlaggedPost.needs_review!(+ target: post,+ topic: post.topic,+ created_by: Discourse.system_user,+ reviewable_by_moderator: true,+ )++ # Spam detection system flags with force_review: true+ reviewable.add_score(Discourse.system_user, PostActionType.types[:spam], force_review: true)+ expect(reviewable.reload.force_review).to eq(true)++ # Regular user adds another score without force_review+ reviewable.add_score(user1, PostActionType.types[:inappropriate])++ # force_review should remain true (set by spam detection)+ expect(reviewable.reload.force_review).to eq(true)+ end+ end+describe "priorities" doit "returns 0 for unknown priorities" doexpect(Reviewable.min_score_for_priority(:wat)).to eq(0.0)