gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add instance info support

Browse source
This commit is contained in:
KMY 2023-08-05 09:10:55 +09:00
parent 54f63a4be2
commit d29b71bfd9
13 changed files with 181 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -507,7 +507,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
SCAN_SEARCHABILITY_FEDIBIRD_RE = /searchable_by_(all_users|followers_only|reacted_users_only|nobody)/
def searchability
searchability_from_audience || searchability_from_bio || (marked_as_misskey_searchability? ? misskey_searchability : nil)
searchability_from_audience || searchability_from_bio || (misskey_software? ? misskey_searchability : nil)
end
def searchability_from_bio
@ -528,8 +528,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
searchability
end
def marked_as_misskey_searchability?
@marked_as_misskey_searchability ||= DomainBlock.detect_invalid_subscription?(@account.domain)
def instance_info
@instance_info ||= InstanceInfo.find_by(@account.domain)
end
def misskey_software?
info = instance_info
return DomainBlock.detect_invalid_subscription?(@account.domain) if info.nil?
%w(misskey calckey firefish).include?(info.software) || DomainBlock.detect_invalid_subscription?(@account.domain)
end
def misskey_searchability

9
app/lib/status_reach_finder.rb
View file

@ -153,9 +153,10 @@ class StatusReachFinder
end
def banned_domains_for_misskey_of_status(status)
blocks = DomainBlock.where(domain: nil)
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription
blocks.pluck(:domain).uniq
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_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)
(from_info + from_domain_block).uniq
end
end