post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix expiration unit bug

Browse source
This commit is contained in:
KMY 2023-03-21 13:02:22 +09:00
parent 16965de945
commit a1284940eb
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/services/update_status_expiration_service.rb
View file

@ -10,10 +10,12 @@ class UpdateStatusExpirationService < BaseService
expiration = status.text.scan(SCAN_EXPIRATION_RE).first
return if !expiration
expiration_num = expiration[0].to_f
expiration_option = expiration[1]
expiration_num = expiration[1].to_f
expiration_option = expiration[2]
base_time = status.created_at || Time.now.utc
raise Mastodon::ValidationError, 'Too many expiration value' if expiration_num >= 10000
expired_at = base_time + (expiration_option == 'd' ? expiration_num.days : expiration_option == 'h' ? expiration_num.hours : expiration_option == 's' ? expiration_num.seconds : expiration_num.minutes)
ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at)
end