Merge remote-tracking branch 'parent/main' into upstream-20241113
This commit is contained in:
commit
910eafda63
177 changed files with 1625 additions and 659 deletions
|
@ -27,7 +27,7 @@ class Scheduler::ScheduledStatusesScheduler
|
|||
end
|
||||
|
||||
def due_statuses
|
||||
ScheduledStatus.where(scheduled_at: ..Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
|
||||
ScheduledStatus.where(scheduled_at: ..time_due_at)
|
||||
end
|
||||
|
||||
def expired_statuses
|
||||
|
@ -41,7 +41,7 @@ class Scheduler::ScheduledStatusesScheduler
|
|||
end
|
||||
|
||||
def due_announcements
|
||||
Announcement.unpublished.where('scheduled_at IS NOT NULL AND scheduled_at <= ?', Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
|
||||
Announcement.unpublished.where('scheduled_at IS NOT NULL AND scheduled_at <= ?', time_due_at)
|
||||
end
|
||||
|
||||
def unpublish_expired_announcements!
|
||||
|
@ -51,4 +51,8 @@ class Scheduler::ScheduledStatusesScheduler
|
|||
def expired_announcements
|
||||
Announcement.published.where('ends_at IS NOT NULL AND ends_at <= ?', Time.now.utc)
|
||||
end
|
||||
|
||||
def time_due_at
|
||||
Time.now.utc + ScheduledStatus::MINIMUM_OFFSET
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue