Use atomUri in Undo activity of Announce (#5376)

This allows deletion of reblogs which delivered before with OStatus URI.
This commit is contained in:
unarist 2017-10-14 21:42:09 +09:00 committed by Eugen Rochko
parent ae716a12e1
commit 8125fdc19f
3 changed files with 26 additions and 6 deletions

View File

@ -18,6 +18,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
def undo_announce def undo_announce
status = Status.find_by(uri: object_uri, account: @account) status = Status.find_by(uri: object_uri, account: @account)
status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
if status.nil? if status.nil?
delete_later!(object_uri) delete_later!(object_uri)

View File

@ -5,6 +5,7 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer
has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :announce? has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :announce?
attribute :proper_uri, key: :object, if: :announce? attribute :proper_uri, key: :object, if: :announce?
attribute :atom_uri, if: :announce?
def id def id
ActivityPub::TagManager.instance.activity_uri_for(object) ActivityPub::TagManager.instance.activity_uri_for(object)
@ -34,6 +35,10 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer
ActivityPub::TagManager.instance.uri_for(object.proper) ActivityPub::TagManager.instance.uri_for(object.proper)
end end
def atom_uri
OStatus::TagManager.instance.uri_for(object)
end
def announce? def announce?
object.reblog? object.reblog?
end end

View File

@ -25,9 +25,11 @@ RSpec.describe ActivityPub::Activity::Undo do
type: 'Announce', type: 'Announce',
actor: ActivityPub::TagManager.instance.uri_for(sender), actor: ActivityPub::TagManager.instance.uri_for(sender),
object: ActivityPub::TagManager.instance.uri_for(status), object: ActivityPub::TagManager.instance.uri_for(status),
atomUri: 'barbar',
} }
end end
context do
before do before do
Fabricate(:status, reblog: status, account: sender, uri: 'bar') Fabricate(:status, reblog: status, account: sender, uri: 'bar')
end end
@ -38,6 +40,18 @@ RSpec.describe ActivityPub::Activity::Undo do
end end
end end
context 'with atomUri' do
before do
Fabricate(:status, reblog: status, account: sender, uri: 'barbar')
end
it 'deletes the reblog by atomUri' do
subject.perform
expect(sender.reblogged?(status)).to be false
end
end
end
context 'with Block' do context 'with Block' do
let(:recipient) { Fabricate(:account) } let(:recipient) { Fabricate(:account) }