Removing rel='ostatus:attention' in favor of Salmon's rel='mentioned'

[quix0rs-gnu-social.git] / lib / activity.php

diff --git a/lib/activity.php b/lib/activity.php
index ecae96b50ab0951f9e6fa2af387c11a42af2797c..870ece13ad5524bb6dcf2afac1e4da8193c5b07c 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -106,7 +106,7 @@ class Activity
     public $source;  // ActivitySource object representing 'home feed'
     public $selfLink; // <link rel='self' type='application/atom+xml'>
     public $editLink; // <link rel='edit' type='application/atom+xml'>
-
+    public $generator; // ActivityObject representing the generating application
     /**
      * Turns a regular old Atom <entry> into a magical activity
      *
@@ -366,8 +366,11 @@ class Activity
         // content
         $activity['content'] = $this->content;
 
-        // generator <-- We could use this when we know a notice is created
-        //               locally. Or if we know the upstream Generator.
+        // generator
+
+        if (!empty($this->generator)) {
+            $activity['generator'] = $this->generator->asArray();
+        }
 
         // icon <-- possibly a mini object representing verb?
 
@@ -386,9 +389,10 @@ class Activity
 
             if ($object instanceof Activity) {
                 // Sharing a post activity is more like sharing the original object
-                if ($this->verb == 'share' && $object->verb == 'post') {
+                if (ActivityVerb::canonical($this->verb) == ActivityVerb::canonical(ActivityVerb::SHARE) &&
+                    ActivityVerb::canonical($object->verb) == ActivityVerb::canonical(ActivityVerb::POST)) {
                     // XXX: Here's one for the obfuscation record books
-                    $object = $object->object;
+                    $object = $object->objects[0];
                 }
             }
 
@@ -479,7 +483,9 @@ class Activity
         $activity['verb'] = ActivityVerb::canonical($this->verb);
 
         // url
-        $activity['url'] = $this->id;
+        if ($this->link) {
+            $activity['url'] = $this->link;
+        }
 
         /* Purely extensions hereafter */
 
@@ -616,14 +622,12 @@ class Activity
             }
 
             if (!empty($this->context->conversation)) {
-                $xs->element('link', array('rel' => 'ostatus:conversation',
+                $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
                                            'href' => $this->context->conversation));
             }
 
             foreach ($this->context->attention as $attnURI) {
-                $xs->element('link', array('rel' => 'ostatus:attention',
-                                           'href' => $attnURI));
-                $xs->element('link', array('rel' => 'mentioned',
+                $xs->element('link', array('rel' => ActivityContext::MENTIONED,
                                            'href' => $attnURI));
             }