foreach ($objectEls as $objectEl) {
// Special case for embedded activities
$objectType = ActivityUtils::childContent($objectEl, self::OBJECTTYPE, self::SPEC);
- if (!empty($objectType) && $objectType == ActivityObject::ACTIVITY) {
+ if ((!empty($objectType) && $objectType == ActivityObject::ACTIVITY) || $this->verb == ActivityVerb::SHARE) {
$this->objects[] = new Activity($objectEl);
} else {
$this->objects[] = new ActivityObject($objectEl);
if (!empty($targetEl)) {
$this->target = new ActivityObject($targetEl);
+ } elseif (ActivityUtils::compareVerbs($this->verb, array(ActivityVerb::FAVORITE))) {
+ // StatusNet didn't send a 'target' for their Favorite atom entries
+ $this->target = clone($this->objects[0]);
}
$this->summary = ActivityUtils::childContent($entry, 'summary');
// From APP. Might be useful.
- $this->selfLink = ActivityUtils::getLink($entry, 'self', 'application/atom+xml');
+ $this->selfLink = ActivityUtils::getSelfLink($entry);
$this->editLink = ActivityUtils::getLink($entry, 'edit', 'application/atom+xml');
}
if (!empty($this->link)) {
$xs->element('link', array('rel' => 'alternate',
- 'type' => 'text/html'),
- $this->link);
+ 'type' => 'text/html',
+ 'href' => $this->link));
}
}
}
if (!empty($this->context->conversation)) {
- $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
- 'href' => $this->context->conversation));
- }
-
- foreach ($this->context->attention as $attnURI) {
+ $convattr = [];
+ $conv = Conversation::getKV('uri', $this->context->conversation);
+ if ($conv instanceof Conversation) {
+ $convattr['href'] = $conv->getUrl();
+ $convattr['local_id'] = $conv->getID();
+ $convattr['ref'] = $conv->getUri();
+ $xs->element('link', array('rel' => 'ostatus:'.ActivityContext::CONVERSATION,
+ 'href' => $convattr['href']));
+ } else {
+ $convattr['ref'] = $this->context->conversation;
+ }
+ $xs->element('ostatus:'.ActivityContext::CONVERSATION,
+ $convattr,
+ $this->context->conversation);
+ /* Since we use XMLWriter we just use the previously hardcoded prefix for ostatus,
+ otherwise we should use something like this:
+ $xs->elementNS(array(ActivityContext::OSTATUS => 'ostatus'), // namespace
+ ActivityContext::CONVERSATION,
+ null, // attributes
+ $this->context->conversation); // content
+ */
+ }
+
+ foreach ($this->context->attention as $attnURI=>$type) {
$xs->element('link', array('rel' => ActivityContext::MENTIONED,
+ ActivityContext::OBJECTTYPE => $type, // FIXME: undocumented
'href' => $attnURI));
}