From e94800ced9884f20df73cd6325d0fefb33ac2236 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 22 Feb 2010 07:08:57 -0500
Subject: fix broken link in OpenID documentation

---
 plugins/OpenID/doc-src/openid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/OpenID/doc-src/openid b/plugins/OpenID/doc-src/openid
index c741e3674..f2dc610a5 100644
--- a/plugins/OpenID/doc-src/openid
+++ b/plugins/OpenID/doc-src/openid
@@ -3,7 +3,7 @@
 If you already have an account on %%site.name%%, you can [login](%%action.login%%) with your username and password as usual.
 To use OpenID in the future, you can [add an OpenID to your account](%%action.openidsettings%%) after you have logged in normally.
 
-There are many [Public OpenID providers](http://wiki.openid.net/Public_OpenID_providers), and you may already have an OpenID-enabled account on another service.
+There are many [Public OpenID providers](http://wiki.openid.net/OpenID-Providers), and you may already have an OpenID-enabled account on another service.
 
 * On wikis: If you have an account on an OpenID-enabled wiki, like [Wikitravel](http://wikitravel.org/), [wikiHow](http://www.wikihow.com/), [Vinismo](http://vinismo.com/), [AboutUs](http://aboutus.org/) or [Keiki](http://kei.ki/), you can log in to %%site.name%% by entering the **full URL** of your user page on that other wiki in the box above. For example, *http://kei.ki/en/User:Evan*.
 * [Yahoo!](http://openid.yahoo.com/) : If you have an account with Yahoo!, you can log in to this site by entering your Yahoo!-provided OpenID in the box above. Yahoo! OpenID URLs have the form *https://me.yahoo.com/yourusername*.
-- 
cgit v1.2.3-54-g00ecf


From 75fdef209245bf9424d4b995a42e4dfd980469d2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 22 Feb 2010 07:57:44 -0500
Subject: handle poco nicknames in Ostatus_profile

---
 plugins/OStatus/classes/Ostatus_profile.php | 4 +++-
 plugins/OStatus/lib/activity.php            | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 71885bcdc..0e12f8fc6 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -832,7 +832,9 @@ class Ostatus_profile extends Memcached_DataObject
 
     protected static function getActivityObjectNickname($object, $hints=array())
     {
-        // XXX: check whatever PoCo calls a nickname first
+        if (!empty($object->nickname)) {
+            return common_nicknamize($object->nickname);
+        }
 
         // Try the definitive ID
 
diff --git a/plugins/OStatus/lib/activity.php b/plugins/OStatus/lib/activity.php
index af83f8bc6..a26248f19 100644
--- a/plugins/OStatus/lib/activity.php
+++ b/plugins/OStatus/lib/activity.php
@@ -31,6 +31,12 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+class PoCo
+{
+    const NS = 'http://portablecontacts.net/spec/1.0';
+    const USERNAME = 'preferredUsername';
+}
+
 /**
  * Utilities for turning DOMish things into Activityish things
  *
@@ -319,7 +325,8 @@ class ActivityObject
             $this->displayName = $this->title;
 
             // @fixme we may have multiple avatars with different resolutions specified
-            $this->avatar = ActivityUtils::getLink($element, 'avatar');
+            $this->avatar   = ActivityUtils::getLink($element, 'avatar');
+            $this->nickname = ActivityUtils::childContent($element, PoCo::USERNAME, PoCo::NS);
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf