From 5e97866438ae486770be206bc82f219a5636bf40 Mon Sep 17 00:00:00 2001 From: KMY Date: Sun, 30 Apr 2023 21:39:09 +0900 Subject: [PATCH] Add checking reblog status local --- app/lib/status_reach_finder.rb | 2 +- app/policies/status_policy.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb index 56c3f6e49b..2e3a5f7fac 100644 --- a/app/lib/status_reach_finder.rb +++ b/app/lib/status_reach_finder.rb @@ -98,7 +98,7 @@ class StatusReachFinder return @banned_domains if @banned_domains domains = banned_domains_of_status(@status) - domains = domains + banned_domains_of_status(@status.reblog) if @status.reblog? + domains = domains + banned_domains_of_status(@status.reblog) if @status.reblog? && @status.reblog.status.local? return @banned_domains = domains end diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb index c67739eb5d..58784cd48f 100644 --- a/app/policies/status_policy.rb +++ b/app/policies/status_policy.rb @@ -101,10 +101,10 @@ class StatusPolicy < ApplicationPolicy end def server_blocking_domain? - if record.reblog? - server_blocking_domain_of_status(record) || server_blocking_domain_of_status(record.reblog) + if record.reblog? && record.reblog.local? + server_blocking_domain_of_status?(record) || server_blocking_domain_of_status?(record.reblog) else - server_blocking_domain_of_status(record) + server_blocking_domain_of_status?(record) end end