From c5c0c4a8b5ee533ebde0954b2d4b6f754bd4df8e Mon Sep 17 00:00:00 2001
From: Anna Buianova <lightallloy@gmail.com>
Date: Sat, 6 Feb 2021 10:03:38 +0300
Subject: [PATCH] Remove old code for feedback messages email to the reporter
 (#12567)

---
 app/helpers/feedback_messages_helper.rb       | 14 ---------
 .../_feedback_message.html.erb                | 29 ++++++-------------
 spec/helpers/feedback_messages_helper_spec.rb |  9 ------
 3 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/app/helpers/feedback_messages_helper.rb b/app/helpers/feedback_messages_helper.rb
index 765208022..a9dc2ffe8 100644
--- a/app/helpers/feedback_messages_helper.rb
+++ b/app/helpers/feedback_messages_helper.rb
@@ -15,20 +15,6 @@ module FeedbackMessagesHelper
     { subject: "#{SiteConfig.community_name} Code of Conduct Violation", body: body }.freeze
   end
 
-  def reporter_email_details
-    body = <<~HEREDOC
-      Hi there,
-
-      Thank you for flagging content that may be in violation of the #{SiteConfig.community_name} Code of Conduct and/or our Terms of Use. We are looking into your report and will take appropriate action.
-
-      We appreciate your help as we work to foster a positive and inclusive environment for all!
-
-      #{SiteConfig.community_name} Team
-    HEREDOC
-
-    { subject: "#{SiteConfig.community_name} Report", body: body }.freeze
-  end
-
   def affected_email_details
     body = <<~HEREDOC
       Hi there,
diff --git a/app/views/admin/feedback_messages/_feedback_message.html.erb b/app/views/admin/feedback_messages/_feedback_message.html.erb
index 6b09f64c4..46cda8b79 100644
--- a/app/views/admin/feedback_messages/_feedback_message.html.erb
+++ b/app/views/admin/feedback_messages/_feedback_message.html.erb
@@ -43,7 +43,7 @@
               <a href="<%= feedback_message.offender.path %>">@<%= feedback_message.offender.username %></a>
             </h5>
           <% else %>
-          <h5 class="fw-bold">
+            <h5 class="fw-bold">
               Reported URL (new tab):
             </h5>
             <h5>
@@ -74,12 +74,12 @@
           </p>
           <% else %>
             <h5 class="fw-bold">
-            Message from Offender:
-          </h5>
-          <div class="reported__message">
-                 <%= raw(feedback_message.message) %>
-          </div>
-            <% end %>
+              Message from Offender:
+            </h5>
+            <div class="reported__message">
+              <%= raw(feedback_message.message) %>
+            </div>
+          <% end %>
         </div>
       </div>
       <hr>
@@ -108,25 +108,14 @@
           <h4 class="fw-bold">Email Form:</h4>
           <ul class="nav nav-tabs" role="tablist">
             <li role="presentation" class="nav-item">
-              <a class="nav-link active" href="#reporter-<%= feedback_message.id %>" aria-controls="reporter-<%= feedback_message.id %>" role="tab" data-toggle="tab">Reporter</a>
-            </li>
-            <li role="presentation" class="nav-item">
-              <a class="nav-link" href="#offender-<%= feedback_message.id %>" aria-controls="offender-<%= feedback_message.id %>" role="tab" data-toggle="tab">Offender</a>
+              <a class="nav-link active" href="#offender-<%= feedback_message.id %>" aria-controls="offender-<%= feedback_message.id %>" role="tab" data-toggle="tab">Offender</a>
             </li>
             <li role="presentation" class="nav-item">
               <a class="nav-link" href="#affected-<%= feedback_message.id %>" aria-controls="affected-<%= feedback_message.id %>" role="tab" data-toggle="tab">Affected</a>
             </li>
           </ul>
           <div class="tab-content my-3">
-            <div role="tabcard" class="tab-pane fade active show" data-id="<%= feedback_message.id %>" data-userType="reporter" id="reporter-<%= feedback_message.id %>">
-              <h5 class="fw-bold">Send To:</h5>
-              <%= email_field_tag :reporter_email_to, feedback_message.reporter&.email, class: "form-control my-1", id: "reporter__emailto__#{feedback_message.id}", required: true %>
-              <h5 class="fw-bold">Subject:</h5>
-              <%= text_field_tag :reporter_email_subject, reporter_email_details[:subject], class: "form-control my-1", id: "reporter__subject__#{feedback_message.id}" %>
-              <h5 class="fw-bold">Body:</h5>
-              <%= text_area_tag :reporter_email_body, reporter_email_details[:body], class: "form-control my-1", style: "height: 300px;", id: "reporter__body__#{feedback_message.id}" %>
-            </div>
-            <div role="tabcard" class="tab-pane fade" data-id="<%= feedback_message.id %>" data-userType="offender" id="offender-<%= feedback_message.id %>">
+            <div role="tabcard" class="tab-pane fade active show" data-id="<%= feedback_message.id %>" data-userType="offender" id="offender-<%= feedback_message.id %>">
               <h5 class="fw-bold">Send To:</h5>
               <%= email_field_tag :offender_email_to, feedback_message.offender&.email, class: "form-control my-1", id: "offender__emailto__#{feedback_message.id}", required: true %>
               <h5 class="fw-bold">Subject:</h5>
diff --git a/spec/helpers/feedback_messages_helper_spec.rb b/spec/helpers/feedback_messages_helper_spec.rb
index d357be8b5..80ef53148 100644
--- a/spec/helpers/feedback_messages_helper_spec.rb
+++ b/spec/helpers/feedback_messages_helper_spec.rb
@@ -10,15 +10,6 @@ RSpec.describe FeedbackMessagesHelper, type: :helper do
     end
   end
 
-  describe "#reporter_email_details" do
-    it "have proper subject and body" do
-      expect(helper.reporter_email_details).to include(
-        subject: "#{SiteConfig.community_name} Report",
-        body: a_string_starting_with("Hi"),
-      )
-    end
-  end
-
   describe "#affected_email_details" do
     it "have proper subject and body" do
       expect(helper.affected_email_details).to include(