Merge branch 'activityatompub' into 0.9.x

1 files changed, 9 insertions, 0 deletions

diff --git a/classes/Subscription.php b/classes/Subscription.php
index 763e3835b..1d4f37929 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -253,6 +253,8 @@ class Subscription extends Memcached_DataObject
 
         $act->verb = ActivityVerb::FOLLOW;
 
+        // XXX: rationalize this with the URL
+
         $act->id   = TagURI::mint('follow:%d:%d:%s',
                                   $subscriber->id,
                                   $subscribed->id,
@@ -270,6 +272,13 @@ class Subscription extends Memcached_DataObject
         $act->actor     = ActivityObject::fromProfile($subscriber);
         $act->objects[] = ActivityObject::fromProfile($subscribed);
 
+        $url = common_local_url('AtomPubShowSubscription',
+                                array('subscriber' => $subscriber->id,
+                                      'subscribed' => $subscribed->id));
+
+        $act->selfLink = $url;
+        $act->editLink = $url;
+
         return $act;
     }