X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivityobject.php;h=7771455443d217f53a28511de82dce7081664121;hb=371e923c37d947c8b276f555e612763f331dd31c;hp=34d1b91700432bd1d55dabd041176f0ac2a62e15;hpb=a5c78a6f1a7bef591e136ca23f7a133f8905475a;p=quix0rs-gnu-social.git diff --git a/lib/activityobject.php b/lib/activityobject.php index 34d1b91700..7771455443 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -49,7 +49,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 * @link http://status.net/ */ - class ActivityObject { const ARTICLE = 'http://activitystrea.ms/schema/1.0/article'; @@ -65,6 +64,7 @@ class ActivityObject const BOOKMARK = 'http://activitystrea.ms/schema/1.0/bookmark'; const PERSON = 'http://activitystrea.ms/schema/1.0/person'; const GROUP = 'http://activitystrea.ms/schema/1.0/group'; + const _LIST = 'http://activitystrea.ms/schema/1.0/list'; // LIST is reserved const PLACE = 'http://activitystrea.ms/schema/1.0/place'; const COMMENT = 'http://activitystrea.ms/schema/1.0/comment'; // ^^^^^^^^^^ tea! @@ -93,6 +93,7 @@ class ActivityObject public $title; public $summary; public $content; + public $owner; public $link; public $source; public $avatarLinks = array(); @@ -106,6 +107,7 @@ class ActivityObject public $thumbnail; public $largerImage; public $description; + public $extra = array(); /** * Constructor @@ -116,7 +118,6 @@ class ActivityObject * * @param DOMElement $element DOM thing to turn into an Activity thing */ - function __construct($element = null) { if (empty($element)) { @@ -168,20 +169,49 @@ class ActivityObject ActivityObject::MEDIA_DESCRIPTION, Activity::MEDIA ); - + } + if ($this->type == self::_LIST) { + $owner = ActivityUtils::child($this->element, Activity::AUTHOR, Activity::SPEC); + $this->owner = new ActivityObject($owner); } } 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); + } + + // start with + + $this->id = $this->_childContent($element, self::ID); + + // fall back to - $id = $this->_childContent($element, self::URI); - if (ActivityUtils::validateUri($id)) { - $this->id = $id; + 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); if (!empty($email)) { @@ -189,19 +219,18 @@ 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) { - if ($element->localName == 'actor') { - // Old-fashioned ... - // First pull anything from , then we'll add on top. - $author = ActivityUtils::child($element->parentNode, 'author'); - if ($author) { - $this->_fromAuthor($author); - } - } - $this->type = $this->_childContent($element, Activity::OBJECTTYPE, Activity::SPEC); @@ -209,11 +238,6 @@ class ActivityObject $this->type = ActivityObject::NOTE; } - $id = $this->_childContent($element, self::ID); - if (ActivityUtils::validateUri($id)) { - $this->id = $id; - } - $this->summary = ActivityUtils::childHtmlContent($element, self::SUMMARY); $this->content = ActivityUtils::getContent($element); @@ -221,15 +245,20 @@ class ActivityObject $title = ActivityUtils::childHtmlContent($element, self::TITLE); - $this->title = html_entity_decode(strip_tags($title)); + $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8'); $this->source = $this->_getSource($element); $this->link = ActivityUtils::getPermalink($element); - } - // @fixme rationalize with Activity::_fromRssItem() + $this->id = $this->_childContent($element, self::ID); + + if (empty($this->id) && !empty($this->link)) { // fallback if there's no ID + $this->id = $this->link; + } + } + // @todo FIXME: rationalize with Activity::_fromRssItem() private function _fromRssItem($item) { $this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, Activity::RSS); @@ -397,12 +426,17 @@ class ActivityObject { $object = new ActivityObject(); - $object->type = ActivityObject::NOTE; + if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) { + + $object->type = ActivityObject::NOTE; - $object->id = $notice->uri; - $object->title = $notice->content; - $object->content = $notice->rendered; - $object->link = $notice->bestUrl(); + $object->id = $notice->uri; + $object->title = $notice->content; + $object->content = $notice->rendered; + $object->link = $notice->bestUrl(); + + Event::handle('EndActivityObjectFromNotice', array($notice, &$object)); + } return $object; } @@ -411,47 +445,62 @@ class ActivityObject { $object = new ActivityObject(); - $object->type = ActivityObject::PERSON; - $object->id = $profile->getUri(); - $object->title = $profile->getBestName(); - $object->link = $profile->profileurl; + if (Event::handle('StartActivityObjectFromProfile', array($profile, &$object))) { - $orig = $profile->getOriginalAvatar(); + $object->type = ActivityObject::PERSON; + $object->id = $profile->getUri(); + $object->title = $profile->getBestName(); + $object->link = $profile->profileurl; - if (!empty($orig)) { - $object->avatarLinks[] = AvatarLink::fromAvatar($orig); - } - - $sizes = array( - AVATAR_PROFILE_SIZE, - AVATAR_STREAM_SIZE, - AVATAR_MINI_SIZE - ); - - foreach ($sizes as $size) { - - $alink = null; - $avatar = $profile->getAvatar($size); - - if (!empty($avatar)) { - $alink = AvatarLink::fromAvatar($avatar); - } else { - $alink = new AvatarLink(); - $alink->type = 'image/png'; - $alink->height = $size; - $alink->width = $size; - $alink->url = Avatar::defaultImage($size); - } + $orig = $profile->getOriginalAvatar(); - $object->avatarLinks[] = $alink; - } + if (!empty($orig)) { + $object->avatarLinks[] = AvatarLink::fromAvatar($orig); + } - if (isset($profile->lat) && isset($profile->lon)) { - $object->geopoint = (float)$profile->lat - . ' ' . (float)$profile->lon; - } + $sizes = array( + AVATAR_PROFILE_SIZE, + AVATAR_STREAM_SIZE, + AVATAR_MINI_SIZE + ); - $object->poco = PoCo::fromProfile($profile); + foreach ($sizes as $size) { + $alink = null; + $avatar = $profile->getAvatar($size); + + if (!empty($avatar)) { + $alink = AvatarLink::fromAvatar($avatar); + } else { + $alink = new AvatarLink(); + $alink->type = 'image/png'; + $alink->height = $size; + $alink->width = $size; + $alink->url = Avatar::defaultImage($size); + + if ($size == AVATAR_PROFILE_SIZE) { + // Hack for Twitter import: we don't have a 96x96 image, + // but we do have a 73x73 image. For now, fake it with that. + $avatar = $profile->getAvatar(73); + if ($avatar) { + $alink = AvatarLink::fromAvatar($avatar); + $alink->height= $size; + $alink->width = $size; + } + } + } + + $object->avatarLinks[] = $alink; + } + + if (isset($profile->lat) && isset($profile->lon)) { + $object->geopoint = (float)$profile->lat + . ' ' . (float)$profile->lon; + } + + $object->poco = PoCo::fromProfile($profile); + + Event::handle('EndActivityObjectFromProfile', array($profile, &$object)); + } return $object; } @@ -460,51 +509,76 @@ class ActivityObject { $object = new ActivityObject(); - $object->type = ActivityObject::GROUP; - $object->id = $group->getUri(); - $object->title = $group->getBestName(); - $object->link = $group->getUri(); + if (Event::handle('StartActivityObjectFromGroup', array($group, &$object))) { - $object->avatarLinks[] = AvatarLink::fromFilename( - $group->homepage_logo, - AVATAR_PROFILE_SIZE - ); + $object->type = ActivityObject::GROUP; + $object->id = $group->getUri(); + $object->title = $group->getBestName(); + $object->link = $group->getUri(); - $object->avatarLinks[] = AvatarLink::fromFilename( - $group->stream_logo, - AVATAR_STREAM_SIZE - ); + $object->avatarLinks[] = AvatarLink::fromFilename($group->homepage_logo, + AVATAR_PROFILE_SIZE); - $object->avatarLinks[] = AvatarLink::fromFilename( - $group->mini_logo, - AVATAR_MINI_SIZE - ); + $object->avatarLinks[] = AvatarLink::fromFilename($group->stream_logo, + AVATAR_STREAM_SIZE); - $object->poco = PoCo::fromGroup($group); + $object->avatarLinks[] = AvatarLink::fromFilename($group->mini_logo, + AVATAR_MINI_SIZE); + + $object->poco = PoCo::fromGroup($group); + Event::handle('EndActivityObjectFromGroup', array($group, &$object)); + } return $object; } - function asString($tag='activity:object') + static function fromPeopletag($ptag) { - $xs = new XMLStringer(true); + $object = new ActivityObject(); + if (Event::handle('StartActivityObjectFromPeopletag', array($ptag, &$object))) { + $object->type = ActivityObject::_LIST; + + $object->id = $ptag->getUri(); + $object->title = $ptag->tag; + $object->summary = $ptag->description; + $object->link = $ptag->homeUrl(); + $object->owner = Profile::staticGet('id', $ptag->tagger); + $object->poco = PoCo::fromProfile($object->owner); + Event::handle('EndActivityObjectFromPeopletag', array($ptag, &$object)); + } + return $object; + } - $xs->elementStart($tag); + function outputTo($xo, $tag='activity:object') + { + if (!empty($tag)) { + $xo->elementStart($tag); + } - $xs->element('activity:object-type', null, $this->type); + $xo->element('activity:object-type', null, $this->type); - $xs->element(self::ID, null, $this->id); + // uses URI + + 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) @@ -513,7 +587,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) @@ -521,7 +595,7 @@ class ActivityObject } if (!empty($this->link)) { - $xs->element( + $xo->element( 'link', array( 'rel' => 'alternate', @@ -536,7 +610,7 @@ class ActivityObject || $this->type == ActivityObject::GROUP) { foreach ($this->avatarLinks as $avatar) { - $xs->element( + $xo->element( 'link', array( 'rel' => 'avatar', 'type' => $avatar->type, @@ -549,8 +623,13 @@ class ActivityObject } } + if(!empty($this->owner)) { + $owner = $this->owner->asActivityNoun(self::AUTHOR); + $xo->raw($owner); + } + if (!empty($this->geopoint)) { - $xs->element( + $xo->element( 'georss:point', null, $this->geopoint @@ -558,11 +637,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); + } }