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

Merge tag 'v2.6.0rc1' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2018-10-23 08:32:55 +02:00
parent d42a06fc74 f468bfb830
commit fde9668bae
570 changed files with 11506 additions and 5693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/policies/status_policy.rb
View File

@ -14,7 +14,7 @@ class StatusPolicy < ApplicationPolicy
def show?
return false if local_only? && (current_account.nil? || !current_account.local?)
if direct?
if requires_mention?
owned? || mention_exists?
elsif private?
owned? || following_author? || mention_exists?
@ -24,7 +24,7 @@ class StatusPolicy < ApplicationPolicy
end
def reblog?
!direct? && (!private? || owned?) && show? && !blocking_author?
!requires_mention? && (!private? || owned?) && show? && !blocking_author?
end
def favourite?
@ -43,8 +43,8 @@ class StatusPolicy < ApplicationPolicy
private
def direct?
record.direct_visibility?
def requires_mention?
record.direct_visibility? || record.limited_visibility?
end
def owned?