A platform for community discussion. Free, open, simple.
FIX: Disagree action can unsilence users outside reviewer authority (#39857)
Juan David Martínez Cubillosc7c03e56e41f
diff --git a/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rb b/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rbindex 67e5728024d..0522fe850d2 100644--- a/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rb+++ b/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rb@@ -21,7 +21,7 @@ class ReviewablePostVotingComment < Reviewableenddef post- nil+ @post ||= comment&.postenddef comment@@ -97,11 +97,11 @@ class ReviewablePostVotingComment < Reviewableenddef perform_disagree_and_restore(performed_by, args)- disagree { comment.recover! }+ disagree(performed_by) { comment.recover! }enddef perform_disagree(performed_by, args)- disagree+ disagree(performed_by)enddef perform_ignore(performed_by, args)@@ -122,10 +122,10 @@ class ReviewablePostVotingComment < Reviewableendend- def disagree+ def disagree(performed_by)yield if block_given?- UserSilencer.unsilence(comment_creator)+ UserSilencer.unsilence(comment_creator, performed_by) if UserSilencer.was_silenced_for?(post)create_result(:success, :rejected) do |result|result.update_flag_stats = { status: :disagreed, user_ids: flagged_by_user_ids }diff --git a/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rb b/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rbindex 377d74c0a49..09af17915ec 100644--- a/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rb+++ b/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rb@@ -17,6 +17,12 @@ RSpec.describe ReviewablePostVotingComment, type: :model doFabricate(:reviewable_post_voting_comment, target: comment, created_by: moderator)end+ describe "#post" do+ it "returns the post that the comment belongs to" do+ expect(reviewable.post).to eq(post)+ end+ end+it "agree_and_keep agrees with the flag and doesn't delete the comment" doreviewable.perform(moderator, :agree_and_keep_comment)@@ -62,26 +68,54 @@ RSpec.describe ReviewablePostVotingComment, type: :model doendcontext "when the flagged comment author is silenced" do- before do- UserSilencer.silence(- comment_poster,- Discourse.system_user,- silenced_till: 10.minutes.from_now,- reason: I18n.t("post_voting.comment.errors.auto_silence_from_flags"),- )- end-- it "perform_disagree unsilences the user" do- reviewable.perform(moderator, :disagree)-- expect(user.reload.silenced?).to eq(false)+ context "when the user was silenced for this post" do+ before do+ UserSilencer.silence(+ comment_poster,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: I18n.t("post_voting.comment.errors.auto_silence_from_flags"),+ post_id: post.id,+ )+ end++ it "perform_disagree unsilences the user" do+ reviewable.perform(moderator, :disagree)++ expect(comment_poster.reload.silenced?).to eq(false)+ end++ it "perform_disagree_and_restore unsilences the user" do+ comment.trash!(user)+ reviewable.perform(moderator, :disagree_and_restore)++ expect(comment_poster.reload.silenced?).to eq(false)+ endend- it "perform_disagree_and_restore unsilences the user" do- comment.trash!(user)- reviewable.perform(moderator, :disagree_and_restore)-- expect(user.reload.silenced?).to eq(false)+ context "when the user was silenced for a different reason" do+ before do+ UserSilencer.silence(+ comment_poster,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: "unrelated reason",+ )+ end++ it "perform_disagree does not unsilence the user" do+ reviewable.perform(moderator, :disagree)++ expect(comment_poster.reload.silenced?).to eq(true)+ end++ it "perform_disagree_and_restore does not unsilence the user" do+ comment.trash!(user)+ reviewable.perform(moderator, :disagree_and_restore)++ expect(comment_poster.reload.silenced?).to eq(true)+ expect(comment.reload.deleted_at).to be_nil+ endendend@@ -93,4 +127,72 @@ RSpec.describe ReviewablePostVotingComment, type: :model doexpect { reviewable.reload }.to raise_error(ActiveRecord::RecordNotFound)endend++ context "with category group moderators" do+ fab!(:group)+ fab!(:category_mod) { Fabricate(:user, groups: [group]) }++ before do+ SiteSetting.enable_category_group_moderation = true+ Fabricate(:category_moderation_group, category: topic.category, group: group)+ end++ context "when the user was silenced for this post" do+ before do+ UserSilencer.silence(+ comment_poster,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: I18n.t("post_voting.comment.errors.auto_silence_from_flags"),+ post_id: post.id,+ )+ end++ it "allows category moderator to unsilence the user by disagreeing" do+ reviewable.perform(category_mod, :disagree)++ expect(reviewable).to be_rejected+ expect(comment_poster.reload.silenced?).to eq(false)+ end+ end++ context "when the user was silenced for a different post" do+ fab!(:other_post, :post)++ before do+ UserSilencer.silence(+ comment_poster,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: "silenced for different post",+ post_id: other_post.id,+ )+ end++ it "does not allow category moderator to unsilence via unrelated reviewable" do+ reviewable.perform(category_mod, :disagree)++ expect(reviewable).to be_rejected+ expect(comment_poster.reload.silenced?).to eq(true)+ end+ end++ context "when the user was silenced by staff for unrelated reasons" do+ before do+ UserSilencer.silence(+ comment_poster,+ admin,+ silenced_till: 10.minutes.from_now,+ reason: "staff silenced for policy violation",+ )+ end++ it "does not allow category moderator to unsilence via disagreeing with flag" do+ reviewable.perform(category_mod, :disagree)++ expect(reviewable).to be_rejected+ expect(comment_poster.reload.silenced?).to eq(true)+ end+ end+ endend