Replace calls to FeedManager#inline_render and #broadcast

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 87865bfdc743ae936bf6f3e0916bdf96594c14a8..58d9fb1fc28ed9aeb2dc8db1b332cb6e27e77d65 100644 (file)
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -34,7 +34,7 @@ class FeedManager
       trim(timeline_type, account.id)
     end
 
-    PushUpdateWorker.perform_async(timeline_type, account.id, status.id)
+    PushUpdateWorker.perform_async(account.id, status.id)
   end
 
   def trim(type, account_id)

diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
new file mode 100644 (file)
index 0000000..8e04ad1
--- /dev/null
+++ b/app/lib/inline_renderer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class InlineRenderer
+  def self.render(status, current_account, template)
+    Rabl::Renderer.new(
+      template,
+      status,
+      view_path: 'app/views',
+      format: :json,
+      scope: InlineRablScope.new(current_account)
+    ).render
+  end
+end

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 106d257baf062adfecd61fad6ce653d9830f81e1..c63fcc1fe88a46569c952b16063f692536624aa5 100644 (file)
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -50,22 +50,22 @@ class FanOutOnWriteService < BaseService
   end
 
   def render_anonymous_payload(status)
-    @payload = FeedManager.instance.inline_render(nil, 'api/v1/statuses/show', status)
+    @payload = InlineRenderer.render(status, nil, 'api/v1/statuses/show')
   end
 
   def deliver_to_hashtags(status)
     Rails.logger.debug "Delivering status #{status.id} to hashtags"
 
     status.tags.pluck(:name).each do |hashtag|
-      FeedManager.instance.broadcast("hashtag:#{hashtag}", event: 'update', payload: @payload)
-      FeedManager.instance.broadcast("hashtag:#{hashtag}:local", event: 'update', payload: @payload) if status.account.local?
+      Redis.current.publish("hashtag:#{hashtag}", Oj.dump(event: :update, payload: @payload))
+      Redis.current.publish("hashtag:#{hashtag}:local", Oj.dump(event: :update, payload: @payload)) if status.account.local?
     end
   end
 
   def deliver_to_public(status)
     Rails.logger.debug "Delivering status #{status.id} to public timeline"
 
-    FeedManager.instance.broadcast(:public, event: 'update', payload: @payload)
-    FeedManager.instance.broadcast('public:local', event: 'update', payload: @payload) if status.account.local?
+    Redis.current.publish('public', Oj.dump(event: 'update', payload: @payload))
+    Redis.current.publish('public:local', Oj.dump(event: 'update', payload: @payload)) if status.account.local?
   end
 end

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 24486f2201a270098358c08368951c8d3fe64422..62508a0495e76b67deca71de7841bff92f66fa03 100644 (file)
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -50,7 +50,7 @@ class NotifyService < BaseService
   def create_notification
     @notification.save!
     return unless @notification.browserable?
-    FeedManager.instance.broadcast(@recipient.id, event: 'notification', payload: FeedManager.instance.inline_render(@recipient, 'api/v1/notifications/show', @notification))
+    Redis.current.publish(@recipient.id, Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, 'api/v1/notifications/show')))
   end
 
   def send_email

diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index cf1f432e4814923a1ec953c07cb80e606cb30397..e19fdd0303c35b73d6c9094f4864122b6b425491 100644 (file)
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -65,17 +65,17 @@ class RemoveStatusService < BaseService
       redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id)
     end
 
-    FeedManager.instance.broadcast(receiver.id, event: 'delete', payload: status.id)
+    Redis.current.publish(receiver.id, Oj.dump(event: :delete, payload: status.id))
   end
 
   def remove_from_hashtags(status)
     status.tags.each do |tag|
-      FeedManager.instance.broadcast("hashtag:#{tag.name}", event: 'delete', payload: status.id)
+      Redis.current.publish("hashtag:#{tag.name}", Oj.dump(event: :delete, payload: status.id))
     end
   end
 
   def remove_from_public(status)
-    FeedManager.instance.broadcast(:public, event: 'delete', payload: status.id)
+    Redis.current.publish('public', Oj.dump(event: :delete, payload: status.id))
   end
 
   def redis

diff --git a/app/workers/push_update_worker.rb b/app/workers/push_update_worker.rb
index 166a9b44956625fc25645de0b107e45b44f74693..fbcdcf634194cbb0b1b595a0a38a73e7656b0216 100644 (file)
--- a/app/workers/push_update_worker.rb
+++ b/app/workers/push_update_worker.rb
@@ -3,19 +3,12 @@
 class PushUpdateWorker
   include Sidekiq::Worker
 
-  def perform(timeline, account_id, status_id)
+  def perform(account_id, status_id)
     account = Account.find(account_id)
     status  = Status.find(status_id)
-    
-    message = Rabl::Renderer.new(
-      'api/v1/statuses/show', 
-      status, 
-      view_path: 'app/views', 
-      format: :json, 
-      scope: InlineRablScope.new(account)
-    )
+    message = InlineRenderer.render(status, account, 'api/v1/statuses/show')
 
-    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:#{account.id}", Oj.dump(event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i))
   rescue ActiveRecord::RecordNotFound
     true
   end