X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivityobject.php;h=f774dd3c8bc0abdf35d1d474e4cfbb45628358b7;hb=956b3ef4d18c091cb070708fd941df27b5c0264d;hp=677a48197fd9e0e6ff10ee0a14b4e532109c8f7c;hpb=29566c5d4b17eb42d3f69bb6b8e74259ee4218fb;p=quix0rs-gnu-social.git diff --git a/lib/activityobject.php b/lib/activityobject.php index 677a48197f..f774dd3c8b 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'; @@ -106,6 +105,7 @@ class ActivityObject public $thumbnail; public $largerImage; public $description; + public $extra = array(); /** * Constructor @@ -116,7 +116,6 @@ class ActivityObject * * @param DOMElement $element DOM thing to turn into an Activity thing */ - function __construct($element = null) { if (empty($element)) { @@ -168,16 +167,44 @@ class ActivityObject ActivityObject::MEDIA_DESCRIPTION, Activity::MEDIA ); - } } 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 + + if (empty($this->id)) { + $this->id = $this->_childContent($element, self::URI); + } - $this->id = $this->_childContent($element, self::URI); + // fall further back to if (empty($this->id)) { $email = $this->_childContent($element, self::EMAIL); @@ -186,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) @@ -204,7 +239,7 @@ 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); @@ -217,8 +252,7 @@ class ActivityObject } } - // @fixme rationalize with Activity::_fromRssItem() - + // @todo FIXME: rationalize with Activity::_fromRssItem() private function _fromRssItem($item) { $this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, Activity::RSS); @@ -385,13 +419,18 @@ class ActivityObject static function fromNotice(Notice $notice) { $object = new ActivityObject(); + + if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) { + + $object->type = ActivityObject::NOTE; - $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; } @@ -400,47 +439,62 @@ class ActivityObject { $object = new ActivityObject(); - $object->type = ActivityObject::PERSON; - $object->id = $profile->getUri(); - $object->title = $profile->getBestName(); - $object->link = $profile->profileurl; - - $orig = $profile->getOriginalAvatar(); - - if (!empty($orig)) { - $object->avatarLinks[] = AvatarLink::fromAvatar($orig); - } - - $sizes = array( - AVATAR_PROFILE_SIZE, - AVATAR_STREAM_SIZE, - AVATAR_MINI_SIZE - ); - - foreach ($sizes as $size) { + if (Event::handle('StartActivityObjectFromProfile', array($profile, &$object))) { - $alink = null; - $avatar = $profile->getAvatar($size); + $object->type = ActivityObject::PERSON; + $object->id = $profile->getUri(); + $object->title = $profile->getBestName(); + $object->link = $profile->profileurl; - 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; } @@ -449,51 +503,57 @@ 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 outputTo($xo, $tag='activity:object') + { + if (!empty($tag)) { + $xo->elementStart($tag); + } - function asString($tag='activity:object') - { - $xs = new XMLStringer(true); - - $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') { + $xo->element(self::NAME, null, $name); + } else { + $xo->element(self::TITLE, null, $name); + } } if (!empty($this->summary)) { - $xs->element( + $xo->element( self::SUMMARY, null, common_xml_safe_str($this->summary) @@ -502,7 +562,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) @@ -510,7 +570,7 @@ class ActivityObject } if (!empty($this->link)) { - $xs->element( + $xo->element( 'link', array( 'rel' => 'alternate', @@ -525,7 +585,7 @@ class ActivityObject || $this->type == ActivityObject::GROUP) { foreach ($this->avatarLinks as $avatar) { - $xs->element( + $xo->element( 'link', array( 'rel' => 'avatar', 'type' => $avatar->type, @@ -539,7 +599,7 @@ class ActivityObject } if (!empty($this->geopoint)) { - $xs->element( + $xo->element( 'georss:point', null, $this->geopoint @@ -547,10 +607,26 @@ 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(); }