Apparently only one atom:content is allowed

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

diff --git a/lib/activityobject.php b/lib/activityobject.php
index 5a42a1dfb3431b847fd1804df9666efdeb699fde..7af8a821950fece1516c7562f15e63650a44861f 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -438,6 +438,7 @@ class ActivityObject
             $object->type    = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
 
             $object->id      = $notice->uri;
+            $object->title   = 'New ' . ActivityObject::canonicalType($notice->object_type);
             $object->content = $notice->rendered;
             $object->link    = $notice->bestUrl();
 
@@ -459,10 +460,11 @@ class ActivityObject
             $object->title  = $profile->getBestName();
             $object->link   = $profile->profileurl;
 
-            $orig = $profile->getOriginalAvatar();
-
-            if (!empty($orig)) {
-                $object->avatarLinks[] = AvatarLink::fromAvatar($orig);
+            try {
+                $avatar = Avatar::getUploaded($profile);
+                $object->avatarLinks[] = AvatarLink::fromAvatar($avatar);
+            } catch (NoAvatarException $e) {
+                // Could not find an original avatar to link
             }
 
             $sizes = array(
@@ -473,27 +475,15 @@ class ActivityObject
 
             foreach ($sizes as $size) {
                 $alink  = null;
-                $avatar = $profile->getAvatar($size);
-
-                if (!empty($avatar)) {
+                try {
+                    $avatar = Avatar::byProfile($profile, $size);
                     $alink = AvatarLink::fromAvatar($avatar);
-                } else {
+                } catch (NoAvatarException $e) {
                     $alink = new AvatarLink();
                     $alink->type   = 'image/png';
                     $alink->height = $size;
                     $alink->width  = $size;
                     $alink->url    = Avatar::defaultImage($size);
-
-                    if ($size == AVATAR_PROFILE_SIZE) {
-                        // Hack for Twitter import: we don't have a 96x96 image,
-                        // but we do have a 73x73 image. For now, fake it with that.
-                        $avatar = $profile->getAvatar(73);
-                        if ($avatar) {
-                            $alink = AvatarLink::fromAvatar($avatar);
-                            $alink->height= $size;
-                            $alink->width = $size;
-                        }
-                    }
                 }
 
                 $object->avatarLinks[] = $alink;
@@ -506,7 +496,7 @@ class ActivityObject
 
             $object->poco = PoCo::fromProfile($profile);
 
-            if ($profile->getUser()) {
+            if ($profile->isLocal()) {
                 $object->extra[] = array('followers', array('url' => common_local_url('subscribers', array('nickname' => $profile->nickname))));
             }
 
@@ -516,7 +506,7 @@ class ActivityObject
         return $object;
     }
 
-    static function fromGroup($group)
+    static function fromGroup(User_group $group)
     {
         $object = new ActivityObject();
 
@@ -553,7 +543,7 @@ class ActivityObject
             $object->title   = $ptag->tag;
             $object->summary = $ptag->description;
             $object->link    = $ptag->homeUrl();
-            $object->owner   = Profile::staticGet('id', $ptag->tagger);
+            $object->owner   = Profile::getKV('id', $ptag->tagger);
             $object->poco    = PoCo::fromProfile($object->owner);
             Event::handle('EndActivityObjectFromPeopletag', array($ptag, &$object));
         }
@@ -733,17 +723,16 @@ class ActivityObject
             if ($this->type == ActivityObject::PERSON
                 || $this->type == ActivityObject::GROUP) {
 
-                foreach ($this->avatarLinks as $avatar) {
-                    $xo->element(
-                        'link', array(
-                            'rel'  => 'avatar',
-                            'type'         => $avatar->type,
-                            'media:width'  => $avatar->width,
-                            'media:height' => $avatar->height,
-                            'href' => $avatar->url
-                        ),
-                        null
-                    );
+                foreach ($this->avatarLinks as $alink) {
+                    $xo->element('link',
+                            array(
+                                'rel'          => 'avatar',
+                                'type'         => $alink->type,
+                                'media:width'  => $alink->width,
+                                'media:height' => $alink->height,
+                                'href'         => $alink->url,
+                                ),
+                            null);
                 }
             }
 
@@ -762,7 +751,7 @@ class ActivityObject
             // @fixme there's no way here to make a tree; elements can only contain plaintext
             // @fixme these may collide with JSON extensions
             foreach ($this->extra as $el) {
-                list($extraTag, $attrs, $content) = $el;
+                list($extraTag, $attrs, $content) = array_pad($el, 3, null);
                 $xo->element($extraTag, $attrs, $content);
             }
 
@@ -803,12 +792,6 @@ class ActivityObject
 
             // content (Add rendered version of the notice?)
 
-            // displayName
-
-            if ($this->title) {
-                $object['displayName'] = $this->title;
-            }
-
             // downstreamDuplicates
 
             // id
@@ -822,6 +805,9 @@ class ActivityObject
             if ($this->type == ActivityObject::PERSON
                 || $this->type == ActivityObject::GROUP) {
 
+                // displayName
+                $object['displayName'] = $this->title;
+
                 // XXX: Not sure what the best avatar is to use for the
                 // author's "image". For now, I'm using the large size.
 
@@ -869,7 +855,7 @@ class ActivityObject
             // summary
             $object['summary'] = $this->summary;
 
-            // content
+            // content, usually rendered HTML
             $object['content'] = $this->content;
 
             // published (probably don't need. Might be useful for repeats.)
@@ -888,7 +874,7 @@ class ActivityObject
             // @fixme text content from XML extensions will be lost
 
             foreach ($this->extra as $e) {
-                list($objectName, $props, $txt) = $e;
+                list($objectName, $props, $txt) = array_pad($e, 3, null);
                 if (!empty($objectName)) {
                     $parts = explode(":", $objectName);
                     if (count($parts) == 2 && $parts[0] == "statusnet") {