try to make a nickname from the user profile url before using the URI

This commit is contained in:
Evan Prodromou 2010-03-20 06:44:38 -05:00
parent db9e57f761
commit 51283a1b34

View File

@ -1322,9 +1322,19 @@ class Ostatus_profile extends Memcached_DataObject
return $hints['nickname']; return $hints['nickname'];
} }
// Try the definitive ID // Try the profile url (like foo.example.com or example.com/user/foo)
$nickname = self::nicknameFromURI($object->id); $profileUrl = ($object->link) ? $object->link : $hints['profileurl'];
if (!empty($profileUrl)) {
$nickname = self::nicknameFromURI($profileUrl);
}
// Try the URI (may be a tag:, http:, acct:, ...
if (empty($nickname)) {
$nickname = self::nicknameFromURI($object->id);
}
// Try a Webfinger if one was passed (way) down // Try a Webfinger if one was passed (way) down