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

Merge remote-tracking branch 'parent/main' into upstream-20241113

Browse source
This commit is contained in:
KMY 2024-11-13 08:17:38 +09:00
commit 910eafda63
177 changed files with 1625 additions and 659 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/workers/scheduler/scheduled_statuses_scheduler.rb
View file

@ -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

2
app/workers/web/push_notification_worker.rb
View file

@ -13,6 +13,8 @@ class Web::PushNotificationWorker
@subscription = Web::PushSubscription.find(subscription_id)
@notification = Notification.find(notification_id)
return if @notification.updated_at < TTL.ago
# Polymorphically associated activity could have been deleted
# in the meantime, so we have to double-check before proceeding
return unless @notification.activity.present? && @subscription.pushable?(@notification)