diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-24 11:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:28:25 +0200 |
| commit | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (patch) | |
| tree | ac3f4100e27a9341c32c15e07661af841c547ec0 /app/policies | |
| parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
| parent | ed8d06212f439b9fe2f170a6f43d6be6d586ff80 (diff) | |
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/policies')
| -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? |