From 317cfe19b4958c29898737fe40d55ea266b28e2a Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 16 Aug 2020 11:09:48 -0500
Subject: [PATCH] flags: only show current flag on flagged posts.

* Only show the current pending flag on flagged posts. Don't show old flags.

* Don't show both the "This post was flagged for review" and the "This
  post was flagged and is pending" notices.
---
 app/javascript/src/styles/base/040_colors.css |  2 -
 app/javascript/src/styles/specific/posts.scss |  1 -
 app/views/modqueue/_post.html.erb             |  2 +-
 app/views/post_flags/_reasons.html.erb        | 20 ++++----
 .../posts/partials/show/_notices.html.erb     | 49 ++++++++-----------
 5 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/app/javascript/src/styles/base/040_colors.css b/app/javascript/src/styles/base/040_colors.css
index 227c173bf..28eef86ec 100644
--- a/app/javascript/src/styles/base/040_colors.css
+++ b/app/javascript/src/styles/base/040_colors.css
@@ -104,7 +104,6 @@
   --post-parent-notice-background: var(--success-background-color);
   --post-child-notice-background: var(--warning-background-color);
   --post-pending-notice-background: #D8D8FC;
-  --post-flagged-notice-background: var(--error-background-color);
   --post-banned-notice-background: var(--error-background-color);
   --post-deleted-notice-background: var(--error-background-color);
   --post-resized-notice-background: #EED8FC;
@@ -382,7 +381,6 @@ body[data-current-user-theme="dark"] {
   --post-parent-notice-background: var(--green-0);
   --post-resized-notice-background: var(--purple-0);
   --post-pending-notice-background: var(--indigo-0);
-  --post-flagged-notice-background: var(--red-0);
   --post-deleted-notice-background: var(--red-0);
   --post-banned-notice-background: var(--red-0);
 
diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss
index 2312b8476..9540eb0fc 100644
--- a/app/javascript/src/styles/specific/posts.scss
+++ b/app/javascript/src/styles/specific/posts.scss
@@ -266,7 +266,6 @@ div#c-posts {
     &.post-notice-parent { background: var(--post-parent-notice-background); }
     &.post-notice-child { background: var(--post-child-notice-background); }
     &.post-notice-pending { background: var(--post-pending-notice-background); }
-    &.post-notice-flagged { background: var(--post-flagged-notice-background); }
     &.post-notice-banned { background: var(--post-banned-notice-background); }
     &.post-notice-deleted { background: var(--post-deleted-notice-background); }
     &.post-notice-resized { background: var(--post-resized-notice-background); }
diff --git a/app/views/modqueue/_post.html.erb b/app/views/modqueue/_post.html.erb
index e90967391..242d7f550 100644
--- a/app/views/modqueue/_post.html.erb
+++ b/app/views/modqueue/_post.html.erb
@@ -64,7 +64,7 @@
       <% if post.is_flagged? %>
         <span class="info">
           <strong>Flagged</strong>
-          <%= render "post_flags/reasons", flags: post.flags %>
+          <%= render "post_flags/reasons", flag: post.flags.select(&:pending?).last %>
         </span>
       <% end %>
 
diff --git a/app/views/post_flags/_reasons.html.erb b/app/views/post_flags/_reasons.html.erb
index e0664076d..e9f8f1327 100644
--- a/app/views/post_flags/_reasons.html.erb
+++ b/app/views/post_flags/_reasons.html.erb
@@ -1,13 +1,11 @@
-<ul class="post-flag-reasons list-bulleted">
-  <% flags.each do |flag| %>
-    <li class="post-flag-reason">
-      <span class="prose"><%= format_text(flag.reason, inline: true) %></span>
+<ul class="post-flag-reason list-bulleted">
+  <li>
+    <span class="prose"><%= format_text(flag.reason, inline: true) %></span>
 
-      <% if policy(flag).can_view_flagger? %>
-        - <%= link_to_user(flag.creator) %>
-      <% end %>
-
-      - <%= time_ago_in_words_tagged(flag.created_at) %>
-    </li>
-  <% end %>
+    <% if policy(flag).can_view_flagger? %>
+      (<%= link_to_user(flag.creator) %>, <%= time_ago_in_words_tagged(flag.created_at) %>)
+    <% else %>
+      (<%= time_ago_in_words_tagged(flag.created_at) %>)
+    <% end %>
+  </li>
 </ul>
diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb
index e1edff2b9..8a1e37a51 100644
--- a/app/views/posts/partials/show/_notices.html.erb
+++ b/app/views/posts/partials/show/_notices.html.erb
@@ -1,18 +1,29 @@
-<% if post.is_flagged? %>
-  <div class="notice notice-small post-notice post-notice-flagged">
-    <p>This post was flagged for review (<%= link_to_wiki "learn more", "howto:flag" %>): </p>
-
-    <%= render "post_flags/reasons", flags: post.flags %>
-  </div>
-<% end %>
-
 <% if post.is_banned? %>
   <div class="notice notice-small post-notice post-notice-banned">
     The artist requested removal of this page
   </div>
 <% end %>
 
-<% if post.is_deleted? && !post.is_appealed? %>
+<% if post.in_modqueue? %>
+  <div class="notice notice-small post-notice post-notice-pending">
+    <% if post.is_pending? %>
+      This post is pending approval. (<%= link_to_wiki "learn more", "about:mod_queue" %>)
+    <% elsif post.is_flagged? %>
+      This post was flagged and is pending approval (<%= link_to_wiki "learn more", "howto:flag" %>)
+      <%= render "post_flags/reasons", flag: post.flags.select(&:pending?).last %>
+    <% elsif post.is_appealed? %>
+      This post was appealed and is pending approval (<%= link_to_wiki "learn more", "about:mod_queue" %>)
+      <%= render "post_appeals/reasons", appeal: post.appeals.select(&:pending?).last %>
+    <% end %>
+
+    <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %>
+
+    <% if policy(PostDisapproval).create? && !post.disapproved_by?(CurrentUser.user) %>
+      <%= render "modqueue/quick_mod", post: post %>
+      <%= render "post_disapprovals/detailed_rejection_dialog" %>
+    <% end %>
+  </div>
+<% elsif post.is_deleted? %>
   <div class="notice notice-small post-notice post-notice-deleted">
     <% if post.flags.any? %>
       <p>This post was deleted for the following reasons: </p>
@@ -30,26 +41,6 @@
   </div>
 <% end %>
 
-<% if post.in_modqueue? %>
-  <div class="notice notice-small post-notice post-notice-pending">
-    <% if post.is_pending? %>
-      This post is pending approval. (<%= link_to_wiki "learn more", "about:mod_queue" %>)
-    <% elsif post.is_flagged? %>
-      This post was flagged and is pending approval (<%= link_to_wiki "learn more", "about:mod_queue" %>)
-    <% elsif post.is_appealed? %>
-      This post was appealed and is pending approval (<%= link_to_wiki "learn more", "about:mod_queue" %>)
-      <%= render "post_appeals/reasons", appeal: post.appeals.select(&:pending?).last %>
-    <% end %>
-
-    <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %>
-
-    <% if policy(PostDisapproval).create? && !post.disapproved_by?(CurrentUser.user) %>
-      <%= render "modqueue/quick_mod", post: post %>
-      <%= render "post_disapprovals/detailed_rejection_dialog" %>
-    <% end %>
-  </div>
-<% end %>
-
 <% if post.parent.present? %>
   <div class="notice notice-small post-notice post-notice-child">
     <%= render "posts/partials/show/parent_notice", parent: post.parent, children: @sibling_posts.to_a %>