Fix Delete activity handling when the status has been reblogged (#4729)

signup-info-prompt
unarist 2017-08-29 05:08:11 +09:00 committed by Eugen Rochko
parent 7876aed134
commit 938cd2875b
2 changed files with 26 additions and 2 deletions

View File

@ -16,8 +16,8 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
private
def forward_for_reblogs(status)
ActivityPub::RawDistributionWorker.push_bulk(status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)) do |account|
[payload, account.id]
ActivityPub::RawDistributionWorker.push_bulk(status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)) do |account_id|
[payload, account_id]
end
end

View File

@ -25,4 +25,28 @@ RSpec.describe ActivityPub::Activity::Delete do
expect(Status.find_by(id: status.id)).to be_nil
end
end
context 'when the status has been reblogged' do
describe '#perform' do
subject { described_class.new(json, sender) }
let(:reblogger) { Fabricate(:account) }
let(:follower) { Fabricate(:account, username: 'follower', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
before do
stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
follower.follow!(reblogger)
Fabricate(:status, account: reblogger, reblog: status)
subject.perform
end
it 'deletes sender\'s status' do
expect(Status.find_by(id: status.id)).to be_nil
end
it 'sends delete activity to followers of rebloggers' do
# one for Delete original post, and one for Undo reblog (normal delivery)
expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.twice
end
end
end
end