From afc808ca54a468998cbfe5f42f766ffbe47c2c6c Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 21 Mar 2023 17:47:27 +0900 Subject: [PATCH] Fix under 5 minutes expiration statuses --- app/services/update_status_expiration_service.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/services/update_status_expiration_service.rb b/app/services/update_status_expiration_service.rb index 02ea106dbf..4f60a12fbb 100644 --- a/app/services/update_status_expiration_service.rb +++ b/app/services/update_status_expiration_service.rb @@ -13,8 +13,13 @@ class UpdateStatusExpirationService < BaseService expiration_num = expiration[1].to_f expiration_option = expiration[2] base_time = status.created_at || Time.now.utc + due = expiration_option == 'd' ? expiration_num.days : + expiration_option == 'h' ? expiration_num.hours : + expiration_option == 's' ? expiration_num.seconds : expiration_num.minutes - 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) + expired_at = base_time + due + expired_status = ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at) + + RemoveExpiredStatusWorker.perform_at(expired_at, expired_status.id) if due < PostStatusService::MIN_SCHEDULE_OFFSET end end