tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix expired announcements being re-published (#12964)

Browse Source
This commit is contained in:
Eugen Rochko
2020-01-26 22:43:18 +01:00
committed by GitHub
parent 2f8c3c17ee
commit 401f32f9ee
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/workers/publish_scheduled_announcement_worker.rb
View File

@ -6,7 +6,8 @@ class PublishScheduledAnnouncementWorker
def perform(announcement_id)
announcement = Announcement.find(announcement_id)
announcement.update(published: true)
announcement.update(published: true, published_at: Time.now.utc, scheduled_at: nil) unless announcement.published?
payload = InlineRenderer.render(announcement, nil, :announcement)
payload = Oj.dump(event: :announcement, payload: payload)

2
app/workers/scheduler/scheduled_statuses_scheduler.rb
View File

@ -34,7 +34,7 @@ class Scheduler::ScheduledStatusesScheduler
end
def unpublish_expired_announcements!
expired_announcements.in_batches.update_all(published: false)
expired_announcements.in_batches.update_all(published: false, scheduled_at: nil)
end
def expired_announcements