diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
commit | c56a504d116d62fe669d15a270133d7c78dd61f1 (patch) | |
tree | 7400f3182f2a4ebd1606c37a1a5cad4cc95e443b /app/workers/publish_scheduled_announcement_worker.rb | |
parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
parent | c2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.
Diffstat (limited to 'app/workers/publish_scheduled_announcement_worker.rb')
-rw-r--r-- | app/workers/publish_scheduled_announcement_worker.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/workers/publish_scheduled_announcement_worker.rb b/app/workers/publish_scheduled_announcement_worker.rb index 4b2014e34..efca39d3d 100644 --- a/app/workers/publish_scheduled_announcement_worker.rb +++ b/app/workers/publish_scheduled_announcement_worker.rb @@ -6,12 +6,13 @@ class PublishScheduledAnnouncementWorker def perform(announcement_id) announcement = Announcement.find(announcement_id) - announcement.update(published: true) + + announcement.publish! unless announcement.published? payload = InlineRenderer.render(announcement, nil, :announcement) payload = Oj.dump(event: :announcement, payload: payload) - Account.joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).find_each do |account| + FeedManager.instance.with_active_accounts do |account| redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}") end end |