diff options
author | ThibG <thib@sitedethib.com> | 2020-04-06 21:44:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-06 21:44:34 +0200 |
commit | c47be5bd864a1f5244f35122ba7fae31a149c73d (patch) | |
tree | c8e9e95a36ffb2346e3168d00364e4b614bee92a /app/workers/publish_scheduled_announcement_worker.rb | |
parent | 6e426267a762f3cd1efa2c5fb120a13543567775 (diff) | |
parent | 9101254d0a70bc6f899c093f33300cffceb7c8ac (diff) |
Merge pull request #1312 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers/publish_scheduled_announcement_worker.rb')
-rw-r--r-- | app/workers/publish_scheduled_announcement_worker.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/app/workers/publish_scheduled_announcement_worker.rb b/app/workers/publish_scheduled_announcement_worker.rb index efca39d3d..1392efed0 100644 --- a/app/workers/publish_scheduled_announcement_worker.rb +++ b/app/workers/publish_scheduled_announcement_worker.rb @@ -5,15 +5,24 @@ class PublishScheduledAnnouncementWorker include Redisable def perform(announcement_id) - announcement = Announcement.find(announcement_id) + @announcement = Announcement.find(announcement_id) - announcement.publish! unless announcement.published? + refresh_status_ids! - payload = InlineRenderer.render(announcement, nil, :announcement) + @announcement.publish! unless @announcement.published? + + payload = InlineRenderer.render(@announcement, nil, :announcement) payload = Oj.dump(event: :announcement, payload: payload) FeedManager.instance.with_active_accounts do |account| redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}") end end + + private + + def refresh_status_ids! + @announcement.status_ids = Status.from_text(@announcement.text).map(&:id) + @announcement.save + end end |