techhub/mastodon
2
0
Fork 0
Code Activity

Fix too many forwards (#5854)

Browse Source 
* Avoid sending explicit Undo->Announce when original deleted

* Do not forward a reply back to the server that sent it

* Deduplicate inboxes of rebloggers' followers for delete forwarding

* Adjust test

* Fix wrong class, bad SQL, wrong variable, outdated comment
This commit is contained in:
Eugen Rochko
2017-11-30 03:50:05 +01:00
committed by GitHub
parent dc1ebd45a3
commit 85e97ecab6
6 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spec/lib/activitypub/activity/delete_spec.rb
View File

@@ -1,8 +1,8 @@
require 'rails_helper'
RSpec.describe ActivityPub::Activity::Delete do
let(:sender) { Fabricate(:account, domain: 'example.com') }
let(:status) { Fabricate(:status, account: sender, uri: 'foobar') }
let(:sender) { Fabricate(:account, domain: 'example.com') }
let(:status) { Fabricate(:status, account: sender, uri: 'foobar') }
let(:json) do
{
@@ -30,13 +30,13 @@ RSpec.describe ActivityPub::Activity::Delete do
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') }
let!(:reblogger) { Fabricate(:account) }
let!(:follower) { Fabricate(:account, username: 'follower', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
let!(:reblog) { Fabricate(:status, account: reblogger, reblog: status) }
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
@@ -45,8 +45,7 @@ RSpec.describe ActivityPub::Activity::Delete do
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
expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
end
end
end