Merge remote branch 'gitorious/testing' into testing

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

diff --git a/lib/activityobject.php b/lib/activityobject.php
index 536e0213347d0c4ec39261aeff78d9df61a03c74..f774dd3c8bc0abdf35d1d474e4cfbb45628358b7 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -105,6 +105,7 @@ class ActivityObject
     public $thumbnail;
     public $largerImage;
     public $description;
+    public $extra = array();
 
     /**
      * Constructor
@@ -171,10 +172,39 @@ class ActivityObject
 
     private function _fromAuthor($element)
     {
-        $this->type  = self::PERSON; // XXX: is this fair?
-        $this->title = $this->_childContent($element, self::NAME);
+        $this->type = $this->_childContent($element,
+                                           Activity::OBJECTTYPE,
+                                           Activity::SPEC);
+
+        if (empty($this->type)) {
+            $this->type = self::PERSON; // XXX: is this fair?
+        }
+        
+        // start with <atom:title>
+
+        $title = ActivityUtils::childHtmlContent($element, self::TITLE);
 
-        $this->id = $this->_childContent($element, self::URI);
+        if (!empty($title)) {
+            $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
+        }
+
+        // fall back to <atom:name>
+
+        if (empty($this->title)) {
+            $this->title = $this->_childContent($element, self::NAME);
+        }
+
+        // start with <atom:id>
+
+        $this->id = $this->_childContent($element, self::ID);
+
+        // fall back to <atom:uri>
+
+        if (empty($this->id)) {
+            $this->id = $this->_childContent($element, self::URI);
+        }
+
+        // fall further back to <atom:email>
 
         if (empty($this->id)) {
             $email = $this->_childContent($element, self::EMAIL);
@@ -183,6 +213,14 @@ class ActivityObject
                 $this->id = 'mailto:'.$email;
             }
         }
+
+        $this->link = ActivityUtils::getPermalink($element);
+
+        // fall finally back to <link rel=alternate>
+
+        if (empty($this->id) && !empty($this->link)) { // fallback if there's no ID
+            $this->id = $this->link;
+        }
     }
 
     private function _fromAtomEntry($element)
@@ -415,10 +453,10 @@ class ActivityObject
                        }
 
                        $sizes = array(
-                                                  AVATAR_PROFILE_SIZE,
-                                                  AVATAR_STREAM_SIZE,
-                                                  AVATAR_MINI_SIZE
-                                                  );
+                AVATAR_PROFILE_SIZE,
+                AVATAR_STREAM_SIZE,
+                AVATAR_MINI_SIZE
+            );
 
                        foreach ($sizes as $size) {
                                $alink  = null;
@@ -488,27 +526,34 @@ class ActivityObject
 
         return $object;
     }
+       
+       function outputTo($xo, $tag='activity:object')
+       {
+               if (!empty($tag)) {
+                       $xo->elementStart($tag);
+               }
 
-    function asString($tag='activity:object')
-    {
-        $xs = new XMLStringer(true);
-
-        $xs->elementStart($tag);
+        $xo->element('activity:object-type', null, $this->type);
 
-        $xs->element('activity:object-type', null, $this->type);
+        // <author> uses URI
 
-        $xs->element(self::ID, null, $this->id);
+        if ($tag == 'author') {
+            $xo->element(self::URI, null, $this->id);
+        } else {
+            $xo->element(self::ID, null, $this->id);
+        }
 
         if (!empty($this->title)) {
-            $xs->element(
-                self::TITLE,
-                null,
-                common_xml_safe_str($this->title)
-            );
+            $name = common_xml_safe_str($this->title);
+            if ($tag == 'author') {
+                $xo->element(self::NAME, null, $name);
+            } else {
+                $xo->element(self::TITLE, null, $name);
+            }
         }
 
         if (!empty($this->summary)) {
-            $xs->element(
+            $xo->element(
                 self::SUMMARY,
                 null,
                 common_xml_safe_str($this->summary)
@@ -517,7 +562,7 @@ class ActivityObject
 
         if (!empty($this->content)) {
             // XXX: assuming HTML content here
-            $xs->element(
+            $xo->element(
                 ActivityUtils::CONTENT,
                 array('type' => 'html'),
                 common_xml_safe_str($this->content)
@@ -525,7 +570,7 @@ class ActivityObject
         }
 
         if (!empty($this->link)) {
-            $xs->element(
+            $xo->element(
                 'link',
                 array(
                     'rel' => 'alternate',
@@ -540,7 +585,7 @@ class ActivityObject
             || $this->type == ActivityObject::GROUP) {
 
             foreach ($this->avatarLinks as $avatar) {
-                $xs->element(
+                $xo->element(
                     'link', array(
                         'rel'  => 'avatar',
                         'type'         => $avatar->type,
@@ -554,7 +599,7 @@ class ActivityObject
         }
 
         if (!empty($this->geopoint)) {
-            $xs->element(
+            $xo->element(
                 'georss:point',
                 null,
                 $this->geopoint
@@ -562,10 +607,26 @@ class ActivityObject
         }
 
         if (!empty($this->poco)) {
-            $xs->raw($this->poco->asString());
+            $this->poco->outputTo($xo);
+        }
+
+        foreach ($this->extra as $el) {
+            list($extraTag, $attrs, $content) = $el;
+            $xo->element($extraTag, $attrs, $content);
         }
 
-        $xs->elementEnd($tag);
+               if (!empty($tag)) {
+                       $xo->elementEnd($tag);
+               }
+
+        return;
+       }
+
+    function asString($tag='activity:object')
+    {
+        $xs = new XMLStringer(true);
+
+               $this->outputTo($xs, $tag);
 
         return $xs->getString();
     }