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

Remove firefish but add meisskey as misskey fork

Browse source
This commit is contained in:
KMY 2023-09-23 12:34:47 +09:00
parent b87c4b509e
commit 0513db12ab
5 changed files with 4 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,7 +559,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
info = instance_info
return false if info.nil?
%w(misskey calckey firefish).include?(info.software)
%w(misskey calckey meisskey).include?(info.software)
end
def misskey_searchability

2
app/lib/status_reach_finder.rb
View file

@ -159,7 +159,7 @@ class StatusReachFinder
def banned_domains_for_misskey_of_status(status)
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 firefish)).pluck(:domain)
from_info = InstanceInfo.where(software: %w(misskey calckey meisskey)).pluck(:domain)
from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)
(from_info + from_domain_block).uniq
end

2
app/services/activitypub/process_account_service.rb
View file

@ -305,7 +305,7 @@ class ActivityPub::ProcessAccountService < BaseService
info = instance_info
return false if info.nil?
%w(misskey calckey firefish).include?(info.software)
%w(misskey calckey meisskey).include?(info.software)
end
def subscribable_by

7
app/services/delivery_antenna_service.rb
View file

@ -121,12 +121,7 @@ class DeliveryAntennaService
when :public, :public_unlisted, :login, :limited
false
when :unlisted
if @status.local?
!@status.public_searchability?
else
info = InstanceInfo.find_by(domain: @status.account.domain)
info&.software == 'firefish' || !@status.public_searchability?
end
!@status.public_searchability?
else
true
end