A platform for community discussion. Free, open, simple.
FIX: Make review queue silences traceable and correctly scoped
Régis Hanol5e3e743f7bdf
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rbindex 9817ee32caa..8e99507f5c3 100644--- a/app/models/reviewable_flagged_post.rb+++ b/app/models/reviewable_flagged_post.rb@@ -267,7 +267,9 @@ class ReviewableFlaggedPost < Reviewablenotify_poster(performed_by)post.acting_user = performed_bypost.unhide!- UserSilencer.unsilence(post.user) if UserSilencer.was_silenced_for?(post)+ if UserSilencer.was_silenced_for?(post)+ UserSilencer.unsilence(post.user, performed_by, reviewable_id: id)+ endendcreate_result(:success, :rejected, actions.map(&:user_id), false)diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rbindex f20b37558a1..4b1d8f6053a 100644--- a/app/services/user_silencer.rb+++ b/app/services/user_silencer.rb@@ -97,6 +97,8 @@ class UserSilencerenddef unsilence+ return false if @user.silenced_till.blank?+@user.silenced_till = nilif @user.saveDiscourseEvent.trigger(:user_unsilenced, user: @user, by_user: @by_user)diff --git a/plugins/chat/app/models/chat/reviewable_message.rb b/plugins/chat/app/models/chat/reviewable_message.rbindex c20c46c8c8c..b426f46c416 100644--- a/plugins/chat/app/models/chat/reviewable_message.rb+++ b/plugins/chat/app/models/chat/reviewable_message.rb@@ -36,6 +36,16 @@ module Chat@flagged_by_user_ids ||= reviewable_scores.map(&:user_id)end+ def silenced_for_this_message?+ return false if !chat_message_creator&.silenced?++ UserHistory.exists?(+ action: UserHistory.actions[:silence_user],+ target_user_id: chat_message_creator.id,+ reviewable_id: id,+ )+ end+def postnilend@@ -110,11 +120,11 @@ module Chatenddef perform_disagree_and_restore(performed_by, args)- disagree { chat_message.recover! }+ disagree(performed_by) { chat_message.recover! }enddef perform_disagree(performed_by, args)- disagree+ disagree(performed_by)enddef perform_ignore(performed_by, args)@@ -139,10 +149,12 @@ module Chatendend- def disagree+ def disagree(performed_by)yield if block_given?- UserSilencer.unsilence(chat_message_creator)+ if silenced_for_this_message?+ UserSilencer.unsilence(chat_message_creator, performed_by, reviewable_id: id)+ endcreate_result(:success, :rejected) do |result|result.update_flag_stats = { status: :disagreed, user_ids: flagged_by_user_ids }diff --git a/plugins/chat/lib/chat/review_queue.rb b/plugins/chat/lib/chat/review_queue.rbindex 84919c71a88..624ec638372 100644--- a/plugins/chat/lib/chat/review_queue.rb+++ b/plugins/chat/lib/chat/review_queue.rb@@ -114,6 +114,7 @@ module ChatDiscourse.system_user,silenced_till: auto_silence_duration.minutes.from_now,reason: I18n.t("chat.errors.auto_silence_from_flags"),+ reviewable_id: reviewable.id,)enddiff --git a/plugins/chat/spec/lib/chat/review_queue_spec.rb b/plugins/chat/spec/lib/chat/review_queue_spec.rbindex 222586e9817..81ff57acfeb 100644--- a/plugins/chat/spec/lib/chat/review_queue_spec.rb+++ b/plugins/chat/spec/lib/chat/review_queue_spec.rb@@ -405,6 +405,33 @@ describe Chat::ReviewQueue doexpect(message_poster.reload.silenced?).to eq(true)end+ it "attributes the silence to the reviewable it came from" do+ SiteSetting.chat_auto_silence_from_flags_duration = 1+ flagger.update!(trust_level: TrustLevel[4]) # Increase Score due to TL Bonus.++ queue.flag_message(message, guardian, ReviewableScore.types[:off_topic])++ history =+ UserHistory.find_by(+ action: UserHistory.actions[:silence_user],+ target_user_id: message_poster.id,+ )++ expect(history.reviewable_id).to eq(Chat::ReviewableMessage.find_by(target: message).id)+ end++ it "lifts the silence when a moderator disagrees with the flag" do+ SiteSetting.chat_auto_silence_from_flags_duration = 1+ flagger.update!(trust_level: TrustLevel[4]) # Increase Score due to TL Bonus.++ queue.flag_message(message, guardian, ReviewableScore.types[:off_topic])+ expect(message_poster.reload.silenced?).to eq(true)++ Chat::ReviewableMessage.find_by(target: message).perform(admin, :disagree)++ expect(message_poster.reload.silenced?).to eq(false)+ end+it "does nothing if the new score is less than the auto-silence threshold" doSiteSetting.chat_auto_silence_from_flags_duration = 50diff --git a/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rbindex de7c15ce624..49417d80493 100644--- a/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb+++ b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb@@ -63,13 +63,14 @@ RSpec.describe Chat::ReviewableMessage, type: :model doexpect(chat_message.reload.deleted_at).not_to be_presentend- context "when the flagged message author is silenced" do+ context "when the flagged message author was silenced for this message" dobefore doUserSilencer.silence(user,Discourse.system_user,silenced_till: 10.minutes.from_now,reason: I18n.t("chat.errors.auto_silence_from_flags"),+ reviewable_id: reviewable.id,)end@@ -85,5 +86,32 @@ RSpec.describe Chat::ReviewableMessage, type: :model doexpect(user.reload.silenced?).to eq(false)end++ it "attributes the unsilence to the moderator and the reviewable" do+ reviewable.perform(moderator, :disagree)++ history =+ UserHistory.find_by(action: UserHistory.actions[:unsilence_user], target_user_id: user.id)++ expect(history.acting_user_id).to eq(moderator.id)+ expect(history.reviewable_id).to eq(reviewable.id)+ end+ end++ context "when the flagged message author was silenced for something else" do+ before do+ UserSilencer.silence(+ user,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: "unrelated reason",+ )+ end++ it "perform_disagree leaves the user silenced" do+ reviewable.perform(moderator, :disagree)++ expect(user.reload.silenced?).to eq(true)+ endendenddiff --git a/plugins/discourse-ai/lib/ai_moderation/spam_scanner.rb b/plugins/discourse-ai/lib/ai_moderation/spam_scanner.rbindex 7fc7752f984..2670e6aa03a 100644--- a/plugins/discourse-ai/lib/ai_moderation/spam_scanner.rb+++ b/plugins/discourse-ai/lib/ai_moderation/spam_scanner.rb@@ -444,10 +444,11 @@ module DiscourseAiflagging_user,message: :too_many_spam_flags,post_id: post.id,+ reviewable_id: result.reviewable&.id,reason: reason,keep_posts: true,)- silencer.silence+ silencer.auto_silence# silencer will not hide tl1 posts, so we do this herehide_post(post)diff --git a/plugins/discourse-ai/spec/lib/modules/ai_moderation/spam_scanner_spec.rb b/plugins/discourse-ai/spec/lib/modules/ai_moderation/spam_scanner_spec.rbindex 6006cfd30e5..bc283fd99be 100644--- a/plugins/discourse-ai/spec/lib/modules/ai_moderation/spam_scanner_spec.rb+++ b/plugins/discourse-ai/spec/lib/modules/ai_moderation/spam_scanner_spec.rb@@ -336,6 +336,20 @@ RSpec.describe DiscourseAi::AiModeration::SpamScanner dobefore { Jobs.run_immediately! }+ it "notifies moderators when the site asks to be notified about auto silences" do+ SiteSetting.notify_mods_when_user_silenced = true++ allow(GroupMessage).to receive(:create)++ described_class.new_post(post)+ DiscourseAi::Completions::Llm.with_prepared_responses(+ [{ spam: true, reason: "spam detected" }],+ ) { post.rebake! }++ expect(GroupMessage).to have_received(:create).at_least(:once)+ expect(post.user.reload).to be_silenced+ end+it "can correctly run tests" doprompts = nilresult =@@ -412,6 +426,9 @@ RSpec.describe DiscourseAi::AiModeration::SpamScanner doexpect(log.reviewable).to be_presentexpect(log.reviewable.created_by_id).to eq(described_class.flagging_user.id)+ expect(history.post_id).to eq(post.id)+ expect(history.reviewable_id).to eq(log.reviewable.id)+log.reviewable.perform(moderator, :disagree_and_restore)expect(post.reload.hidden?).to eq(false)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 2e380e79890..458566f0ece 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@@ -125,7 +125,9 @@ class ReviewablePostVotingComment < Reviewabledef disagree(performed_by)yield if block_given?- UserSilencer.unsilence(comment_creator, performed_by) if UserSilencer.was_silenced_for?(post)+ if UserSilencer.was_silenced_for?(post)+ UserSilencer.unsilence(comment_creator, performed_by, reviewable_id: id)+ endcreate_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 09af17915ec..3ae5ecb9222 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@@ -91,6 +91,19 @@ RSpec.describe ReviewablePostVotingComment, type: :model doexpect(comment_poster.reload.silenced?).to eq(false)end++ it "attributes the unsilence to the reviewable" do+ reviewable.perform(moderator, :disagree)++ history =+ UserHistory.find_by(+ action: UserHistory.actions[:unsilence_user],+ target_user_id: comment_poster.id,+ )++ expect(history.acting_user_id).to eq(moderator.id)+ expect(history.reviewable_id).to eq(reviewable.id)+ endendcontext "when the user was silenced for a different reason" dodiff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rbindex 79a46c48fb0..85420af9f5e 100644--- a/spec/models/reviewable_flagged_post_spec.rb+++ b/spec/models/reviewable_flagged_post_spec.rb@@ -613,6 +613,28 @@ RSpec.describe ReviewableFlaggedPost, type: :model doexpect(target_user.reload.silenced?).to eq(false)end+ it "attributes the unsilence to the moderator and the reviewable" do+ reviewable = Fabricate(:reviewable_flagged_post)+ target_user = reviewable.post.user+ reviewable.post.update(+ hidden: true,+ hidden_at: Time.zone.now,+ hidden_reason_id: PostActionType.types[:spam],+ )+ UserSilencer.silence(target_user, moderator, post_id: reviewable.post.id)++ reviewable.perform(moderator, :disagree_and_restore)++ history =+ UserHistory.find_by(+ action: UserHistory.actions[:unsilence_user],+ target_user_id: target_user.id,+ )++ expect(history.acting_user_id).to eq(moderator.id)+ expect(history.reviewable_id).to eq(reviewable.id)+ end+context "with category group moderator" dofab!(:group)fab!(:category_moderator) { Fabricate(:user, refresh_auto_groups: true) }diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rbindex 7a98c7b5263..ace4e1a41e3 100644--- a/spec/services/user_silencer_spec.rb+++ b/spec/services/user_silencer_spec.rb@@ -142,5 +142,27 @@ RSpec.describe UserSilencer doexpect(count).to eq(1)end++ it "does nothing when the user is not silenced" do+ expect(UserSilencer.unsilence(user, admin)).to eq(false)++ expect(user.topics_allowed.count).to eq(0)+ expect(UserHistory.where(action: UserHistory.actions[:unsilence_user]).count).to eq(0)+ end++ it "is idempotent when called twice" do+ user.update!(silenced_till: 1.year.from_now)++ UserSilencer.unsilence(user, admin)+ UserSilencer.unsilence(user, admin)++ expect(UserHistory.where(action: UserHistory.actions[:unsilence_user]).count).to eq(1)+ expect(+ user+ .topics_allowed+ .where(title: I18n.t("system_messages.unsilenced.subject_template"))+ .count,+ ).to eq(1)+ endendend