Add: Sharkeyをスタンプ利用可能なサーバーに追加 (#345)

kmycode · Dec 11, 2023 · 709e19c · 709e19c
1 parent 0e32b3e
commit 709e19c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -21,6 +21,7 @@ class InstanceInfo < ApplicationRecord
     calckey
     cherrypick
     meisskey
+    sharkey
     firefish
     renedon
     fedibird