|
|
|
require 'rails_helper'
|
|
|
|
|
|
|
|
RSpec.describe ActivityPub::Activity::Block do
|
|
|
|
let(:sender) { Fabricate(:account) }
|
|
|
|
let(:recipient) { Fabricate(:account) }
|
|
|
|
|
|
|
|
let(:json) do
|
|
|
|
{
|
|
|
|
'@context': 'https://www.w3.org/ns/activitystreams',
|
|
|
|
id: 'foo',
|
|
|
|
type: 'Block',
|
|
|
|
actor: ActivityPub::TagManager.instance.uri_for(sender),
|
|
|
|
object: ActivityPub::TagManager.instance.uri_for(recipient),
|
|
|
|
}.with_indifferent_access
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the recipient does not follow the sender' do
|
|
|
|
describe '#perform' do
|
|
|
|
subject { described_class.new(json, sender) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
subject.perform
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a block from sender to recipient' do
|
|
|
|
expect(sender.blocking?(recipient)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
Fix not handling Undo on some activity types when they aren't inlined (#14346)
* Fix not handling Undo on some activity types when they aren't inlined
When receiving an Undo for a non-inlined activity, try looking it up in
database using the URI. The queries are ad-hoc because we don't have a global
index of object URIs, and not all activity types are stored in database with
an index on their URI.
Announces are just statuses, and have an index on URIs, so this check can
be done efficiently.
Accepts cannot be handled at all because we don't record their URI at any
point.
Follows don't have an index on URI, but they have an index on the issuing
account, which should make such queries largely manageable.
Likes don't have an index on URI, they have an index on the issuing account,
but the number of favs per account may be very high, so I decided not to
handle that.
Blocks don't have an index on URI, but they have an index on the issuing
account, which should make such queries largely manageable.
In all cases, if an Undo could not be handled properly, we call `delete_later!`
because that does not require us to know more than the URI of the undone
property.
* Add tests
* Make newer blocks overwrite older ones
Allows re-synchronizing block info by re-blocking and un-blocking again
when the original Undo Block has been lost.
5 years ago
|
|
|
context 'when the recipient is already blocked' do
|
|
|
|
before do
|
|
|
|
sender.block!(recipient, uri: 'old')
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#perform' do
|
|
|
|
subject { described_class.new(json, sender) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
subject.perform
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a block from sender to recipient' do
|
|
|
|
expect(sender.blocking?(recipient)).to be true
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'sets the uri to that of last received block activity' do
|
|
|
|
expect(sender.block_relationships.find_by(target_account: recipient).uri).to eq 'foo'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the recipient follows the sender' do
|
|
|
|
before do
|
|
|
|
recipient.follow!(sender)
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#perform' do
|
|
|
|
subject { described_class.new(json, sender) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
subject.perform
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a block from sender to recipient' do
|
|
|
|
expect(sender.blocking?(recipient)).to be true
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'ensures recipient is not following sender' do
|
|
|
|
expect(recipient.following?(sender)).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when a matching undo has been received first' do
|
|
|
|
let(:undo_json) do
|
|
|
|
{
|
|
|
|
'@context': 'https://www.w3.org/ns/activitystreams',
|
|
|
|
id: 'bar',
|
|
|
|
type: 'Undo',
|
|
|
|
actor: ActivityPub::TagManager.instance.uri_for(sender),
|
|
|
|
object: json,
|
|
|
|
}.with_indifferent_access
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
|
|
|
recipient.follow!(sender)
|
|
|
|
ActivityPub::Activity::Undo.new(undo_json, sender).perform
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#perform' do
|
|
|
|
subject { described_class.new(json, sender) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
subject.perform
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a block from sender to recipient' do
|
|
|
|
expect(sender.blocking?(recipient)).to be false
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'ensures recipient is not following sender' do
|
|
|
|
expect(recipient.following?(sender)).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|