GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

ostatus:conversation element instead of link rel=""

Browse Source 
Mainly because the atom:link element requires a "web resource" but we
wish to supply a URI which might not be HTTP. We'll leave the old
atom:link element however since it's in the OStatus 1.0 Draft2 docs
and nothing newer has been released yet.
This commit is contained in:
Mikael Nordfeldth 2014-11-27 13:39:38 +01:00
parent a3ded586b6
commit 343291262e
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/activity.php
View File

@ -627,6 +627,14 @@ class Activity
if (!empty($this->context->conversation)) { if (!empty($this->context->conversation)) {
$xs->element('link', array('rel' => ActivityContext::CONVERSATION, $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
'href' => $this->context->conversation)); 'href' => $this->context->conversation));
$xs->element(ActivityContext::CONVERSATION, null, $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
'conversation', // tag (or the element name from ActivityContext::CONVERSATION)
null, // attributes
$this->context->conversation); // content
*/
} }
foreach ($this->context->attention as $attnURI=>$type) { foreach ($this->context->attention as $attnURI=>$type) {

11
lib/activitycontext.php
View File

@ -48,12 +48,14 @@ class ActivityContext
const INREPLYTO = 'in-reply-to'; const INREPLYTO = 'in-reply-to';
const REF = 'ref'; const REF = 'ref';
const HREF = 'href'; const HREF = 'href';
// OStatus element names with prefixes
const OBJECTTYPE = 'ostatus:object-type'; // FIXME: Undocumented! const OBJECTTYPE = 'ostatus:object-type'; // FIXME: Undocumented!
const CONVERSATION = 'ostatus:conversation';
const POINT = 'point'; const POINT = 'point';
const MENTIONED = 'mentioned'; const MENTIONED = 'mentioned';
const CONVERSATION = 'ostatus:conversation';
const ATTN_PUBLIC = 'http://activityschema.org/collection/public'; const ATTN_PUBLIC = 'http://activityschema.org/collection/public';
@ -72,7 +74,14 @@ class ActivityContext
$this->location = $this->getLocation($element); $this->location = $this->getLocation($element);
$convs = $element->getElementsByTagNameNS(self::OSTATUS, self::CONVERSATION);
foreach ($convs as $conv) {
$this->conversation = $conv->textContent;
}
if (empty($this->conversation)) {
// fallback to the atom:link rel="ostatus:conversation" element
$this->conversation = ActivityUtils::getLink($element, self::CONVERSATION); $this->conversation = ActivityUtils::getLink($element, self::CONVERSATION);
}
// Multiple attention links allowed // Multiple attention links allowed