diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb index fdded98440..c8cf16f822 100644 --- a/app/lib/activitypub/activity/follow.rb +++ b/app/lib/activitypub/activity/follow.rb @@ -103,7 +103,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity info = instance_info return false if info.nil? - %w(misskey calckey firefish meisskey cherrypick).include?(info.software) + %w(misskey calckey firefish meisskey cherrypick sharkey).include?(info.software) end def instance_info diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb index 8f20b94675..5ce2ff17a4 100644 --- a/app/lib/status_reach_finder.rb +++ b/app/lib/status_reach_finder.rb @@ -216,7 +216,7 @@ class StatusReachFinder return [] if status.public_searchability? return [] unless (status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) || (status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription) - from_info = InstanceInfo.where(software: %w(misskey calckey cherrypick)).pluck(:domain) + from_info = InstanceInfo.where(software: %w(misskey calckey cherrypick sharkey)).pluck(:domain) from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain) (from_info + from_domain_block).uniq end diff --git a/app/models/instance_info.rb b/app/models/instance_info.rb index dcdc0aacac..79c70fe06f 100644 --- a/app/models/instance_info.rb +++ b/app/models/instance_info.rb @@ -21,6 +21,7 @@ class InstanceInfo < ApplicationRecord calckey cherrypick meisskey + sharkey firefish renedon fedibird