post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

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

Browse source
This commit is contained in:
KMY（雪あすか） 2023-12-11 14:02:44 +09:00 • committed by GitHub
parent 0e32b3e7e6
commit 709e19cd1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity/follow.rb
View file

@ -103,7 +103,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
info = instance_info info = instance_info
return false if info.nil? 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 end
def instance_info def instance_info

2
app/lib/status_reach_finder.rb
View file

@ -218,7 +218,7 @@ class StatusReachFinder
return [] if status.public_searchability? 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) 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_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)
(from_info + from_domain_block).uniq (from_info + from_domain_block).uniq
end end

1
app/models/instance_info.rb
View file

@ -21,6 +21,7 @@ class InstanceInfo < ApplicationRecord
calckey calckey
cherrypick cherrypick
meisskey meisskey
sharkey
firefish firefish
renedon renedon
fedibird fedibird