From 844fe3924eed952b1ab9057fe9b3d089616fdc57 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 18 Apr 2016 16:09:36 +0200 Subject: [PATCH] put local id, href and such in ostatus:conversation element --- lib/activity.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/activity.php b/lib/activity.php index 3128088ca2..b733ff97aa 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -625,9 +625,20 @@ class Activity } 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