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

Remove: 現在使われていないドメインブロック無視設定のデッドコード (#476)

Browse source 
* Remove: 現在使われていないドメインブロック無視設定のデッドコード

* Refactoring

* Fix test
This commit is contained in:
KMY（雪あすか） 2024-01-19 08:39:58 +09:00 • committed by GitHub
parent 46161e5348
commit 989efcd78e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/tag_manager.rb
View file

@ -153,7 +153,7 @@ class ActivityPub::TagManager
end
def cc_for_misskey(status)
if (status.account.user&.setting_reject_unlisted_subscription && status.unlisted_visibility?) || (status.account.user&.setting_reject_public_unlisted_subscription && status.public_unlisted_visibility?)
if status.sending_maybe_compromised_privacy?
cc = cc_private_visibility(status)
cc << uri_for(status.reblog.account) if status.reblog?
return cc

13
app/lib/status_reach_finder.rb
View file

@ -192,19 +192,15 @@ class StatusReachFinder
end
def banned_domains_of_status(status)
if status.account.user&.setting_send_without_domain_blocks
[]
else
blocks = DomainBlock.where(domain: nil)
blocks = blocks.or(DomainBlock.where(reject_send_sensitive: true)) if (status.with_media? && status.sensitive) || status.spoiler_text?
blocks.pluck(:domain).uniq
end
blocks = DomainBlock.where(domain: nil)
blocks = blocks.or(DomainBlock.where(reject_send_sensitive: true)) if (status.with_media? && status.sensitive) || status.spoiler_text?
blocks.pluck(:domain).uniq
end
def banned_domains_for_misskey
return @banned_domains_for_misskey if defined?(@banned_domains_for_misskey)
return @banned_domains_for_misskey = [] if (!@status.account.user&.setting_reject_public_unlisted_subscription && !@status.account.user&.setting_reject_unlisted_subscription) || (!@status.public_unlisted_visibility? && !@status.unlisted_visibility?)
return @banned_domains_for_misskey = [] unless @status.sending_maybe_compromised_privacy? || (@status.reblog? && @status.reblog.sending_maybe_compromised_privacy?)
domains = banned_domains_for_misskey_of_status(@status)
domains += banned_domains_for_misskey_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
@ -213,7 +209,6 @@ class StatusReachFinder
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 sharkey)).pluck(:domain)
from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)