From 90a4ac3bf5aaa378984acc2c8fc2c08a73872b4a Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sat, 15 May 2021 03:39:32 -0500
Subject: [PATCH] users: reword ban notice messages.

* Show the ban length instead of the ban expiration date in ban notices.
* Fix the ban notice to not say "Your account has been temporarily
  banned" when it's a permanent ban.
---
 app/helpers/application_helper.rb    | 13 ++++---------
 app/models/ban.rb                    |  6 +++---
 app/presenters/user_presenter.rb     |  8 --------
 app/views/bans/index.html.erb        |  2 +-
 app/views/bans/show.html.erb         |  2 +-
 app/views/layouts/default.html.erb   |  4 +---
 app/views/users/_ban_notice.html.erb | 16 +++++++++++-----
 app/views/users/_statistics.html.erb |  5 +++--
 8 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ddd15a408..7eb57a832 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -98,17 +98,12 @@ module ApplicationHelper
     tag.time content || datetime, datetime: datetime, title: time.to_formatted_s, **options
   end
 
-  def humanized_duration(from, to)
-    if to - from > 10.years
-      duration = "forever"
+  def humanized_duration(duration)
+    if duration >= 100.years
+      "forever"
     else
-      duration = distance_of_time_in_words(from, to)
+      duration.inspect
     end
-
-    datetime = from.iso8601 + "/" + to.iso8601
-    title = "#{from.strftime("%Y-%m-%d %H:%M")} to #{to.strftime("%Y-%m-%d %H:%M")}"
-
-    raw content_tag(:time, duration, datetime: datetime, title: title)
   end
 
   def humanized_number(number)
diff --git a/app/models/ban.rb b/app/models/ban.rb
index 310b79a45..7cf7bca53 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -64,7 +64,7 @@ class Ban < ApplicationRecord
   end
 
   def humanized_duration
-    ApplicationController.helpers.distance_of_time_in_words(created_at, expires_at)
+    ApplicationController.helpers.humanized_duration(duration)
   end
 
   def expired?
@@ -72,11 +72,11 @@ class Ban < ApplicationRecord
   end
 
   def create_feedback
-    user.feedback.create!(creator: banner, category: "negative", body: "Banned for #{humanized_duration}: #{reason}")
+    user.feedback.create!(creator: banner, category: "negative", body: "Banned #{humanized_duration}: #{reason}")
   end
 
   def create_ban_mod_action
-    ModAction.log(%{Banned <@#{user_name}> for #{humanized_duration}: #{reason}}, :user_ban)
+    ModAction.log(%{Banned <@#{user_name}> #{humanized_duration}: #{reason}}, :user_ban)
   end
 
   def create_unban_mod_action
diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb
index b6e29e3cf..a7e30acba 100644
--- a/app/presenters/user_presenter.rb
+++ b/app/presenters/user_presenter.rb
@@ -13,14 +13,6 @@ class UserPresenter
     user.created_at.strftime("%Y-%m-%d")
   end
 
-  def ban_reason
-    if user.is_banned?
-      "#{user.active_ban.reason}; expires #{user.active_ban.expires_at} (#{user.bans.count} bans total)"
-    else
-      nil
-    end
-  end
-
   def permissions
     permissions = []
 
diff --git a/app/views/bans/index.html.erb b/app/views/bans/index.html.erb
index 0da3a4e3f..eda335be9 100644
--- a/app/views/bans/index.html.erb
+++ b/app/views/bans/index.html.erb
@@ -15,7 +15,7 @@
         </div>
       <% end %>
       <% t.column "Duration" do |ban| %>
-        <%= humanized_duration(ban.created_at, ban.expires_at) %>
+        <%= humanized_duration(ban.duration) %>
       <% end %>
       <% t.column "Banner" do |ban| %>
         <%= link_to_user ban.banner %>
diff --git a/app/views/bans/show.html.erb b/app/views/bans/show.html.erb
index 8b27eeea7..bc6a222b5 100644
--- a/app/views/bans/show.html.erb
+++ b/app/views/bans/show.html.erb
@@ -6,7 +6,7 @@
     <h1>Show Ban</h1>
     <ul style="margin-bottom: 1em;">
       <li><strong>User</strong> <%= link_to_user(@ban.user) %></li>
-      <li><strong>Duration</strong> <%= humanized_duration(@ban.created_at, @ban.expires_at) %></li>
+      <li><strong>Duration</strong> <%= humanized_duration(@ban.duration) %></li>
       <li>
         <strong>Reason</strong>
         <div class="prose">
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index b170fd51e..0e9481426 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -81,9 +81,7 @@
       <%= render "users/upgrade_notice" %>
     <% end %>
 
-    <% if CurrentUser.user.is_banned? %>
-      <%= render "users/ban_notice" %>
-    <% end %>
+    <%= render "users/ban_notice" %>
 
     <% if params[:controller] != "dmails" && has_unread_dmails?(CurrentUser.user) %>
       <%= render "users/dmail_notice" %>
diff --git a/app/views/users/_ban_notice.html.erb b/app/views/users/_ban_notice.html.erb
index e423eb9c7..fcc9d8ccf 100644
--- a/app/views/users/_ban_notice.html.erb
+++ b/app/views/users/_ban_notice.html.erb
@@ -1,5 +1,11 @@
-<div class="notice notice-error notice-large" id="ban-notice">
-  <h2>Your account has been temporarily banned</h2>
-  <div>Reason: <span class="prose"><%= format_text CurrentUser.user.active_ban.reason, inline: true %></span></div>
-  <div>Your ban will expire in <%= time_ago_in_words(CurrentUser.user.active_ban.expires_at) %></div>
-</div>
+<% if CurrentUser.user.is_banned? %>
+  <% @active_ban = CurrentUser.user.active_ban %>
+
+  <div class="notice notice-error notice-large" id="ban-notice">
+    <h2>You have been banned <%= humanized_duration @active_ban.duration %></h2>
+
+    <div>
+      Reason: <span class="prose"><%= format_text @active_ban.reason, inline: true %></span>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb
index 93d318c7a..e76f2b571 100644
--- a/app/views/users/_statistics.html.erb
+++ b/app/views/users/_statistics.html.erb
@@ -89,12 +89,13 @@
         <td><%= presenter.permissions %></td>
       </tr>
 
-      <% if user.is_banned? %>
+      <% if user.is_banned? && user.active_ban.present? %>
         <tr>
           <th>Ban reason</th>
           <td>
             <span class="prose">
-              <%= format_text presenter.ban_reason, inline: true %>
+              <%= format_text user.active_ban.reason, inline: true %>
+              (banned <%= humanized_duration(user.active_ban.duration) %>)
             </span>
           </td>
         </tr>