autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v3.0.0' into hometown-dev

Browse Source
This commit is contained in:
Darius Kazemi
2019-10-08 13:24:20 -07:00
parent bfd29a34eb 83d3e7733d
commit 228e0f0f6e
1012 changed files with 31176 additions and 15165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/policies/status_policy.rb
View File

@ -19,7 +19,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
@ -65,6 +65,12 @@ class StatusPolicy < ApplicationPolicy
end
end
def author_blocking_domain?
return false if current_account.nil? || current_account.domain.nil?
author.domain_blocking?(current_account.domain)
end
def blocking_author?
return false if current_account.nil?