FEATURE: Send a different PM when a post has been hidden more than once

app/controllers/admin/email_templates_controller.rb

@@ -17,6 +17,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "system_messages.email_reject_screened_email",
                      "system_messages.email_reject_unrecognized_error",
                      "system_messages.pending_users_reminder", "system_messages.post_hidden",
+                     "system_messages.post_hidden_again",
                      "system_messages.restore_failed", "system_messages.restore_succeeded",
                      "system_messages.spam_post_blocked", "system_messages.too_many_spam_flags",
                      "system_messages.unsilenced", "system_messages.user_automatically_silenced",

app/models/post_action.rb

@@ -569,6 +569,8 @@ SQL
       reason = guess_hide_reason(post)
     end
 
+    hiding_again = post.hidden_at.present?
+
     post.hidden = true
     post.hidden_at = Time.zone.now
     post.hidden_reason_id = reason
@@ -584,7 +586,10 @@ SQL
         flag_reason: I18n.t("flag_reasons.#{post_action_type}"),
       }
 
-      Jobs.enqueue_in(5.seconds, :send_system_message, user_id: post.user.id, message_type: :post_hidden, message_options: options)
+      Jobs.enqueue_in(5.seconds, :send_system_message,
+                      user_id: post.user.id,
+                      message_type: hiding_again ? :post_hidden_again : :post_hidden,
+                      message_options: options)
     end
   end
 

config/locales/server.en.yml

@@ -2101,6 +2101,22 @@ en:
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
 
+    post_hidden_again:
+      title: "Post Hidden again"
+      subject_template: "Post hidden by community flags"
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your post was hidden again.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Multiple community members flagged this post before it was hidden, so please consider how you might revise your post to reflect their feedback. **You can edit your post after %{edit_delay} minutes, but it will remain hidden until handled by staff.**
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
+
     usage_tips:
       text_body_template: |
         For a few quick tips on getting started as a new user, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).

spec/models/post_action_spec.rb

@@ -421,6 +421,11 @@ describe PostAction do
       SiteSetting.flags_required_to_hide_post = 2
       Discourse.stubs(:site_contact_user).returns(admin)
 
+      Jobs.expects(:enqueue_in).with(5.seconds, :send_system_message,
+                                     has_entries(user_id: post.user.id, message_type: :post_hidden)).once
+      Jobs.expects(:enqueue_in).with(5.seconds, :send_system_message,
+                                     has_entries(user_id: post.user.id, message_type: :post_hidden_again)).once
+
       PostAction.act(eviltrout, post, PostActionType.types[:spam])
       PostAction.act(walterwhite, post, PostActionType.types[:spam])