UX: suspend forever time period messages

app/controllers/session_controller.rb

@@ -589,13 +589,8 @@ def admin_not_allowed_from_ip_address(user)
   end
 
   def failed_to_login(user)
-    message = user.suspend_reason ? "login.suspended_with_reason" : "login.suspended"
-
     {
-      error: I18n.t(message,
-        date: I18n.l(user.suspended_till, format: :date_only),
-        reason: Rack::Utils.escape_html(user.suspend_reason)
-      ),
+      error: user.suspended_message,
       reason: 'suspended'
     }
   end

app/mailers/user_notifications.rb

@@ -153,27 +153,45 @@ def account_silenced(user, opts = nil)
 
     return unless user_history = opts[:user_history]
 
-    build_email(
-      user.email,
-      template: "user_notifications.account_silenced",
-      locale: user_locale(user),
-      reason: user_history.details,
-      silenced_till: I18n.l(user.silenced_till, format: :long)
-    )
+    if user.silenced_forever?
+      build_email(
+        user.email,
+        template: "user_notifications.account_silenced_forever",
+        locale: user_locale(user),
+        reason: user_history.details
+      )
+    else
+      build_email(
+        user.email,
+        template: "user_notifications.account_silenced",
+        locale: user_locale(user),
+        reason: user_history.details,
+        silenced_till: I18n.l(user.silenced_till, format: :long)
+      )
+    end
   end
 
   def account_suspended(user, opts = nil)
     opts ||= {}
 
     return unless user_history = opts[:user_history]
 
-    build_email(
-      user.email,
-      template: "user_notifications.account_suspended",
-      locale: user_locale(user),
-      reason: user_history.details,
-      suspended_till: I18n.l(user.suspended_till, format: :long)
-    )
+    if user.suspended_forever?
+      build_email(
+        user.email,
+        template: "user_notifications.account_suspended_forever",
+        locale: user_locale(user),
+        reason: user_history.details
+      )
+    else
+      build_email(
+        user.email,
+        template: "user_notifications.account_suspended",
+        locale: user_locale(user),
+        reason: user_history.details,
+        suspended_till: I18n.l(user.suspended_till, format: :long)
+      )
+    end
   end
 
   def account_exists(user, opts = {})

app/models/user.rb

@@ -958,6 +958,10 @@ def silenced_at
     silenced_record.try(:created_at) if silenced?
   end
 
+  def silenced_forever?
+    silenced_till > 100.years.from_now
+  end
+
   def suspend_record
     UserHistory.for(self, :suspend_user).order('id DESC').first
   end
@@ -974,6 +978,27 @@ def suspend_reason
     nil
   end
 
+  def suspended_message
+    return nil unless suspended?
+
+    message = "login.suspended"
+    if suspend_reason
+      if suspended_forever?
+        message = "login.suspended_with_reason_forever"
+      else
+        message = "login.suspended_with_reason"
+      end
+    end
+
+    I18n.t(message,
+           date: I18n.l(suspended_till, format: :date_only),
+           reason: Rack::Utils.escape_html(suspend_reason))
+  end
+
+  def suspended_forever?
+    suspended_till > 100.years.from_now
+  end
+
   # Use this helper to determine if the user has a particular trust level.
   # Takes into account admin, etc.
   def has_trust_level?(level)

config/locales/server.en.yml

@@ -2515,6 +2515,7 @@ en:
     reset_not_allowed_from_ip_address: "You can't request a password reset from that IP address."
     suspended: "You can't log in until %{date}."
     suspended_with_reason: "Account suspended until %{date}: %{reason}"
+    suspended_with_reason_forever: "Account suspended: %{reason}"
     errors: "%{errors}"
     not_available: "Not available. Try %{suggestion}?"
     something_already_taken: "Something went wrong, perhaps the username or email is already registered. Try the forgot password link."
@@ -3703,6 +3704,14 @@ en:
 
         Reason - %{reason}
 
+    account_suspended_forever:
+      title: "Account Suspended"
+      subject_template: "[%{email_prefix}] Your account has been suspended"
+      text_body_template: |
+        You have been suspended from the forum.
+
+        Reason - %{reason}
+
     account_silenced:
       title: "Account Silenced"
       subject_template: "[%{email_prefix}] Your account has been silenced"
@@ -3711,6 +3720,14 @@ en:
 
         Reason - %{reason}
 
+    account_silenced_forever:
+      title: "Account Silenced"
+      subject_template: "[%{email_prefix}] Your account has been silenced"
+      text_body_template: |
+        You have been silenced from the forum.
+
+        Reason - %{reason}
+
     account_exists:
       title: "Account already exists"
       subject_template: "[%{email_prefix}] Account already exists"

lib/auth/result.rb

@@ -111,8 +111,7 @@ def to_client_hash
     if user&.suspended?
       return {
         suspended: true,
-        suspended_message: I18n.t(user.suspend_reason ? "login.suspended_with_reason" : "login.suspended",
-                                   date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason)
+        suspended_message: user.suspended_message
       }
     end
 

spec/requests/session_controller_spec.rb

@@ -1401,11 +1401,25 @@ def login_with_sso_and_invite(invite_key = invite.invite_key)
             login: user.username, password: 'myawesomepassword'
           }
 
+          expected_message = I18n.t('login.suspended_with_reason',
+                                    date: I18n.l(user.suspended_till, format: :date_only),
+                                    reason: Rack::Utils.escape_html(user.suspend_reason))
           expect(response.status).to eq(200)
-          expect(response.parsed_body['error']).to eq(I18n.t('login.suspended_with_reason',
-            date: I18n.l(user.suspended_till, format: :date_only),
-            reason: Rack::Utils.escape_html(user.suspend_reason)
-          ))
+          expect(response.parsed_body['error']).to eq(expected_message)
+        end
+
+        it 'when suspended forever should return an error without suspended till date' do
+          user.suspended_till = 101.years.from_now
+          user.suspended_at = Time.now
+          user.save!
+          StaffActionLogger.new(user).log_user_suspend(user, "<strike>banned</strike>")
+
+          post "/session.json", params: {
+            login: user.username, password: 'myawesomepassword'
+          }
+
+          expected_message = I18n.t('login.suspended_with_reason_forever', reason: Rack::Utils.escape_html(user.suspend_reason))
+          expect(response.parsed_body['error']).to eq(expected_message)
         end
       end