From 774b8661bc578c2e7eae7fff2be24466774fe858 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 19 Aug 2017 02:23:47 +0200
Subject: [PATCH] Revert #4616 (#4638)
---
.../activitypub/accept_follow_serializer.rb | 2 +-
.../activitypub/inverse_follow_serializer.rb | 22 -------------------
.../activitypub/reject_follow_serializer.rb | 2 +-
3 files changed, 2 insertions(+), 24 deletions(-)
delete mode 100644 app/serializers/activitypub/inverse_follow_serializer.rb
diff --git a/app/serializers/activitypub/accept_follow_serializer.rb b/app/serializers/activitypub/accept_follow_serializer.rb
index f1c9d9023..3e23591a5 100644
--- 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
index 58e0eaad0..000000000
--- 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 9a9822914..7814f4f57 100644
--- 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