zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Extend AUTHORIZED_FETCH mode to user blocks as well (#11332) 

* Extend AUTHORIZED_FETCH mode to user blocks as well

* Move decision to deny access to StatusPolicy
This commit is contained in:
ThibG 2019-07-17 01:53:37 +02:00 committed by Eugen Rochko
parent 15ddabf95a
commit 5599caef49
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/policies/status_policy.rb
View File

@ -17,7 +17,7 @@ class StatusPolicy < ApplicationPolicy
elsif private?
owned? || following_author? || mention_exists?
else
current_account.nil? || !author_blocking?
current_account.nil? || (!author_blocking? && !author_blocking_domain?)
end
end
@ -63,6 +63,12 @@ class StatusPolicy < ApplicationPolicy
end
end
def author_blocking_domain?
return false if current_account.nil? || current_account.domain.nil?
author.blocking_domain?(current_account.domain)
end
def blocking_author?
return false if current_account.nil?