Let activity objects write directly to activity's own outputter

2 files changed, 40 insertions, 49 deletions

diff --git a/lib/activity.php b/lib/activity.php
index c3a984a7b..3458c76b9 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -349,32 +349,7 @@ class Activity
         if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
 
             $obj = $this->objects[0];
-
-            $xs->element('id', null, $obj->id);
-            $xs->element('activity:object-type', null, $obj->type);
-            
-            if (!empty($obj->title)) {
-                $xs->element('title', null, $obj->title);
-            } else {
-                // XXX need a better default title
-                $xs->element('title', null, _('Post'));
-            }
-
-            if (!empty($obj->content)) {
-                $xs->element('content', array('type' => 'html'), $obj->content);
-            }
-            
-            if (!empty($obj->summary)) {
-                $xs->element('summary', null, $obj->summary);
-            }
-            
-            if (!empty($obj->link)) {
-                $xs->element('link', array('rel' => 'alternate',
-                                           'type' => 'text/html'),
-                             $obj->link);
-            }
-
-            // XXX: some object types might have other values here.
+			$obj->outputTo($xs, null);
 
         } else {
             $xs->element('id', null, $this->id);
@@ -408,12 +383,12 @@ class Activity
                 $xs->element('name', array(), $this->actor->title);
             }
             $xs->elementEnd('author');
-            $xs->raw($this->actor->asString('activity:actor'));
+            $this->actor->outputTo($xs, 'activity:actor');
         }
 
         if ($this->verb != ActivityVerb::POST || count($this->objects) != 1) {
             foreach($this->objects as $object) {
-                $xs->raw($object->asString());
+                $object->outputTo($xs, 'activity:object');
             }
         }
 
@@ -467,7 +442,7 @@ class Activity
         }
 
         if ($this->target) {
-            $xs->raw($this->target->asString('activity:target'));
+            $this->target->outputTo($xs, 'activity:target');
         }
 
         foreach ($this->categories as $cat) {
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 536e02133..61614935f 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -415,10 +415,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,19 +488,19 @@ 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);
-
-        $xs->element('activity:object-type', null, $this->type);
+        $xo->element('activity:object-type', null, $this->type);
 
-        $xs->element(self::ID, null, $this->id);
+        $xo->element(self::ID, null, $this->id);
 
         if (!empty($this->title)) {
-            $xs->element(
+            $xo->element(
                 self::TITLE,
                 null,
                 common_xml_safe_str($this->title)
@@ -508,7 +508,7 @@ class ActivityObject
         }
 
         if (!empty($this->summary)) {
-            $xs->element(
+            $xo->element(
                 self::SUMMARY,
                 null,
                 common_xml_safe_str($this->summary)
@@ -517,7 +517,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 +525,7 @@ class ActivityObject
         }
 
         if (!empty($this->link)) {
-            $xs->element(
+            $xo->element(
                 'link',
                 array(
                     'rel' => 'alternate',
@@ -540,7 +540,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 +554,7 @@ class ActivityObject
         }
 
         if (!empty($this->geopoint)) {
-            $xs->element(
+            $xo->element(
                 'georss:point',
                 null,
                 $this->geopoint
@@ -562,10 +562,26 @@ class ActivityObject
         }
 
         if (!empty($this->poco)) {
-            $xs->raw($this->poco->asString());
+            $xo->raw($this->poco->asString());
+        }
+
+        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();
     }