tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Status removal is broadcast to public/hashtag timelines too

Browse Source
This commit is contained in:
Eugen Rochko
2016-11-09 19:16:27 +01:00
parent 448ab18a20
commit c5e03a2e0d
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/channels/application_cable/channel.rb
View File

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