From c29ba8649dae6d7a3e8419487f06a40fe55646b2 Mon Sep 17 00:00:00 2001 From: KMY Date: Mon, 7 Aug 2023 22:06:41 +0900 Subject: [PATCH] Remove checking detect_invalid_subscription when process misskey posts --- app/lib/activitypub/activity/create.rb | 4 ++-- app/services/activitypub/process_account_service.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 2cc6be4d75..7febce7645 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -534,9 +534,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def misskey_software? info = instance_info - return DomainBlock.detect_invalid_subscription?(@account.domain) if info.nil? + return false if info.nil? - %w(misskey calckey firefish).include?(info.software) || DomainBlock.detect_invalid_subscription?(@account.domain) + %w(misskey calckey firefish).include?(info.software) end def misskey_searchability diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index c155015d7a..24a68a8c21 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -299,9 +299,9 @@ class ActivityPub::ProcessAccountService < BaseService def misskey_software? info = instance_info - return domain_block&.detect_invalid_subscription if info.nil? + return false if info.nil? - %w(misskey calckey firefish).include?(info.software) || domain_block&.detect_invalid_subscription + %w(misskey calckey firefish).include?(info.software) end def subscribable_by