diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-05 19:29:46 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-05 19:29:46 +0200 |
commit | d755ce96da00cee1c8e51204cf5ede79764f4fb9 (patch) | |
tree | a3215ee386cca3da0df7cafb91e06c1e841fa7af /app/lib/feed_manager.rb | |
parent | 29ffe1cad3f473c7b6c0b651d065f8ed9373d37e (diff) | |
parent | c9ebd5d19fccaabd1192f5e61537251c2c2d782e (diff) |
Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker
Diffstat (limited to 'app/lib/feed_manager.rb')
-rw-r--r-- | app/lib/feed_manager.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 88f6f4a46..87865bfdc 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -34,12 +34,7 @@ class FeedManager trim(timeline_type, account.id) end - broadcast(account.id, event: 'update', payload: inline_render(account, 'api/v1/statuses/show', status)) - end - - def broadcast(timeline_id, options = {}) - options[:queued_at] = (Time.now.to_f * 1000.0).to_i - redis.publish("timeline:#{timeline_id}", Oj.dump(options)) + PushUpdateWorker.perform_async(timeline_type, account.id, status.id) end def trim(type, account_id) @@ -81,10 +76,6 @@ class FeedManager end end - def inline_render(target_account, template, object) - Rabl::Renderer.new(template, object, view_path: 'app/views', format: :json, scope: InlineRablScope.new(target_account)).render - end - private def redis |