Status removal is broadcast to public/hashtag timelines too

1 files changed, 5 insertions, 2 deletions

diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
index d27b058fb..43adadbd9 100644
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@@ -4,14 +4,17 @@ module ApplicationCable
 
     def hydrate_status(encoded_message)
       message = ActiveSupport::JSON.decode(encoded_message)
-      status  = Status.find_by(id: message['id'])
+
+      return [nil, message] if message['type'] == 'delete'
+
+      status             = Status.find_by(id: message['id'])
       message['message'] = FeedManager.instance.inline_render(current_user.account, status)
 
       [status, message]
     end
 
     def filter?(status)
-      status.nil? || current_user.account.blocking?(status.account) || (status.reblog? && current_user.account.blocking?(status.reblog.account))
+      !status.nil? && (current_user.account.blocking?(status.account) || (status.reblog? && current_user.account.blocking?(status.reblog.account)))
     end
   end
 end