about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/channels/public_channel.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/channels/public_channel.rb b/app/channels/public_channel.rb
index 870b5cc2e..5d7fadc1d 100644
--- a/app/channels/public_channel.rb
+++ b/app/channels/public_channel.rb
@@ -5,7 +5,7 @@ class PublicChannel < ApplicationCable::Channel
       message = ActiveSupport::JSON.decode(encoded_message)
 
       status = Status.find_by(id: message['id'])
-      next if status.nil?
+      next if status.nil? || current_user.account.blocking?(status.account) || (status.reblog? && current_user.account.blocking?(status.reblog.account))
 
       message['message'] = FeedManager.instance.inline_render(current_user.account, status)