diff options
author | foxiehkins <foxiehkins@gmail.com> | 2017-04-07 14:01:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 14:01:20 +0100 |
commit | 41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (patch) | |
tree | 5cacec3a442a671990f972196fa90c90903e83cf /app/lib/feed_manager.rb | |
parent | ac1989d2c07b707699641987d62697103698393c (diff) | |
parent | 4e41cd9ab8f51120d558b70528b163c98993be53 (diff) |
Merge branch 'master' into master
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..58d9fb1fc 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(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 |