OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Filter block users and reblogs of them from public timeline

pull/91/head
Eugen Rochko 2016-10-09 15:05:07 +02:00
parent 22a8801dbc
commit 769b1ebbe0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/channels/public_channel.rb
View File

@ -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)