GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

handle poco nicknames in Ostatus_profile

Browse Source
This commit is contained in:
Evan Prodromou 2010-02-22 07:57:44 -05:00
parent b79d4ed6a1
commit 75fdef2092
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -832,7 +832,9 @@ class Ostatus_profile extends Memcached_DataObject
protected static function getActivityObjectNickname($object, $hints=array()) 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 // Try the definitive ID

9
plugins/OStatus/lib/activity.php
View File

@ -31,6 +31,12 @@ if (!defined('STATUSNET')) {
exit(1); exit(1);
} }
class PoCo
{
const NS = 'http://portablecontacts.net/spec/1.0';
const USERNAME = 'preferredUsername';
}
/** /**
* Utilities for turning DOMish things into Activityish things * Utilities for turning DOMish things into Activityish things
* *
@ -319,7 +325,8 @@ class ActivityObject
$this->displayName = $this->title; $this->displayName = $this->title;
// @fixme we may have multiple avatars with different resolutions specified // @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);
} }
} }