$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->extra[] = array('status_net', array('notice_id' => $notice->id));
+
Event::handle('EndActivityObjectFromNotice', array($notice, &$object));
}
$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;
$object->poco = PoCo::fromProfile($profile);
- if ($profile->getUser()) {
+ if ($profile->isLocal()) {
$object->extra[] = array('followers', array('url' => common_local_url('subscribers', array('nickname' => $profile->nickname))));
}
return $object;
}
- static function fromGroup($group)
+ static function fromGroup(User_group $group)
{
$object = new ActivityObject();
$object->title = $ptag->tag;
$object->summary = $ptag->description;
$object->link = $ptag->homeUrl();
- $object->owner = Profile::staticGet('id', $ptag->tagger);
+ $object->owner = Profile::getKV('id', $ptag->tagger);
$object->poco = PoCo::fromProfile($object->owner);
Event::handle('EndActivityObjectFromPeopletag', array($ptag, &$object));
}
$object->date = $source->created;
}
- $object->extras[] = array('status_net', array('source_code' => $source->code));
+ $object->extra[] = array('status_net', array('source_code' => $source->code));
Event::handle('EndActivityObjectFromNoticeSource', array($source, &$object));
}
return $object;
}
+ static function fromMessage(Message $message)
+ {
+ $object = new ActivityObject();
+
+ if (Event::handle('StartActivityObjectFromMessage', array($message, &$object))) {
+
+ $object->type = ActivityObject::NOTE;
+ $object->id = ($message->uri) ? $message->uri : (($message->url) ? $message->url : TagURI::mint(sprintf("message:%d", $message->id)));
+ $object->content = $message->rendered;
+ $object->date = $message->created;
+
+ if ($message->url) {
+ $object->link = $message->url;
+ } else {
+ $object->link = common_local_url('showmessage', array('message' => $message->id));
+ }
+
+ $object->extra[] = array('status_net', array('message_id' => $message->id));
+
+ Event::handle('EndActivityObjectFromMessage', array($message, &$object));
+ }
+
+ return $object;
+ }
+
function outputTo($xo, $tag='activity:object')
{
if (!empty($tag)) {
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);
}
}
// @fixme there's no way here to make a tree; elements can only contain plaintext
// @fixme these may collide with JSON extensions
foreach ($this->extra as $el) {
- list($extraTag, $attrs, $content) = $el;
+ list($extraTag, $attrs, $content) = array_pad($el, 3, null);
$xo->element($extraTag, $attrs, $content);
}
// 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") {
list($lat, $lon) = explode(' ', $this->geopoint);
- $object['location'] = array(
- 'objectType' => 'place',
- 'position' => sprintf("%+02.5F%+03.5F/", $lat, $lon),
- 'lat' => $lat,
- 'lon' => $lon
- );
+ if (!empty($lat) && !empty($lon)) {
+ $object['location'] = array(
+ 'objectType' => 'place',
+ 'position' => sprintf("%+02.5F%+03.5F/", $lat, $lon),
+ 'lat' => $lat,
+ 'lon' => $lon
+ );
- $loc = Location::fromLatLon($lat, $lon);
+ $loc = Location::fromLatLon((float)$lat, (float)$lon);
- if ($loc) {
- $name = $loc->getName();
+ if ($loc) {
+ $name = $loc->getName();
- if ($name) {
- $object['location']['displayName'] = $name;
- }
- $url = $loc->getURL();
+ if ($name) {
+ $object['location']['displayName'] = $name;
+ }
+ $url = $loc->getURL();
- if ($url) {
- $object['location']['url'] = $url;
+ if ($url) {
+ $object['location']['url'] = $url;
+ }
}
}
}
projects / quix0rs-gnu-social.git / blobdiff