X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivityobject.php;fp=lib%2Factivityobject.php;h=a47928e871b0f2d7af6f651027bf207ddf4e0e0c;hb=31c1177970124cee31823cab3a11542c23b4126d;hp=7771455443d217f53a28511de82dce7081664121;hpb=894d4ba16f28a4bdd274378d9669d76a717eec31;p=quix0rs-gnu-social.git diff --git a/lib/activityobject.php b/lib/activityobject.php index 7771455443..a47928e871 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -428,7 +428,7 @@ class ActivityObject if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) { - $object->type = ActivityObject::NOTE; + $object->type = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type; $object->id = $notice->uri; $object->title = $notice->content; @@ -555,94 +555,101 @@ class ActivityObject $xo->elementStart($tag); } - $xo->element('activity:object-type', null, $this->type); + if (Event::handle('StartActivityObjectOutputAtom', array($this, $xo))) { + $xo->element('activity:object-type', null, $this->type); - // uses URI + // uses URI - if ($tag == 'author') { - $xo->element(self::URI, null, $this->id); - } else { - $xo->element(self::ID, null, $this->id); - } - - if (!empty($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); + $xo->element(self::URI, null, $this->id); } else { - $xo->element(self::TITLE, null, $name); + $xo->element(self::ID, null, $this->id); } - } - - if (!empty($this->summary)) { - $xo->element( - self::SUMMARY, - null, - common_xml_safe_str($this->summary) - ); - } - if (!empty($this->content)) { - // XXX: assuming HTML content here - $xo->element( - ActivityUtils::CONTENT, - array('type' => 'html'), - common_xml_safe_str($this->content) - ); - } + if (!empty($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->link)) { - $xo->element( - 'link', - array( - 'rel' => 'alternate', - 'type' => 'text/html', - 'href' => $this->link - ), - null - ); - } + if (!empty($this->summary)) { + $xo->element( + self::SUMMARY, + null, + common_xml_safe_str($this->summary) + ); + } - if ($this->type == ActivityObject::PERSON - || $this->type == ActivityObject::GROUP) { + if (!empty($this->content)) { + // XXX: assuming HTML content here + $xo->element( + ActivityUtils::CONTENT, + array('type' => 'html'), + common_xml_safe_str($this->content) + ); + } - foreach ($this->avatarLinks as $avatar) { + if (!empty($this->link)) { $xo->element( - 'link', array( - 'rel' => 'avatar', - 'type' => $avatar->type, - 'media:width' => $avatar->width, - 'media:height' => $avatar->height, - 'href' => $avatar->url + 'link', + array( + 'rel' => 'alternate', + 'type' => 'text/html', + 'href' => $this->link ), null ); } - } - if(!empty($this->owner)) { - $owner = $this->owner->asActivityNoun(self::AUTHOR); - $xo->raw($owner); - } + if(!empty($this->owner)) { + $owner = $this->owner->asActivityNoun(self::AUTHOR); + $xo->raw($owner); + } - if (!empty($this->geopoint)) { - $xo->element( - 'georss:point', - null, - $this->geopoint - ); - } + if ($this->type == ActivityObject::PERSON + || $this->type == ActivityObject::GROUP) { + + foreach ($this->avatarLinks as $avatar) { + $xo->element( + 'link', array( + 'rel' => 'avatar', + 'type' => $avatar->type, + 'media:width' => $avatar->width, + 'media:height' => $avatar->height, + 'href' => $avatar->url + ), + null + ); + } + } - if (!empty($this->poco)) { - $this->poco->outputTo($xo); - } - foreach ($this->extra as $el) { - list($extraTag, $attrs, $content) = $el; - $xo->element($extraTag, $attrs, $content); + if (!empty($this->geopoint)) { + $xo->element( + 'georss:point', + null, + $this->geopoint + ); + } + + if (!empty($this->poco)) { + $this->poco->outputTo($xo); + } + + // @fixme there's no way here to make a tree; elements can only contain plaintext + // @fixme these may collide with JSON extensions + foreach ($this->extra as $el) { + list($extraTag, $attrs, $content) = $el; + $xo->element($extraTag, $attrs, $content); + } + + Event::handle('EndActivityObjectOutputAtom', array($this, $xo)); } if (!empty($tag)) { @@ -672,91 +679,96 @@ class ActivityObject { $object = array(); - // XXX: attachedObjects are added by Activity + if (Event::handle('StartActivityObjectOutputJson', array($this, &$object))) { + // XXX: attachedObjects are added by Activity - // displayName - $object['displayName'] = $this->title; + // displayName + $object['displayName'] = $this->title; - // TODO: downstreamDuplicates + // TODO: downstreamDuplicates - // embedCode (used for video) + // embedCode (used for video) - // id - // - // XXX: Should we use URL here? or a crazy tag URI? - $object['id'] = $this->id; + // 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) { + 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. + // 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(); + $avatarLarge = null; + $avatarMediaLinks = array(); - foreach ($this->avatarLinks as $a) { + foreach ($this->avatarLinks as $a) { - // Make a MediaLink for every other Avatar - $avatar = new ActivityStreamsMediaLink( - $a->url, - $a->width, - $a->height, - $a->type, - 'avatar' - ); + // 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; - } + // Find the big avatar to use as the "image" + if ($a->height == AVATAR_PROFILE_SIZE) { + $imgLink = $avatar; + } - $avatarMediaLinks[] = $avatar->asArray(); - } - - $object['avatarLinks'] = $avatarMediaLinks; // extension + $avatarMediaLinks[] = $avatar->asArray(); + } - // image - $object['image'] = $imgLink->asArray(); - } + $object['avatarLinks'] = $avatarMediaLinks; // extension - // 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); + // image + $object['image'] = $imgLink->asArray(); + } - // summary - $object['summary'] = $this->summary; + // objectType + // + // We can probably use the whole schema URL here but probably the + // relative simple name is easier to parse + // @fixme this breaks extension URIs + $object['type'] = substr($this->type, strrpos($this->type, '/') + 1); - // TODO: upstreamDuplicates + // summary + $object['summary'] = $this->summary; - // url (XXX: need to put the right thing here...) - $object['url'] = $this->id; + // TODO: upstreamDuplicates - /* Extensions */ + // url (XXX: need to put the right thing here...) + $object['url'] = $this->id; - foreach ($this->extra as $e) { - list($objectName, $props, $txt) = $e; - $object[$objectName] = $props; - } + /* Extensions */ + // @fixme these may collide with XML extensions + // @fixme multiple tags of same name will overwrite each other + // @fixme text content from XML extensions will be lost + foreach ($this->extra as $e) { + list($objectName, $props, $txt) = $e; + $object[$objectName] = $props; + } - // GeoJSON + // GeoJSON - if (!empty($this->geopoint)) { + if (!empty($this->geopoint)) { - list($lat, $long) = explode(' ', $this->geopoint); + list($lat, $long) = explode(' ', $this->geopoint); - $object['geopoint'] = array( - 'type' => 'Point', - 'coordinates' => array($lat, $long) - ); - } + $object['geopoint'] = array( + 'type' => 'Point', + 'coordinates' => array($lat, $long) + ); + } - if (!empty($this->poco)) { - $object['contact'] = $this->poco->asArray(); + if (!empty($this->poco)) { + $object['contact'] = $this->poco->asArray(); + } + Event::handle('EndActivityObjectOutputJson', array($this, &$object)); } - return array_filter($object); } }