mastofe

commit: 7876aed134be16d04cf7d177299ae4fda690c219
parent: ce9a5f358ed1ea5039c1de0bc896dc60622852f7
Author: unarist <m.unarist@gmail.com>
Date:   Tue, 29 Aug 2017 04:38:59 +0900

Fix deletion of status which has been reblogged (#4728)


Diffstat:
M
app/services/remove_status_service.rb
4
++--
M
spec/services/remove_status_service_spec.rb
7
+++++++

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
@@ -55,8 +55,8 @@ class RemoveStatusService < BaseService
     end
 
     # ActivityPub
-    ActivityPub::DeliveryWorker.push_bulk(target_accounts.select(&:activitypub?).uniq(&:inbox_url)) do |inbox_url|
-      [signed_activity_json, @account.id, inbox_url]
+    ActivityPub::DeliveryWorker.push_bulk(target_accounts.select(&:activitypub?).uniq(&:inbox_url)) do |target_account|
+      [signed_activity_json, @account.id, target_account.inbox_url]
     end
   end
 
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
@@ -7,17 +7,20 @@ RSpec.describe RemoveStatusService do
   let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com', salmon_url: 'http://example.com/salmon') }
   let!(:jeff)   { Fabricate(:account) }
   let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
+  let!(:bill)   { Fabricate(:account, username: 'bill', protocol: :activitypub, domain: 'example2.com', inbox_url: 'http://example2.com/inbox') }
 
   before do
     stub_request(:post, 'http://example.com/push').to_return(status: 200, body: '', headers: {})
     stub_request(:post, 'http://example.com/salmon').to_return(status: 200, body: '', headers: {})
     stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
+    stub_request(:post, 'http://example2.com/inbox').to_return(status: 200)
 
     Fabricate(:subscription, account: alice, callback_url: 'http://example.com/push', confirmed: true, expires_at: 30.days.from_now)
     jeff.follow!(alice)
     hank.follow!(alice)
 
     @status = PostStatusService.new.call(alice, 'Hello @bob@example.com')
+    Fabricate(:status, account: bill, reblog: @status, uri: 'hoge')
     subject.call(@status)
   end
 
@@ -45,4 +48,8 @@ RSpec.describe RemoveStatusService do
       xml.match(TagManager::VERBS[:delete])
     }).to have_been_made.once
   end
+
+  it 'sends delete activity to rebloggers' do
+    expect(a_request(:post, 'http://example2.com/inbox')).to have_been_made
+  end
 end