A platform for community discussion. Free, open, simple.
FIX: Let chat moderators lift a silence the flag owns
Régis Hanol4fa526c55f45
diff --git a/plugins/chat/app/models/chat/reviewable_message.rb b/plugins/chat/app/models/chat/reviewable_message.rbindex b426f46c416..964789693e7 100644--- a/plugins/chat/app/models/chat/reviewable_message.rb+++ b/plugins/chat/app/models/chat/reviewable_message.rb@@ -39,11 +39,7 @@ module Chatdef 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,- )+ chat_message_creator.silenced_record&.reviewable_id == idenddef post@@ -105,6 +101,31 @@ module Chatunless chat_message.deleted_at?build_action(actions, :delete_and_agree, icon: "trash-can", bundle: disagree_bundle)end++ build_unsilence_action(actions, guardian)+ end++ def build_unsilence_action(actions, guardian)+ return if !chat_message_creator&.silenced?+ return if !guardian.can_unsilence_user?(chat_message_creator)++ build_action(actions, :unsilence_user, icon: "microphone-slash")+ end++ def penalty_effect_for(action_id)+ return if author_penalties.empty?++ lifts_silence =+ case action_id+ when :disagree, :disagree_and_restore+ silenced_for_this_message?+ when :unsilence_user+ true+ else+ false+ end++ lifts_silence ? :lifts_penalty : :retains_penaltyenddef perform_agree_and_keep_message(performed_by, args)@@ -131,6 +152,12 @@ module Chatignoreend+ def perform_unsilence_user(performed_by, _args)+ UserSilencer.unsilence(chat_message_creator, performed_by, reviewable_id: id)++ create_result(:success) { |result| result.remove_reviewable_ids = [] }+ end+def perform_delete_and_ignore(performed_by, args)ignore { chat_message.trash!(performed_by) }enddiff --git a/plugins/chat/config/locales/server.en.yml b/plugins/chat/config/locales/server.en.ymlindex fbfa3edfaad..f511a990945 100644--- a/plugins/chat/config/locales/server.en.yml+++ b/plugins/chat/config/locales/server.en.yml@@ -154,6 +154,10 @@ en:ignore:title: "Ignore flag"description: "Remove it from the queue without taking action."+ unsilence_user:+ title: "Unsilence author"+ description: "Lift the silence on the author. This flag stays in the queue."+ complete: "Author unsilenced."direct_messages:transcript_title: "Transcript of previous messages in %{channel_name}"transcript_body: "To give you more context, we included a transcript of the previous messages in this conversation (up to ten):\n\n%{transcript}"diff --git a/plugins/chat/spec/fabricators/chat_fabricator.rb b/plugins/chat/spec/fabricators/chat_fabricator.rbindex 3d86600aac2..140b86c48f0 100644--- a/plugins/chat/spec/fabricators/chat_fabricator.rb+++ b/plugins/chat/spec/fabricators/chat_fabricator.rb@@ -176,6 +176,7 @@ Fabricator(:chat_reviewable_message, class_name: "Chat::ReviewableMessage") dotype "ReviewableChatMessage"created_by { Fabricate(:user) }target { Fabricate(:chat_message) }+ target_created_by { |attrs| attrs[:target].user }reviewable_scores { |p| [Fabricate.build(:reviewable_score, reviewable_id: p[:id])] }enddiff --git a/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rbindex 49417d80493..6ee475d0a7e 100644--- a/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb+++ b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb@@ -114,4 +114,80 @@ RSpec.describe Chat::ReviewableMessage, type: :model doexpect(user.reload.silenced?).to eq(true)endend++ context "when a silence from this flag was already lifted and a new one replaced it" do+ before do+ UserSilencer.silence(+ user,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: I18n.t("chat.errors.auto_silence_from_flags"),+ reviewable_id: reviewable.id,+ )+ UserSilencer.unsilence(user, moderator)++ UserSilencer.silence(+ user,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: "unrelated reason",+ )+ end++ it "perform_disagree leaves the later, unrelated silence in place" do+ reviewable.perform(moderator, :disagree)++ expect(user.reload.silenced?).to eq(true)+ end+ end++ describe "#perform_unsilence_user" do+ def unsilence_action(guardian = moderator.guardian)+ reviewable.actions_for(guardian).to_a.find { |a| a.server_action == "unsilence_user" }+ end++ it "is not offered when the author is not silenced" do+ expect(unsilence_action).to eq(nil)+ end++ context "when the author is silenced" do+ before do+ UserSilencer.silence(+ user,+ Discourse.system_user,+ silenced_till: 10.minutes.from_now,+ reason: I18n.t("chat.errors.auto_silence_from_flags"),+ )+ end++ it "is offered with a translated label" do+ action = unsilence_action++ expect(action).to be_present+ expect(I18n.t(action.label)).to eq("Unsilence author")+ expect(I18n.t(action.completed_message)).to eq("Author unsilenced.")+ end++ it "is not offered to a user who cannot unsilence the author" do+ expect(unsilence_action(Fabricate(:user).guardian)).to eq(nil)+ end++ it "lifts the silence without resolving the flag" do+ reviewable.perform(moderator, :unsilence_user)++ expect(user.reload.silenced?).to eq(false)+ expect(reviewable.reload).to be_pending+ end++ it "attributes the unsilence to the moderator and the reviewable" do+ reviewable.perform(moderator, :unsilence_user)++ 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+ endend