Merge pull request #2092 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 8 insertions, 0 deletions

diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 961a078b9..a181cd18d 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -26,6 +26,8 @@ class AccountWarning < ApplicationRecord
     suspend:                    4_000,
   }, _suffix: :action
 
+  before_validation :before_validate
+
   belongs_to :account, inverse_of: :account_warnings
   belongs_to :target_account, class_name: 'Account', inverse_of: :strikes
   belongs_to :report, optional: true
@@ -47,4 +49,10 @@ class AccountWarning < ApplicationRecord
   def to_log_human_identifier
     target_account.acct
   end
+
+  private
+
+  def before_validate
+    self.text = '' if text.blank?
+  end
 end