From 47300a2ae9a51108fbf59a57cf5ab6e8867b54a6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 22 Feb 2010 01:21:34 -0800
Subject: Upgrade profile-based activity noun to have more complete set of
 profile fields

---
 classes/Profile.php | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'classes/Profile.php')

diff --git a/classes/Profile.php b/classes/Profile.php
index 6b396c8c3..4f67fc0bc 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -792,9 +792,11 @@ class Profile extends Memcached_DataObject
      * Returns an XML string fragment with profile information as an
      * Activity Streams noun object with the given element type.
      *
-     * Assumes that 'activity' namespace has been previously defined.
+     * Assumes that 'activity', 'georss', and 'poco' namespace has been
+     * previously defined.
      *
      * @param string $element one of 'actor', 'subject', 'object', 'target'
+     *
      * @return string
      */
     function asActivityNoun($element)
@@ -811,9 +813,46 @@ class Profile extends Memcached_DataObject
             'id',
             null,
             $this->getUri()
-            );
+        );
+
+        // title should contain fullname
         $xs->element('title', null, $this->getBestName());
 
+        // Portable Contacts stuff
+
+        if (isset($this->bio)) {
+
+            // XXX: Possible to use OpenSocial's aboutMe?
+
+            $xs->element('poco:note', null, $this->bio);
+        }
+
+        if (isset($this->homepage)) {
+
+            $xs->elementStart('poco:urls');
+            $xs->element('poco:value', null, $this->homepage);
+            $xs->element('poco:type', null, 'homepage');
+            $xs->element('poco:primary', null, 'true');
+            $xs->elementEnd('poco:urls');
+        }
+
+        if (isset($this->location)) {
+            $xs->elementStart('poco:address');
+            $xs->element('poco:formatted', null, $this->location);
+            $xs->elementEnd('poco:address');
+        }
+
+        if (isset($this->lat) && isset($this->lon)) {
+            $this->element(
+                'georss:point',
+                null,
+                (float)$this->lat . ' ' . (float)$this->lon
+            );
+        }
+
+        // XXX: Should we send all avatar sizes we have?  I think
+        // cliqset does -Z
+
         $avatar = $this->getAvatar(AVATAR_PROFILE_SIZE);
 
         $xs->element(
@@ -829,6 +868,8 @@ class Profile extends Memcached_DataObject
 
         $xs->elementEnd('activity:' . $element);
 
+        // XXX: Add people tags with <poco:tags> plural?
+
         return $xs->getString();
     }
 
-- 
cgit v1.2.3-54-g00ecf


From fae5a15a885b0c108efc4c5e28094f15ffbe8694 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 22 Feb 2010 07:40:20 -0500
Subject: add strongly-suggested link to Profile::asActivityNoun()

---
 classes/Profile.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'classes/Profile.php')

diff --git a/classes/Profile.php b/classes/Profile.php
index 1ba3281ff..faa6367b9 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -818,6 +818,10 @@ class Profile extends Memcached_DataObject
         // title should contain fullname
         $xs->element('title', null, $this->getBestName());
 
+        $xs->element('link', array('rel' => 'alternate',
+                                   'type' => 'text/html'),
+                     $this->profileurl);
+
         // Portable Contacts stuff
 
         if (isset($this->bio)) {
-- 
cgit v1.2.3-54-g00ecf


From b79d4ed6a1e61c600fdd382f3bdfde62aaa15b3d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 22 Feb 2010 07:43:12 -0500
Subject: add PoCo preferredUsername for nickname in Profile::asActivityNoun()

---
 classes/Profile.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'classes/Profile.php')

diff --git a/classes/Profile.php b/classes/Profile.php
index faa6367b9..7fb2b87bc 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -822,6 +822,8 @@ class Profile extends Memcached_DataObject
                                    'type' => 'text/html'),
                      $this->profileurl);
 
+        $xs->element('poco:preferredUsername', null, $this->nickname);
+
         // Portable Contacts stuff
 
         if (isset($this->bio)) {
-- 
cgit v1.2.3-54-g00ecf