* @link http://status.net/
*/
-if (!defined('STATUSNET')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
require_once(INSTALLDIR.'/lib/activitystreamjsondocument.php');
$this->type = self::PERSON; // XXX: is this fair?
}
- // start with <atom:title>
- $title = ActivityUtils::childHtmlContent($element, self::TITLE);
+ // Start with <poco::displayName>
+
+ $this->title = ActivityUtils::childContent($element, PoCo::DISPLAYNAME, PoCo::NS);
+
+ // try falling back to <atom:title>
+
+ if (empty($this->title)) {
+ $title = ActivityUtils::childHtmlContent($element, self::TITLE);
- if (!empty($title)) {
- $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
+ if (!empty($title)) {
+ $this->title = common_strip_html($title);
+ }
}
- // fall back to <atom:name>
+ // fall back to <atom:name> as a last resort
if (empty($this->title)) {
$this->title = $this->_childContent($element, self::NAME);
$this->content = ActivityUtils::getContent($element);
// We don't like HTML in our titles, although it's technically allowed
-
- $title = ActivityUtils::childHtmlContent($element, self::TITLE);
-
- $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
+ $this->title = common_strip_html(ActivityUtils::childHtmlContent($element, self::TITLE));
$this->source = $this->_getSource($element);
if (empty($this->id) && !empty($this->link)) { // fallback if there's no ID
$this->id = $this->link;
}
+
+ $els = $element->childNodes;
+ $out = array();
+
+ for ($i = 0; $i < $els->length; $i++) {
+ $link = $els->item($i);
+ if ($link->localName == ActivityUtils::LINK && $link->namespaceURI == ActivityUtils::ATOM) {
+ $attrs = array();
+ foreach ($link->attributes as $attrName=>$attrNode) {
+ $attrs[$attrName] = $attrNode->nodeValue;
+ }
+ $this->extra[] = [$link->localName,
+ $attrs,
+ $link->nodeValue];
+ }
+ }
}
// @todo FIXME: rationalize with Activity::_fromRssItem()
private function _fromRssItem($item)
{
+ if (empty($this->type)) {
+ $this->type = ActivityObject::NOTE;
+ }
+
$this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, Activity::RSS);
$contentEl = ActivityUtils::child($item, ActivityUtils::CONTENT, Activity::CONTENTNS);
if (!empty($guidEl)) {
$this->id = $guidEl->textContent;
- if ($guidEl->hasAttribute('isPermaLink')) {
+ if ($guidEl->hasAttribute('isPermaLink') && $guidEl->getAttribute('isPermaLink') != 'false') {
// overwrites <link>
$this->link = $this->id;
}
}
}
- static function fromNotice(Notice $notice)
- {
- $object = new ActivityObject();
-
- if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
-
- $object->type = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
-
- $object->id = $notice->uri;
- $object->title = 'New ' . self::canonicalType($object->type) . ' by ';
- try {
- $object->title .= $notice->getProfile()->getAcctUri();
- } catch (ProfileNoAcctUriException $e) {
- $object->title .= $e->profile->nickname;
- }
- $object->content = $notice->rendered;
- $object->link = $notice->getUrl();
-
- $object->extra[] = array('status_net', array('notice_id' => $notice->id));
-
- Event::handle('EndActivityObjectFromNotice', array($notice, &$object));
- }
-
- return $object;
- }
-
static function fromGroup(User_group $group)
{
$object = new ActivityObject();
$object->type = self::mimeTypeToObjectType($file->mimetype);
$object->id = TagURI::mint(sprintf("file:%d", $file->id));
- $object->link = common_local_url('attachment', array('attachment' => $file->id));
+ $object->link = $file->getAttachmentUrl();
if ($file->title) {
$object->title = $file->title;
switch (self::canonicalType($object->type)) {
case 'image':
- $object->largerImage = $file->url;
+ $object->largerImage = $file->getUrl();
break;
case 'video':
case 'audio':
- $object->stream = $file->url;
+ $object->stream = $file->getUrl();
break;
}
if (is_string($this->thumbnail)) {
$object['image'] = array('url' => $this->thumbnail);
} else {
- $object['image'] = array('url' => $this->thumbnail->url);
+ $object['image'] = array('url' => $this->thumbnail->getUrl());
if ($this->thumbnail->width) {
$object['image']['width'] = $this->thumbnail->width;
}