Add ActivityPub serializer for Undo of Announce (#4703)

fix-uploadarea-keyup-for-upstream
Eugen Rochko 2017-08-26 15:32:40 +02:00 committed by GitHub
parent 8ecfdd8795
commit 2a2698e450
3 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,19 @@
# frozen_string_literal: true
class ActivityPub::UndoAnnounceSerializer < ActiveModel::Serializer
attributes :id, :type, :actor
has_one :object, serializer: ActivityPub::ActivitySerializer
def id
[ActivityPub::TagManager.instance.uri_for(object.account), '#announces/', object.id, '/undo'].join
end
def type
'Undo'
end
def actor
ActivityPub::TagManager.instance.uri_for(object.account)
end
end

View File

@ -140,7 +140,7 @@ class BatchedRemoveStatusService < BaseService
@activity_json[status.id] = sign_json(status, ActiveModelSerializers::SerializableResource.new( @activity_json[status.id] = sign_json(status, ActiveModelSerializers::SerializableResource.new(
status, status,
serializer: ActivityPub::DeleteSerializer, serializer: status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer,
adapter: ActivityPub::Adapter adapter: ActivityPub::Adapter
).as_json) ).as_json)
end end

View File

@ -81,7 +81,7 @@ class RemoveStatusService < BaseService
def activity_json def activity_json
@activity_json ||= ActiveModelSerializers::SerializableResource.new( @activity_json ||= ActiveModelSerializers::SerializableResource.new(
@status, @status,
serializer: ActivityPub::DeleteSerializer, serializer: @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer,
adapter: ActivityPub::Adapter adapter: ActivityPub::Adapter
).as_json ).as_json
end end