From 22e8f8af6dda5b4b4f69e002fc4a2d4112d93ebf Mon Sep 17 00:00:00 2001
From: janzenisaac <50783505+janzenisaac@users.noreply.github.com>
Date: Wed, 5 Jan 2022 12:37:15 -0600
Subject: [PATCH] FIX: Clean flagged queue when response to flagged post
 deleted (#15463)

---
 config/locales/server.en.yml | 6 ++++++
 lib/post_destroyer.rb        | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 74bd406a87e..4b57bc8a5cd 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2929,6 +2929,12 @@ en:
         %{flagged_post_raw_content}
         ```
 
+        To which you responded
+
+        ``` markdown
+        %{flagged_post_response_raw_content}
+        ```
+
         For more details on the reason for removal, please review our [community guidelines](%{base_url}/guidelines).
 
     usage_tips:
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 427fd6f08dd..d9614b45434 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -183,6 +183,7 @@ class PostDestroyer
       DB.after_commit do
         if @opts[:reviewable]
           notify_deletion(@opts[:reviewable], { notify_responders: @opts[:notify_responders], parent_post: @opts[:parent_post] })
+          ignore(@post.reviewable_flag) if @post.reviewable_flag && SiteSetting.notify_users_after_responses_deleted_on_flagged_post
         elsif reviewable = @post.reviewable_flag
           @opts[:defer_flags] ? ignore(reviewable) : agree(reviewable)
         end
@@ -332,6 +333,7 @@ class PostDestroyer
       message_type: notify_responders ? :flags_agreed_and_post_deleted_for_responders : :flags_agreed_and_post_deleted,
       message_options: {
         flagged_post_raw_content: notify_responders ? options[:parent_post].raw : @post.raw,
+        flagged_post_response_raw_content: @post.raw,
         url: notify_responders ? options[:parent_post].url : @post.url,
         flag_reason: I18n.t(
           "flag_reasons#{".responder" if notify_responders}.#{PostActionType.types[rs.reviewable_score_type]}",