luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix #6657 - Use target instead of origin in Remove activity (#6664)

Browse source
This commit is contained in:
Eugen Rochko 2018-03-07 03:54:46 +01:00 committed by GitHub
parent 913a38111f
commit e6520c0270
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity/remove.rb
View file

@ -2,7 +2,7 @@
class ActivityPub::Activity::Remove < ActivityPub::Activity class ActivityPub::Activity::Remove < ActivityPub::Activity
def perform def perform
return unless @json['origin'].present? && value_or_id(@json['origin']) == @account.featured_collection_url return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url
status = status_from_uri(object_uri) status = status_from_uri(object_uri)

4
app/serializers/activitypub/remove_serializer.rb
View file

@ -3,7 +3,7 @@
class ActivityPub::RemoveSerializer < ActiveModel::Serializer class ActivityPub::RemoveSerializer < ActiveModel::Serializer
include RoutingHelper include RoutingHelper
attributes :type, :actor, :origin attributes :type, :actor, :target
attribute :proper_object, key: :object attribute :proper_object, key: :object
def type def type
@ -18,7 +18,7 @@ class ActivityPub::RemoveSerializer < ActiveModel::Serializer
ActivityPub::TagManager.instance.uri_for(object) ActivityPub::TagManager.instance.uri_for(object)
end end
def origin def target
account_collection_url(object, :featured) account_collection_url(object, :featured)
end end
end end

2
spec/lib/activitypub/activity/remove_spec.rb
View file

@ -11,7 +11,7 @@ RSpec.describe ActivityPub::Activity::Remove do
type: 'Add', type: 'Add',
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),
origin: sender.featured_collection_url, target: sender.featured_collection_url,
}.with_indifferent_access }.with_indifferent_access
end end