A platform for community discussion. Free, open, simple.
FIX: Link auto-silence staff action log entries to reviewable (#42566)
Krzysztof Kotlarekdbb040e80853
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rbindex 253f50ae92a..a562a12d6e2 100644--- a/lib/new_post_manager.rb+++ b/lib/new_post_manager.rb@@ -182,6 +182,8 @@ class NewPostManagerresult = manager.enqueue(reason, creator_opts: creator_opts)if result.success? || (reason == :email_spam && is_first_post?(manager))+ reviewable_id = result.reviewable&.id+I18n.with_locale(SiteSetting.default_locale) doif is_fast_typer?(manager)UserSilencer.auto_silence(@@ -189,6 +191,7 @@ class NewPostManagerDiscourse.system_user,keep_posts: true,reason: I18n.t("user.new_user_typed_too_fast"),+ reviewable_id:,)elsif auto_silence?(manager) || matches_auto_silence_regex?(manager)UserSilencer.auto_silence(@@ -196,6 +199,7 @@ class NewPostManagerDiscourse.system_user,keep_posts: true,reason: I18n.t("user.content_matches_auto_silence_regex"),+ reviewable_id:,)elsif reason == :email_spam && is_first_post?(manager)UserSilencer.auto_silence(@@ -203,6 +207,7 @@ class NewPostManagerDiscourse.system_user,keep_posts: true,reason: I18n.t("user.email_in_spam_header"),+ reviewable_id:,)endenddiff --git a/spec/lib/new_post_manager_spec.rb b/spec/lib/new_post_manager_spec.rbindex 14d3fc6b654..f95497e0ec8 100644--- a/spec/lib/new_post_manager_spec.rb+++ b/spec/lib/new_post_manager_spec.rb@@ -279,6 +279,19 @@ RSpec.describe NewPostManager doendend+ it "links the silence staff action log entry to the queued post" do+ manager = build_manager_with("this is new post content")++ result = NewPostManager.default_handler(manager)++ history =+ UserHistory.where(+ action: UserHistory.actions[:silence_user],+ target_user_id: user.id,+ ).last+ expect(history.reviewable_id).to eq(result.reviewable.id)+ end+it "runs the watched words check before checking if the user is a fast typer" doFabricate(:watched_word, word: "darn", action: WatchedWord.actions[:require_approval])manager = build_manager_with("this is darn new post content")