From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 17 Aug 2017 20:15:37 +0000 (+0200)
Subject: Fix #4607 - Accept/reject activities use FollowRequest, which has inverse relations... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=116b8a63633cfdff83582f1cc40559c2e3c2ae80;p=mastodon.git

Fix #4607 - Accept/reject activities use FollowRequest, which has inverse relations (#4616)
---

diff --git a/app/serializers/activitypub/accept_follow_serializer.rb b/app/serializers/activitypub/accept_follow_serializer.rb
index 3e23591a5..f1c9d9023 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::FollowSerializer
+  has_one :object, serializer: ActivityPub::InverseFollowSerializer
 
   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
new file mode 100644
index 000000000..58e0eaad0
--- /dev/null
+++ b/app/serializers/activitypub/inverse_follow_serializer.rb
@@ -0,0 +1,22 @@
+# 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 7814f4f57..9a9822914 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::FollowSerializer
+  has_one :object, serializer: ActivityPub::InverseFollowSerializer
 
   def id
     [ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join