if (!empty($targetEl)) {
$this->target = new ActivityObject($targetEl);
- } elseif (ActivityUtils::compareTypes($this->verb, array(ActivityVerb::FAVORITE))) {
+ } 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]);
}
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));
- $xs->element(ActivityContext::CONVERSATION, null, $this->context->conversation);
+ $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' => ActivityContext::CONVERSATION,
+ 'href' => $convattr['href']));
+ } else {
+ $convattr['ref'] = $this->context->conversation;
+ }
+ $xs->element(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