public $source; // ActivitySource object representing 'home feed'
public $selfLink; // <link rel='self' type='application/atom+xml'>
public $editLink; // <link rel='edit' type='application/atom+xml'>
-
+ public $generator; // ActivityObject representing the generating application
/**
* Turns a regular old Atom <entry> into a magical activity
*
// content
$activity['content'] = $this->content;
- // generator <-- We could use this when we know a notice is created
- // locally. Or if we know the upstream Generator.
+ // generator
+
+ if (!empty($this->generator)) {
+ $activity['generator'] = $this->generator->asArray();
+ }
// icon <-- possibly a mini object representing verb?
if ($object instanceof Activity) {
// Sharing a post activity is more like sharing the original object
- if ($this->verb == 'share' && $object->verb == 'post') {
+ if (ActivityVerb::canonical($this->verb) == ActivityVerb::canonical(ActivityVerb::SHARE) &&
+ ActivityVerb::canonical($object->verb) == ActivityVerb::canonical(ActivityVerb::POST)) {
// XXX: Here's one for the obfuscation record books
- $object = $object->object;
+ $object = $object->objects[0];
}
}
$activity['verb'] = ActivityVerb::canonical($this->verb);
// url
- $activity['url'] = $this->id;
+ if ($this->link) {
+ $activity['url'] = $this->link;
+ }
/* Purely extensions hereafter */
}
if (!empty($this->context->conversation)) {
- $xs->element('link', array('rel' => 'ostatus:conversation',
+ $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
'href' => $this->context->conversation));
}
- foreach ($this->context->attention as $attnURI) {
- $xs->element('link', array('rel' => 'ostatus:attention',
- 'href' => $attnURI));
- $xs->element('link', array('rel' => 'mentioned',
+ foreach ($this->context->attention as $attnURI=>$type) {
+ $xs->element('link', array('rel' => ActivityContext::MENTIONED,
+ ActivityContext::OBJECTTYPE => $type, // FIXME: undocumented
'href' => $attnURI));
}
- // XXX: shoulda used ActivityVerb::SHARE
-
- if (!empty($this->context->forwardID)) {
- if (!empty($this->context->forwardUrl)) {
- $xs->element('ostatus:forward',
- array('ref' => $this->context->forwardID,
- 'href' => $this->context->forwardUrl));
- } else {
- $xs->element('ostatus:forward',
- array('ref' => $this->context->forwardID));
- }
- }
-
if (!empty($this->context->location)) {
$loc = $this->context->location;
$xs->element('georss:point', null, $loc->lat . ' ' . $loc->lon);