From 54e20301462b381f27c50ed305abeedde1ace878 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 9 Jan 2025 10:08:39 -0500
Subject: [PATCH] Add `AccountWarning#appeal_eligible?` method (#33526)

---
 app/models/account_warning.rb                |  5 +++++
 app/models/appeal.rb                         |  4 +---
 app/policies/account_warning_policy.rb       |  2 +-
 spec/models/account_warning_spec.rb          | 14 ++++++++++++++
 spec/models/appeal_spec.rb                   |  2 +-
 spec/policies/account_warning_policy_spec.rb |  4 ++--
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 7aa474887..9058f73fb 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -27,6 +27,7 @@ class AccountWarning < ApplicationRecord
     suspend: 4_000,
   }, suffix: :action
 
+  APPEAL_WINDOW = 20.days
   RECENT_PERIOD = 3.months.freeze
 
   normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
@@ -49,6 +50,10 @@ class AccountWarning < ApplicationRecord
     overruled_at.present?
   end
 
+  def appeal_eligible?
+    created_at >= APPEAL_WINDOW.ago
+  end
+
   def to_log_human_identifier
     target_account.acct
   end
diff --git a/app/models/appeal.rb b/app/models/appeal.rb
index fafa75e69..6a75fec66 100644
--- a/app/models/appeal.rb
+++ b/app/models/appeal.rb
@@ -16,8 +16,6 @@
 #  updated_at             :datetime         not null
 #
 class Appeal < ApplicationRecord
-  MAX_STRIKE_AGE = 20.days
-
   TEXT_LENGTH_LIMIT = 2_000
 
   belongs_to :account
@@ -68,6 +66,6 @@ class Appeal < ApplicationRecord
   private
 
   def validate_time_frame
-    errors.add(:base, I18n.t('strikes.errors.too_late')) if strike.created_at < MAX_STRIKE_AGE.ago
+    errors.add(:base, I18n.t('strikes.errors.too_late')) unless strike.appeal_eligible?
   end
 end
diff --git a/app/policies/account_warning_policy.rb b/app/policies/account_warning_policy.rb
index 4f8df7420..976cae6c9 100644
--- a/app/policies/account_warning_policy.rb
+++ b/app/policies/account_warning_policy.rb
@@ -6,7 +6,7 @@ class AccountWarningPolicy < ApplicationPolicy
   end
 
   def appeal?
-    target? && record.created_at >= Appeal::MAX_STRIKE_AGE.ago
+    target? && record.appeal_eligible?
   end
 
   private
diff --git a/spec/models/account_warning_spec.rb b/spec/models/account_warning_spec.rb
index 37866ce3d..9fe2b331e 100644
--- a/spec/models/account_warning_spec.rb
+++ b/spec/models/account_warning_spec.rb
@@ -8,4 +8,18 @@ RSpec.describe AccountWarning do
       it { is_expected.to normalize(:text).from(nil).to('') }
     end
   end
+
+  describe '#appeal_eligible?' do
+    context 'when created too long ago' do
+      subject { Fabricate.build :account_warning, created_at: (described_class::APPEAL_WINDOW * 2).ago }
+
+      it { is_expected.to_not be_appeal_eligible }
+    end
+
+    context 'when created recently' do
+      subject { Fabricate.build :account_warning, created_at: (described_class::APPEAL_WINDOW - 2.days).ago }
+
+      it { is_expected.to be_appeal_eligible }
+    end
+  end
 end
diff --git a/spec/models/appeal_spec.rb b/spec/models/appeal_spec.rb
index 06775f5dd..d624e1494 100644
--- a/spec/models/appeal_spec.rb
+++ b/spec/models/appeal_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Appeal do
     it { is_expected.to validate_length_of(:text).is_at_most(described_class::TEXT_LENGTH_LIMIT) }
 
     context 'with a strike created too long ago' do
-      let(:strike) { Fabricate.build :account_warning, created_at: (described_class::MAX_STRIKE_AGE * 2).ago }
+      let(:strike) { Fabricate.build :account_warning, created_at: (AccountWarning::APPEAL_WINDOW * 2).ago }
 
       it { is_expected.to_not allow_values(strike).for(:strike).against(:base).on(:create) }
     end
diff --git a/spec/policies/account_warning_policy_spec.rb b/spec/policies/account_warning_policy_spec.rb
index 75142e207..260379488 100644
--- a/spec/policies/account_warning_policy_spec.rb
+++ b/spec/policies/account_warning_policy_spec.rb
@@ -31,11 +31,11 @@ RSpec.describe AccountWarningPolicy do
 
     context 'when account is target' do
       context 'when record is appealable' do
-        it { is_expected.to permit(account, AccountWarning.new(target_account_id: account.id, created_at: Appeal::MAX_STRIKE_AGE.ago + 1.hour)) }
+        it { is_expected.to permit(account, AccountWarning.new(target_account_id: account.id, created_at: AccountWarning::APPEAL_WINDOW.ago + 1.hour)) }
       end
 
       context 'when record is not appealable' do
-        it { is_expected.to_not permit(account, AccountWarning.new(target_account_id: account.id, created_at: Appeal::MAX_STRIKE_AGE.ago - 1.hour)) }
+        it { is_expected.to_not permit(account, AccountWarning.new(target_account_id: account.id, created_at: AccountWarning::APPEAL_WINDOW.ago - 1.hour)) }
       end
     end
   end