X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Factivityobject.php;h=a69e1a1b42fe688cff0e22dfe76f29d196183bc7;hb=119d0f7dbab40f30170ba263de78d7e9cea984db;hp=536e0213347d0c4ec39261aeff78d9df61a03c74;hpb=c389386c8bddd2d3dd837c249aa6999a1a0383fb;p=quix0rs-gnu-social.git diff --git a/lib/activityobject.php b/lib/activityobject.php index 536e021334..a69e1a1b42 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -105,6 +105,7 @@ class ActivityObject public $thumbnail; public $largerImage; public $description; + public $extra = array(); /** * Constructor @@ -171,10 +172,39 @@ class ActivityObject private function _fromAuthor($element) { - $this->type = self::PERSON; // XXX: is this fair? - $this->title = $this->_childContent($element, self::NAME); + $this->type = $this->_childContent($element, + Activity::OBJECTTYPE, + Activity::SPEC); + + if (empty($this->type)) { + $this->type = self::PERSON; // XXX: is this fair? + } + + // start with + + $title = ActivityUtils::childHtmlContent($element, self::TITLE); + + if (!empty($title)) { + $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8'); + } + + // fall back to + + if (empty($this->title)) { + $this->title = $this->_childContent($element, self::NAME); + } - $this->id = $this->_childContent($element, self::URI); + // start with + + $this->id = $this->_childContent($element, self::ID); + + // fall back to + + if (empty($this->id)) { + $this->id = $this->_childContent($element, self::URI); + } + + // fall further back to if (empty($this->id)) { $email = $this->_childContent($element, self::EMAIL); @@ -183,6 +213,14 @@ class ActivityObject $this->id = 'mailto:'.$email; } } + + $this->link = ActivityUtils::getPermalink($element); + + // fall finally back to + + if (empty($this->id) && !empty($this->link)) { // fallback if there's no ID + $this->id = $this->link; + } } private function _fromAtomEntry($element) @@ -381,7 +419,7 @@ class ActivityObject static function fromNotice(Notice $notice) { $object = new ActivityObject(); - + if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) { $object->type = ActivityObject::NOTE; @@ -415,10 +453,10 @@ class ActivityObject } $sizes = array( - AVATAR_PROFILE_SIZE, - AVATAR_STREAM_SIZE, - AVATAR_MINI_SIZE - ); + AVATAR_PROFILE_SIZE, + AVATAR_STREAM_SIZE, + AVATAR_MINI_SIZE + ); foreach ($sizes as $size) { $alink = null; @@ -489,26 +527,36 @@ class ActivityObject return $object; } - function asString($tag='activity:object') - { - $xs = new XMLStringer(true); + function outputTo($xo, $tag='activity:object') + { + if (!empty($tag)) { + $xo->elementStart($tag); + } - $xs->elementStart($tag); + $xo->element('activity:object-type', null, $this->type); - $xs->element('activity:object-type', null, $this->type); + // uses URI - $xs->element(self::ID, null, $this->id); + if ($tag == 'author') { + $xo->element(self::URI, null, $this->id); + } else { + $xo->element(self::ID, null, $this->id); + } if (!empty($this->title)) { - $xs->element( - self::TITLE, - null, - common_xml_safe_str($this->title) - ); + $name = common_xml_safe_str($this->title); + if ($tag == 'author') { + // XXX: Backward compatibility hack -- atom:name should contain + // full name here, instead of nickname, i.e.: $name. Change + // this in the next version. + $xo->element(self::NAME, null, $this->poco->preferredUsername); + } else { + $xo->element(self::TITLE, null, $name); + } } if (!empty($this->summary)) { - $xs->element( + $xo->element( self::SUMMARY, null, common_xml_safe_str($this->summary) @@ -517,7 +565,7 @@ class ActivityObject if (!empty($this->content)) { // XXX: assuming HTML content here - $xs->element( + $xo->element( ActivityUtils::CONTENT, array('type' => 'html'), common_xml_safe_str($this->content) @@ -525,7 +573,7 @@ class ActivityObject } if (!empty($this->link)) { - $xs->element( + $xo->element( 'link', array( 'rel' => 'alternate', @@ -540,7 +588,7 @@ class ActivityObject || $this->type == ActivityObject::GROUP) { foreach ($this->avatarLinks as $avatar) { - $xs->element( + $xo->element( 'link', array( 'rel' => 'avatar', 'type' => $avatar->type, @@ -554,7 +602,7 @@ class ActivityObject } if (!empty($this->geopoint)) { - $xs->element( + $xo->element( 'georss:point', null, $this->geopoint @@ -562,11 +610,126 @@ class ActivityObject } if (!empty($this->poco)) { - $xs->raw($this->poco->asString()); + $this->poco->outputTo($xo); } - $xs->elementEnd($tag); + foreach ($this->extra as $el) { + list($extraTag, $attrs, $content) = $el; + $xo->element($extraTag, $attrs, $content); + } + + if (!empty($tag)) { + $xo->elementEnd($tag); + } + + return; + } + + function asString($tag='activity:object') + { + $xs = new XMLStringer(true); + + $this->outputTo($xs, $tag); return $xs->getString(); } + + /* + * Returns an array based on this Activity Object suitable for + * encoding as JSON. + * + * @return array $object the activity object array + */ + + function asArray() + { + $object = array(); + + // XXX: attachedObjects are added by Activity + + // displayName + $object['displayName'] = $this->title; + + // TODO: downstreamDuplicates + + // embedCode (used for video) + + // id + // + // XXX: Should we use URL here? or a crazy tag URI? + $object['id'] = $this->id; + + if ($this->type == ActivityObject::PERSON + || $this->type == ActivityObject::GROUP) { + + // XXX: Not sure what the best avatar is to use for the + // author's "image". For now, I'm using the large size. + + $avatarLarge = null; + $avatarMediaLinks = array(); + + foreach ($this->avatarLinks as $a) { + + // Make a MediaLink for every other Avatar + $avatar = new ActivityStreamsMediaLink( + $a->url, + $a->width, + $a->height, + $a->type, + 'avatar' + ); + + // Find the big avatar to use as the "image" + if ($a->height == AVATAR_PROFILE_SIZE) { + $imgLink = $avatar; + } + + $avatarMediaLinks[] = $avatar->asArray(); + } + + $object['avatarLinks'] = $avatarMediaLinks; // extension + + // image + $object['image'] = $imgLink->asArray(); + } + + // objectType + // + // We can probably use the whole schema URL here but probably the + // relative simple name is easier to parse + $object['type'] = substr($this->type, strrpos($this->type, '/') + 1); + + // summary + $object['summary'] = $this->summary; + + // TODO: upstreamDuplicates + + // url (XXX: need to put the right thing here...) + $object['url'] = $this->id; + + /* Extensions */ + + foreach ($this->extra as $e) { + list($objectName, $props, $txt) = $e; + $object[$objectName] = $props; + } + + // GeoJSON + + if (!empty($this->geopoint)) { + + list($lat, $long) = explode(' ', $this->geopoint); + + $object['geopoint'] = array( + 'type' => 'Point', + 'coordinates' => array($lat, $long) + ); + } + + if (!empty($this->poco)) { + $object['contact'] = $this->poco->asArray(); + } + + return array_filter($object); + } }