diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-10-30 05:54:55 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-10-30 05:54:55 +0000 |
| commit | 431c09bfbe07715a2a88846864179a419d72ab59 (patch) | |
| tree | 8b7772f64ea23cdf5e55dda9f92ff57a41adf3a4 /app/policies/status_policy.rb | |
| parent | 7c96ee7815c216d6ac3b748d7dd6959376d3914e (diff) | |
| parent | 7ec3f6022d5c991bb584c481a29c416e9f1c5438 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/policies/status_policy.rb')
| -rw-r--r-- | app/policies/status_policy.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb index fcf19db62..5e3282681 100644 --- a/app/policies/status_policy.rb +++ b/app/policies/status_policy.rb @@ -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? |