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

Fix: #83 フレンドサーバーでの全投稿配送で、アカウントドメインブロックが無視される問題 (#102)

Browse source
This commit is contained in:
KMY（雪あすか） 2023-10-12 20:06:33 +09:00 • committed by GitHub
parent 2e7cdd0516
commit 12d068d38d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/status_reach_finder.rb
View file

@ -147,7 +147,7 @@ class StatusReachFinder
def friend_inboxes
if @status.public_visibility? || @status.public_unlisted_visibility? || (@status.unlisted_visibility? && (@status.public_searchability? || @status.public_unlisted_searchability?))
DeliveryFailureTracker.without_unavailable(FriendDomain.distributables.where(delivery_local: true).pluck(:inbox_url))
DeliveryFailureTracker.without_unavailable(FriendDomain.distributables.where(delivery_local: true).where.not(domain: AccountDomainBlock.where(account: @status.account).select(:domain)).pluck(:inbox_url))
else
[]
end
@ -155,7 +155,7 @@ class StatusReachFinder
def nolocal_friend_inboxes
if @status.public_visibility?
DeliveryFailureTracker.without_unavailable(FriendDomain.distributables.where(delivery_local: false).pluck(:inbox_url))
DeliveryFailureTracker.without_unavailable(FriendDomain.distributables.where(delivery_local: false).where.not(domain: AccountDomainBlock.where(account: @status.account).select(:domain)).pluck(:inbox_url))
else
[]
end

12
spec/lib/status_reach_finder_spec.rb
View file

@ -239,6 +239,18 @@ describe StatusReachFinder do
expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
end
end
context 'when distributable but domain blocked by account' do
before do
Fabricate(:account_domain_block, account: alice, domain: 'foo.bar')
Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', passive_state: :accepted, pseudo_relay: true)
end
it 'send status' do
expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
end
end
end
context 'when it contains distributable friend server' do