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

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

10
app/policies/status_policy.rb
View file

@ -143,14 +143,8 @@ class StatusPolicy < ApplicationPolicy
def server_blocking_domain_of_status?(status)
@domain_block ||= DomainBlock.find_by(domain: current_account&.domain)
if @domain_block
if status.account.user&.setting_send_without_domain_blocks
(@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) ||
(@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.setting_reject_unlisted_subscription)
else
(@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) ||
(@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.setting_reject_unlisted_subscription) ||
(@domain_block.reject_send_sensitive && ((status.with_media? && status.sensitive) || status.spoiler_text?))
end
(@domain_block.detect_invalid_subscription && status.sending_maybe_compromised_privacy?) ||
(@domain_block.reject_send_sensitive && status.sending_sensitive?)
else
false
end