gearheads
/
mastodon
Archived
2
0
Fork 0

Fix issues when attempting to appeal an old strike (#17554)

* Display an error when an appeal could not be submitted

* Do not offer users to appeal old strikes

* Fix 500 error when trying to appeal a strike that is too old

* Avoid using an extra translatable string
gh/stable
Claire 2022-02-16 22:29:48 +01:00 committed by GitHub
parent aa86cf9557
commit ac99f586bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions

View File

@ -9,7 +9,8 @@ class Disputes::AppealsController < Disputes::BaseController
@appeal = AppealService.new.call(@strike, appeal_params[:text]) @appeal = AppealService.new.call(@strike, appeal_params[:text])
redirect_to disputes_strike_path(@strike), notice: I18n.t('disputes.strikes.appealed_msg') redirect_to disputes_strike_path(@strike), notice: I18n.t('disputes.strikes.appealed_msg')
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid => e
@appeal = e.record
render template: 'disputes/strikes/show' render template: 'disputes/strikes/show'
end end

View File

@ -16,6 +16,8 @@
# updated_at :datetime not null # updated_at :datetime not null
# #
class Appeal < ApplicationRecord class Appeal < ApplicationRecord
MAX_STRIKE_AGE = 20.days
belongs_to :account belongs_to :account
belongs_to :strike, class_name: 'AccountWarning', foreign_key: 'account_warning_id' belongs_to :strike, class_name: 'AccountWarning', foreign_key: 'account_warning_id'
belongs_to :approved_by_account, class_name: 'Account', optional: true belongs_to :approved_by_account, class_name: 'Account', optional: true
@ -53,6 +55,6 @@ class Appeal < ApplicationRecord
private private
def validate_time_frame def validate_time_frame
errors.add(:base, I18n.t('strikes.errors.too_late')) if Time.now.utc > (strike.created_at + 20.days) errors.add(:base, I18n.t('strikes.errors.too_late')) if strike.created_at < MAX_STRIKE_AGE.ago
end end
end end

View File

@ -6,7 +6,7 @@ class AccountWarningPolicy < ApplicationPolicy
end end
def appeal? def appeal?
target? target? && record.created_at >= Appeal::MAX_STRIKE_AGE.ago
end end
private private