Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
This commit is contained in:
@@ -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?
|
||||
|
Reference in New Issue
Block a user