X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivityobject.php;h=a69e1a1b42fe688cff0e22dfe76f29d196183bc7;hb=119d0f7dbab40f30170ba263de78d7e9cea984db;hp=f774dd3c8bc0abdf35d1d474e4cfbb45628358b7;hpb=8eb66467165e107d0c80c64f6c429fed1d1101d5;p=quix0rs-gnu-social.git

diff --git a/lib/activityobject.php b/lib/activityobject.php
index f774dd3c8b..a69e1a1b42 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -179,7 +179,7 @@ class ActivityObject
         if (empty($this->type)) {
             $this->type = self::PERSON; // XXX: is this fair?
         }
-        
+
         // start with <atom:title>
 
         $title = ActivityUtils::childHtmlContent($element, self::TITLE);
@@ -419,7 +419,7 @@ class ActivityObject
     static function fromNotice(Notice $notice)
     {
         $object = new ActivityObject();
-		
+
 		if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
 
 			$object->type    = ActivityObject::NOTE;
@@ -526,7 +526,7 @@ class ActivityObject
 
         return $object;
     }
-	
+
 	function outputTo($xo, $tag='activity:object')
 	{
 		if (!empty($tag)) {
@@ -546,7 +546,10 @@ class ActivityObject
         if (!empty($this->title)) {
             $name = common_xml_safe_str($this->title);
             if ($tag == 'author') {
-                $xo->element(self::NAME, null, $name);
+                // XXX: Backward compatibility hack -- atom:name should contain
+                // full name here, instead of nickname, i.e.: $name. Change
+                // this in the next version.
+                $xo->element(self::NAME, null, $this->poco->preferredUsername);
             } else {
                 $xo->element(self::TITLE, null, $name);
             }
@@ -630,4 +633,103 @@ class ActivityObject
 
         return $xs->getString();
     }
+
+    /*
+     * Returns an array based on this Activity Object suitable for
+     * encoding as JSON.
+     *
+     * @return array $object the activity object array
+     */
+
+    function asArray()
+    {
+        $object = array();
+
+        // XXX: attachedObjects are added by Activity
+
+        // displayName
+        $object['displayName'] = $this->title;
+
+        // TODO: downstreamDuplicates
+
+        // embedCode (used for video)
+
+        // id
+        //
+        // XXX: Should we use URL here? or a crazy tag URI?
+        $object['id'] = $this->id;
+
+        if ($this->type == ActivityObject::PERSON
+            || $this->type == ActivityObject::GROUP) {
+
+            // XXX: Not sure what the best avatar is to use for the
+            // author's "image". For now, I'm using the large size.
+
+            $avatarLarge      = null;
+            $avatarMediaLinks = array();
+
+            foreach ($this->avatarLinks as $a) {
+
+                // Make a MediaLink for every other Avatar
+                $avatar = new ActivityStreamsMediaLink(
+                    $a->url,
+                    $a->width,
+                    $a->height,
+                    $a->type,
+                    'avatar'
+                );
+
+                // Find the big avatar to use as the "image"
+                if ($a->height == AVATAR_PROFILE_SIZE) {
+                    $imgLink = $avatar;
+                }
+
+                $avatarMediaLinks[] = $avatar->asArray();
+            }
+
+            $object['avatarLinks'] = $avatarMediaLinks; // extension
+
+            // image
+            $object['image']  = $imgLink->asArray();
+        }
+
+        // objectType
+        //
+        // We can probably use the whole schema URL here but probably the
+        // relative simple name is easier to parse
+        $object['type'] = substr($this->type, strrpos($this->type, '/') + 1);
+
+        // summary
+        $object['summary'] = $this->summary;
+
+        // TODO: upstreamDuplicates
+
+        // url (XXX: need to put the right thing here...)
+        $object['url'] = $this->id;
+
+        /* Extensions */
+
+        foreach ($this->extra as $e) {
+            list($objectName, $props, $txt) = $e;
+            $object[$objectName] = $props;
+        }
+
+        // GeoJSON
+
+        if (!empty($this->geopoint)) {
+
+            list($lat, $long) = explode(' ', $this->geopoint);
+
+            $object['geopoint'] = array(
+                'type'        => 'Point',
+                'coordinates' => array($lat, $long)
+            );
+        }
+
+        if (!empty($this->poco)) {
+            $object['contact'] = $this->poco->asArray();
+        }
+
+        return array_filter($object);
+    }
 }