Revert #4616 (#4638)

diff --git a/app/serializers/activitypub/accept_follow_serializer.rb b/app/serializers/activitypub/accept_follow_serializer.rb
index f1c9d90238dc515ff48c3d1ed15631c9f2dc6525..3e23591a527492ee5b2869bf1b0293e9d2ffef21 100644 (file)
--- a/app/serializers/activitypub/accept_follow_serializer.rb
+++ b/app/serializers/activitypub/accept_follow_serializer.rb
@@ -3,7 +3,7 @@
 class ActivityPub::AcceptFollowSerializer < ActiveModel::Serializer
   attributes :id, :type, :actor
 
-  has_one :object, serializer: ActivityPub::InverseFollowSerializer
+  has_one :object, serializer: ActivityPub::FollowSerializer
 
   def id
     [ActivityPub::TagManager.instance.uri_for(object.target_account), '#accepts/follows/', object.id].join

diff --git a/app/serializers/activitypub/inverse_follow_serializer.rb b/app/serializers/activitypub/inverse_follow_serializer.rb
deleted file mode 100644 (file)
index 58e0eaa..0000000
--- a/app/serializers/activitypub/inverse_follow_serializer.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class ActivityPub::InverseFollowSerializer < ActiveModel::Serializer
-  attributes :id, :type, :actor
-  attribute :virtual_object, key: :object
-
-  def id
-    [ActivityPub::TagManager.instance.uri_for(object.target_account), '#follows/', object.id].join
-  end
-
-  def type
-    'Follow'
-  end
-
-  def actor
-    ActivityPub::TagManager.instance.uri_for(object.target_account)
-  end
-
-  def virtual_object
-    ActivityPub::TagManager.instance.uri_for(object.account)
-  end
-end

diff --git a/app/serializers/activitypub/reject_follow_serializer.rb b/app/serializers/activitypub/reject_follow_serializer.rb
index 9a98229143a76de4853137346222c8a441ba4aae..7814f4f5759d450b8a7d58c1b0a9345c767634f2 100644 (file)
--- a/app/serializers/activitypub/reject_follow_serializer.rb
+++ b/app/serializers/activitypub/reject_follow_serializer.rb
@@ -3,7 +3,7 @@
 class ActivityPub::RejectFollowSerializer < ActiveModel::Serializer
   attributes :id, :type, :actor
 
-  has_one :object, serializer: ActivityPub::InverseFollowSerializer
+  has_one :object, serializer: ActivityPub::FollowSerializer
 
   def id
     [ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join