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

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Evan Prodromou 2010-02-25 21:53:50 -05:00
commit 254e210763
2 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/activity.php
View File

@ -360,6 +360,25 @@ class ActivityUtils
return null; return null;
} }
static function getLinks(DOMNode $element, $rel, $type=null)
{
$links = $element->getElementsByTagnameNS(self::ATOM, self::LINK);
$out = array();
foreach ($links as $link) {
$linkRel = $link->getAttribute(self::REL);
$linkType = $link->getAttribute(self::TYPE);
if ($linkRel == $rel &&
(is_null($type) || $linkType == $type)) {
$out[] = $link;
}
}
return $out;
}
/** /**
* Gets the first child element with the given tag * Gets the first child element with the given tag
* *
@ -472,6 +491,24 @@ class AvatarLink
public $type; public $type;
public $size; public $size;
public $width; public $width;
public $height;
function __construct($element=null)
{
if ($element) {
// @fixme use correct namespaces
$this->url = $element->getAttribute('href');
$this->type = $element->getAttribute('type');
$width = $element->getAttribute('media:width');
if ($width != null) {
$this->width = intval($width);
}
$height = $element->getAttribute('media:height');
if ($height != null) {
$this->height = intval($height);
}
}
}
static function fromAvatar($avatar) static function fromAvatar($avatar)
{ {
@ -640,8 +677,10 @@ class ActivityObject
if ($this->type == self::PERSON || $this->type == self::GROUP) { if ($this->type == self::PERSON || $this->type == self::GROUP) {
$this->displayName = $this->title; $this->displayName = $this->title;
// @fixme we may have multiple avatars with different resolutions specified $avatars = ActivityUtils::getLinks($element, 'avatar');
$this->avatar = ActivityUtils::getLink($element, 'avatar'); foreach ($avatars as $link) {
$this->avatarLinks[] = new AvatarLink($link);
}
$this->poco = new PoCo($element); $this->poco = new PoCo($element);
} }

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

@ -912,8 +912,20 @@ class Ostatus_profile extends Memcached_DataObject
protected static function getActivityObjectAvatar($object, $hints=array()) protected static function getActivityObjectAvatar($object, $hints=array())
{ {
if ($object->avatar) { if ($object->avatarLinks) {
return $object->avatar; $best = false;
// Take the exact-size avatar, or the largest avatar, or the first avatar if all sizeless
foreach ($object->avatarLinks as $avatar) {
if ($avatar->width == AVATAR_PROFILE_SIZE && $avatar->height = AVATAR_PROFILE_SIZE) {
// Exact match!
$best = $avatar;
break;
}
if (!$best || $avatar->width > $best->width) {
$best = $avatar;
}
}
return $best->url;
} else if (array_key_exists('avatar', $hints)) { } else if (array_key_exists('avatar', $hints)) {
return $hints['avatar']; return $hints['avatar'];
} }