From 5599caef49962ec62c8a557273f4eebb0f94767e Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 17 Jul 2019 01:53:37 +0200 Subject: Extend AUTHORIZED_FETCH mode to user blocks as well (#11332) * Extend AUTHORIZED_FETCH mode to user blocks as well * Move decision to deny access to StatusPolicy --- app/policies/status_policy.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/policies') diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb index 64a5111fc..118b79f3e 100644 --- a/app/policies/status_policy.rb +++ b/app/policies/status_policy.rb @@ -17,7 +17,7 @@ class StatusPolicy < ApplicationPolicy elsif private? owned? || following_author? || mention_exists? else - current_account.nil? || !author_blocking? + current_account.nil? || (!author_blocking? && !author_blocking_domain?) end end @@ -63,6 +63,12 @@ class StatusPolicy < ApplicationPolicy end end + def author_blocking_domain? + return false if current_account.nil? || current_account.domain.nil? + + author.blocking_domain?(current_account.domain) + end + def blocking_author? return false if current_account.nil? -- cgit From 87f4aea52ade76313530071db77bb3b441a08416 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 18 Jul 2019 00:48:26 +0200 Subject: Fix typo in StatusPolicy (#11344) --- app/policies/status_policy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/policies') diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb index 118b79f3e..3d4e50d37 100644 --- a/app/policies/status_policy.rb +++ b/app/policies/status_policy.rb @@ -66,7 +66,7 @@ class StatusPolicy < ApplicationPolicy def author_blocking_domain? return false if current_account.nil? || current_account.domain.nil? - author.blocking_domain?(current_account.domain) + author.domain_blocking?(current_account.domain) end def blocking_author? -- cgit