From 312adb772d0b7a18d35d262b2846563548a73d85 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 18 Sep 2019 03:20:26 -0500
Subject: [PATCH] views: refactor post flag and appeal reasons.

* Prefer partials over helpers.
* Add css classes to flag/appeal reason lists.
* Wrap dtext in span.prose container.
---
 .../moderator/dashboards_controller.rb        |  1 -
 app/helpers/post_appeals_helper.rb            | 22 --------------
 app/helpers/post_flags_helper.rb              | 29 -------------------
 .../dashboards/_activity_appeal.html.erb      |  4 +--
 .../moderator/post/queues/_post.html.erb      |  4 +--
 app/views/post_appeals/_reasons.html.erb      | 15 ++++++++++
 app/views/post_flags/_reasons.html.erb        | 21 ++++++++++++++
 .../posts/partials/show/_notices.html.erb     |  6 ++--
 8 files changed, 43 insertions(+), 59 deletions(-)
 delete mode 100644 app/helpers/post_appeals_helper.rb
 delete mode 100644 app/helpers/post_flags_helper.rb
 create mode 100644 app/views/post_appeals/_reasons.html.erb
 create mode 100644 app/views/post_flags/_reasons.html.erb

diff --git a/app/controllers/moderator/dashboards_controller.rb b/app/controllers/moderator/dashboards_controller.rb
index f466542d0..f256275a0 100644
--- a/app/controllers/moderator/dashboards_controller.rb
+++ b/app/controllers/moderator/dashboards_controller.rb
@@ -1,7 +1,6 @@
 module Moderator
   class DashboardsController < ApplicationController
     before_action :member_only
-    helper :post_flags, :post_appeals
 
     def show
       @dashboard = Moderator::Dashboard::Report.new(**search_params.to_h.symbolize_keys)
diff --git a/app/helpers/post_appeals_helper.rb b/app/helpers/post_appeals_helper.rb
deleted file mode 100644
index a19ebee73..000000000
--- a/app/helpers/post_appeals_helper.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module PostAppealsHelper
-  def post_appeal_reasons(post)
-    html = []
-    html << '<ul>'
-
-    post.appeals.each do |appeal|
-      reason = format_text(appeal.reason, inline: true)
-      user = link_to_user(appeal.creator)
-      if CurrentUser.is_moderator?
-        ip = "(#{link_to_ip(appeal.creator_ip_addr)})"
-      else
-        ip = ""
-      end
-      time = time_ago_in_words_tagged(appeal.created_at)
-
-      html << "<li>#{reason} - #{user} #{ip} #{time}</li>"
-    end
-
-    html << '</ul>'
-    html.join("\n").html_safe
-  end
-end
diff --git a/app/helpers/post_flags_helper.rb b/app/helpers/post_flags_helper.rb
deleted file mode 100644
index 58b80523c..000000000
--- a/app/helpers/post_flags_helper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module PostFlagsHelper
-  def post_flag_reasons(post)
-    html = []
-    html << '<ul>'
-
-    post.flags.each do |flag|
-      html << '<li>'
-      html << format_text(flag.reason, inline: true)
-
-      if CurrentUser.can_view_flagger_on_post?(flag)
-        html << " - #{link_to_user(flag.creator)}"
-        if CurrentUser.is_moderator?
-           html << " (#{link_to_ip(flag.creator_ip_addr)})"
-        end
-      end
-
-      html << ' - ' + time_ago_in_words_tagged(flag.created_at)
-
-      if flag.is_resolved?
-        html << ' <span class="resolved">RESOLVED</span>'
-      end
-
-      html << '</li>'
-    end
-
-    html << '</ul>'
-    html.join("\n").html_safe
-  end
-end
diff --git a/app/views/moderator/dashboards/_activity_appeal.html.erb b/app/views/moderator/dashboards/_activity_appeal.html.erb
index 4d1423a07..0eccc60aa 100644
--- a/app/views/moderator/dashboards/_activity_appeal.html.erb
+++ b/app/views/moderator/dashboards/_activity_appeal.html.erb
@@ -14,8 +14,8 @@
       <tr>
         <td><%= PostPresenter.preview(post, show_deleted: true) %></td>
         <td><%= mod_link_to_user post.uploader, :negative %></td>
-        <td><%= post_flag_reasons(post) %></td>
-        <td><%= post_appeal_reasons(post) %></td>
+        <td><%= render "post_flags/reasons", flags: post.flags %></td>
+        <td><%= render "post_appeals/reasons", appeals: post.appeals %></td>
         <td><%= post.score %></td>
       </tr>
     <% end %>
diff --git a/app/views/moderator/post/queues/_post.html.erb b/app/views/moderator/post/queues/_post.html.erb
index 768c21e52..8a01d22d0 100644
--- a/app/views/moderator/post/queues/_post.html.erb
+++ b/app/views/moderator/post/queues/_post.html.erb
@@ -19,10 +19,10 @@
       </li>
       <li><strong>Uploader</strong>: <%= link_to_user(post.uploader) %> <%= time_ago_in_words_tagged(post.created_at) %></li>
       <% if post.is_flagged? %>
-        <li><strong>Flagged</strong>: <%= post_flag_reasons(post) %></li>
+        <li><strong>Flagged</strong>: <%= render "post_flags/reasons", flags: post.flags %></li>
       <% end %>
       <% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %>
-        <li><strong>Appeals</strong>: <%= post_appeal_reasons(post) %></li>
+        <li><strong>Appeals</strong>: <%= render "post_appeals/reasons", appeals: post.appeals %></li>
       <% end %>
       <li>
         <strong>Hidden</strong>: <%= render "post_disapprovals/compact_counts", :disapprovals => post.disapprovals, :post => post %>
diff --git a/app/views/post_appeals/_reasons.html.erb b/app/views/post_appeals/_reasons.html.erb
new file mode 100644
index 000000000..d5656d5f7
--- /dev/null
+++ b/app/views/post_appeals/_reasons.html.erb
@@ -0,0 +1,15 @@
+<ul class="post-appeal-reasons">
+  <% appeals.each do |appeal| %>
+    <li class="post-appeal-reason">
+      <span class="prose"><%= format_text(appeal.reason, inline: true) %></span>
+
+      - <%= link_to_user(appeal.creator) %>
+
+      <% if CurrentUser.is_moderator? %>
+        (<%= link_to_ip(appeal.creator_ip_addr) %>)
+      <% end %>
+
+      - <%= time_ago_in_words_tagged(appeal.created_at) %>
+    </li>
+  <% end %>
+</ul>
diff --git a/app/views/post_flags/_reasons.html.erb b/app/views/post_flags/_reasons.html.erb
new file mode 100644
index 000000000..3acfbd867
--- /dev/null
+++ b/app/views/post_flags/_reasons.html.erb
@@ -0,0 +1,21 @@
+<ul class="post-flag-reasons">
+  <% flags.each do |flag| %>
+    <li class="post-flag-reason">
+      <span class="prose"><%= format_text(flag.reason, inline: true) %></span>
+
+      <% if CurrentUser.can_view_flagger_on_post?(flag) %>
+        - <%= link_to_user(flag.creator) %>
+
+        <% if CurrentUser.is_moderator? %>
+          (<%= link_to_ip(flag.creator_ip_addr) %>)
+        <% end %>
+      <% end %>
+
+      - <%= time_ago_in_words_tagged(flag.created_at) %>
+
+      <% if flag.is_resolved? %>
+        <span class="resolved">RESOLVED</span>
+      <% end %>
+    </li>
+  <% end %>
+</ul>
diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb
index 8d2d334ab..af092d6aa 100644
--- a/app/views/posts/partials/show/_notices.html.erb
+++ b/app/views/posts/partials/show/_notices.html.erb
@@ -2,7 +2,7 @@
   <div class="post-notice post-notice-flagged">
     <p>This post was flagged for review (<%= link_to "learn more", wiki_pages_path(:title => "howto:flag") %>): </p>
 
-    <%= post_flag_reasons(post) %>
+    <%= render "post_flags/reasons", flags: post.flags %>
   </div>
 <% end %>
 
@@ -16,7 +16,7 @@
   <div class="post-notice post-notice-deleted">
     <% if post.flags.any? %>
       <p>This post was deleted for the following reasons: </p>
-      <%= post_flag_reasons(post) %>
+      <%= render "post_flags/reasons", flags: post.flags %>
     <% else %>
       <p>This post was deleted</p>
     <% end %>
@@ -50,7 +50,7 @@
 <% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %>
   <div class="post-notice post-notice-appealed">
     <p>This post was appealed:</p>
-    <%= post_appeal_reasons(post) %>
+    <%= render "post_appeals/reasons", appeals: post.appeals %>
   </div>
 <% end %>