Merge commit '2b11376411' into kb_migration

This commit is contained in:
KMY 2023-04-01 18:05:22 +09:00
commit ceec3a92cd
336 changed files with 4018 additions and 2492 deletions

View file

@ -149,9 +149,9 @@ class UpdateStatusService < BaseService
poll = @status.preloadable_poll
# If the poll had no expiration date set but now has, or now has a sooner
# expiration date, and people have voted, schedule a notification
# expiration date, schedule a notification
return unless poll.present? && poll.expires_at.present? && poll.votes.exists?
return unless poll.present? && poll.expires_at.present?
PollExpirationNotifyWorker.remove_from_scheduled(poll.id) if @previous_expires_at.present? && @previous_expires_at > poll.expires_at
PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id)