Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Remove most behaviour disparities between blocks and mutes (#7231)

Browse source 
* Remove most behaviour disparities between blocks and mutes

The only differences between block and mute should be:

- Mutes can optionally NOT affect notifications
- Mutes should not be visible to the muted

Fix #7230
Fix #5713

* Do not allow boosting someone you blocked

Fix #7248

* Do not allow favouriting someone you blocked

* Fix nil error in StatusPolicy
This commit is contained in:
Eugen Rochko 2018-05-02 15:50:20 +02:00 • committed by GitHub
parent c5dcd7d836
commit f62539ce5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/policies/status_policy.rb
View file

@ -16,7 +16,11 @@ class StatusPolicy < ApplicationPolicy
end
def reblog?
!direct? && (!private? || owned?) && show?
!direct? && (!private? || owned?) && show? && !current_account&.blocking?(author)
end
def favourite?
show? && !current_account&.blocking?(author)
end
def destroy?