From 161c72d66d25bb8f5ff492e36a8521c701ab8afc Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Thu, 4 Jan 2018 02:08:57 +0900 Subject: Allow to dereference Follow object for ActivityPub (#5772) * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity --- app/serializers/activitypub/follow_serializer.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'app/serializers/activitypub') diff --git a/app/serializers/activitypub/follow_serializer.rb b/app/serializers/activitypub/follow_serializer.rb index 86c9992fe..eecd64701 100644 --- a/app/serializers/activitypub/follow_serializer.rb +++ b/app/serializers/activitypub/follow_serializer.rb @@ -1,11 +1,12 @@ # frozen_string_literal: true class ActivityPub::FollowSerializer < ActiveModel::Serializer - attributes :id, :type, :actor + attributes :type, :actor + attribute :id, if: :dereferencable? attribute :virtual_object, key: :object def id - [ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id].join + ActivityPub::TagManager.instance.uri_for(object) end def type @@ -19,4 +20,8 @@ class ActivityPub::FollowSerializer < ActiveModel::Serializer def virtual_object ActivityPub::TagManager.instance.uri_for(object.target_account) end + + def dereferencable? + object.respond_to?(:object_type) + end end -- cgit