$object->type = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
$object->id = $notice->uri;
+ $object->title = 'New ' . ActivityObject::canonicalType($object->type) . ' by ';
+ try {
+ $object->title .= $notice->getProfile()->getAcctUri();
+ } catch (ProfileNoAcctUriException $e) {
+ $object->title .= $e->profile->nickname;
+ }
$object->content = $notice->rendered;
$object->link = $notice->bestUrl();
$object->title = $profile->getBestName();
$object->link = $profile->profileurl;
- $orig = $profile->getOriginalAvatar();
-
- if (!empty($orig)) {
- $object->avatarLinks[] = AvatarLink::fromAvatar($orig);
+ try {
+ $avatar = Avatar::getUploaded($profile);
+ $object->avatarLinks[] = AvatarLink::fromAvatar($avatar);
+ } catch (NoAvatarException $e) {
+ // Could not find an original avatar to link
}
$sizes = array(
foreach ($sizes as $size) {
$alink = null;
- $avatar = $profile->getAvatar($size);
-
- if (!empty($avatar)) {
+ try {
+ $avatar = Avatar::byProfile($profile, $size);
$alink = AvatarLink::fromAvatar($avatar);
- } else {
+ } catch (NoAvatarException $e) {
$alink = new AvatarLink();
$alink->type = 'image/png';
$alink->height = $size;
$alink->width = $size;
$alink->url = Avatar::defaultImage($size);
-
- if ($size == AVATAR_PROFILE_SIZE) {
- // Hack for Twitter import: we don't have a 96x96 image,
- // but we do have a 73x73 image. For now, fake it with that.
- $avatar = $profile->getAvatar(73);
- if ($avatar) {
- $alink = AvatarLink::fromAvatar($avatar);
- $alink->height= $size;
- $alink->width = $size;
- }
- }
}
$object->avatarLinks[] = $alink;
return $object;
}
- static function fromGroup($group)
+ static function fromGroup(User_group $group)
{
$object = new ActivityObject();
if ($this->type == ActivityObject::PERSON
|| $this->type == ActivityObject::GROUP) {
- foreach ($this->avatarLinks as $avatar) {
- $xo->element(
- 'link', array(
- 'rel' => 'avatar',
- 'type' => $avatar->type,
- 'media:width' => $avatar->width,
- 'media:height' => $avatar->height,
- 'href' => $avatar->url
- ),
- null
- );
+ foreach ($this->avatarLinks as $alink) {
+ $xo->element('link',
+ array(
+ 'rel' => 'avatar',
+ 'type' => $alink->type,
+ 'media:width' => $alink->width,
+ 'media:height' => $alink->height,
+ 'href' => $alink->url,
+ ),
+ null);
}
}
// content (Add rendered version of the notice?)
- // displayName
-
- if ($this->title) {
- $object['displayName'] = $this->title;
- }
-
// downstreamDuplicates
// id
if ($this->type == ActivityObject::PERSON
|| $this->type == ActivityObject::GROUP) {
+ // displayName
+ $object['displayName'] = $this->title;
+
// XXX: Not sure what the best avatar is to use for the
// author's "image". For now, I'm using the large size.
// summary
$object['summary'] = $this->summary;
- // content
+ // content, usually rendered HTML
$object['content'] = $this->content;
// published (probably don't need. Might be useful for repeats.)
// @fixme text content from XML extensions will be lost
foreach ($this->extra as $e) {
- list($objectName, $props, $txt) = $e;
+ list($objectName, $props, $txt) = array_pad($e, 3, null);
if (!empty($objectName)) {
$parts = explode(":", $objectName);
if (count($parts) == 2 && $parts[0] == "statusnet") {