From 709e19cd1e3a6d4edc302a51cf5601ec4497d2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Mon, 11 Dec 2023 14:02:44 +0900 Subject: [PATCH] =?UTF-8?q?Add:=20Sharkey=E3=82=92=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=83=97=E5=88=A9=E7=94=A8=E5=8F=AF=E8=83=BD=E3=81=AA?= =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=AB=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=20(#345)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/activitypub/activity/follow.rb | 2 +- app/lib/status_reach_finder.rb | 2 +- app/models/instance_info.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb index fdded984402323..c8cf16f822c7be 100644 --- a/app/lib/activitypub/activity/follow.rb +++ b/app/lib/activitypub/activity/follow.rb @@ -103,7 +103,7 @@ def proxyable_software? 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 f588e4374ddc6d..92fc541ccbc762 100644 --- a/app/lib/status_reach_finder.rb +++ b/app/lib/status_reach_finder.rb @@ -218,7 +218,7 @@ def banned_domains_for_misskey_of_status(status) 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 dcdc0aacac0794..79c70fe06f1393 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