diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:58:13 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-17 17:58:13 -0600 |
commit | 284e2cde81811d6289dde9542f9c987062f9e7c2 (patch) | |
tree | 739fe0417fce9b9f48f924815b436a50b324dfe9 /app/workers/push_update_worker.rb | |
parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
parent | 130aa90d5500f481c181a16012724b5f81d62616 (diff) |
Merge pull request #224 from yipdw/merge-upstream
Merge upstream (tootsuite/mastodon#5703)
Diffstat (limited to 'app/workers/push_update_worker.rb')
-rw-r--r-- | app/workers/push_update_worker.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/workers/push_update_worker.rb b/app/workers/push_update_worker.rb index 697cbd6a6..d76d73d96 100644 --- a/app/workers/push_update_worker.rb +++ b/app/workers/push_update_worker.rb @@ -3,12 +3,13 @@ class PushUpdateWorker include Sidekiq::Worker - def perform(account_id, status_id) - account = Account.find(account_id) - status = Status.find(status_id) - message = InlineRenderer.render(status, account, :status) + def perform(account_id, status_id, timeline_id = nil) + account = Account.find(account_id) + status = Status.find(status_id) + message = InlineRenderer.render(status, account, :status) + timeline_id = "timeline:#{account.id}" if timeline_id.nil? - Redis.current.publish("timeline:#{account.id}", Oj.dump(event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i)) + Redis.current.publish(timeline_id, Oj.dump(event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i)) rescue ActiveRecord::RecordNotFound true end |