X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Fclasses%2FOstatus_profile.php;h=96ab7f6be72ab4cef7bb78d83ec2f183ab4d5b69;hb=72d1c3c73e47bb72e9e69e125ddd222abbee3296;hp=e71e5c9131268239cc554417786eda3875db3749;hpb=27ef3b1d905cdf8f47b47293a757624dda88fdc7;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index e71e5c9131..96ab7f6be7 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -25,7 +25,6 @@ if (!defined('STATUSNET')) { * @package OStatusPlugin * @maintainer Brion Vibber */ - class Ostatus_profile extends Managed_DataObject { public $__table = 'ostatus_profile'; @@ -34,6 +33,7 @@ class Ostatus_profile extends Managed_DataObject public $profile_id; public $group_id; + public $peopletag_id; public $feeduri; public $salmonuri; @@ -42,17 +42,11 @@ class Ostatus_profile extends Managed_DataObject public $created; public $modified; - public /*static*/ function staticGet($k, $v=null) - { - return parent::staticGet(__CLASS__, $k, $v); - } - /** * Return table definition for Schema setup and DB_DataObject usage. * * @return array array of column definitions */ - static function schemaDef() { return array( @@ -60,6 +54,7 @@ class Ostatus_profile extends Managed_DataObject 'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true), 'profile_id' => array('type' => 'integer'), 'group_id' => array('type' => 'integer'), + 'peopletag_id' => array('type' => 'integer'), 'feeduri' => array('type' => 'varchar', 'length' => 255), 'salmonuri' => array('type' => 'varchar', 'length' => 255), 'avatar' => array('type' => 'text'), @@ -68,27 +63,40 @@ class Ostatus_profile extends Managed_DataObject ), 'primary key' => array('uri'), 'unique keys' => array( - 'ostatus_profile_profile_id_idx' => array('profile_id'), - 'ostatus_profile_group_id_idx' => array('group_id'), - 'ostatus_profile_feeduri_idx' => array('feeduri'), + 'ostatus_profile_profile_id_key' => array('profile_id'), + 'ostatus_profile_group_id_key' => array('group_id'), + 'ostatus_profile_peopletag_id_key' => array('peopletag_id'), + 'ostatus_profile_feeduri_key' => array('feeduri'), ), 'foreign keys' => array( 'ostatus_profile_profile_id_fkey' => array('profile', array('profile_id' => 'id')), 'ostatus_profile_group_id_fkey' => array('user_group', array('group_id' => 'id')), + 'ostatus_profile_peopletag_id_fkey' => array('profile_list', array('peopletag_id' => 'id')), ), ); } + public function getUri() + { + return $this->uri; + } + /** - * Fetch the StatusNet-side profile for this feed + * Fetch the locally stored profile for this feed * @return Profile + * @throws NoProfileException if it was not found */ public function localProfile() { - if ($this->profile_id) { - return Profile::staticGet('id', $this->profile_id); + if ($this->isGroup()) { + return $this->localGroup()->getProfile(); } - return null; + + $profile = Profile::getKV('id', $this->profile_id); + if ($profile instanceof Profile) { + return $profile; + } + throw new NoProfileException($this->profile_id); } /** @@ -98,7 +106,19 @@ class Ostatus_profile extends Managed_DataObject public function localGroup() { if ($this->group_id) { - return User_group::staticGet('id', $this->group_id); + return User_group::getKV('id', $this->group_id); + } + return null; + } + + /** + * Fetch the StatusNet-side peopletag for this feed + * @return Profile + */ + public function localPeopletag() + { + if ($this->peopletag_id) { + return Profile_list::getKV('id', $this->peopletag_id); } return null; } @@ -113,8 +133,10 @@ class Ostatus_profile extends Managed_DataObject { if ($this->isGroup()) { return ActivityObject::fromGroup($this->localGroup()); + } else if ($this->isPeopletag()) { + return ActivityObject::fromPeopletag($this->localPeopletag()); } else { - return ActivityObject::fromProfile($this->localProfile()); + return $this->localProfile()->asActivityObject(); } } @@ -124,7 +146,7 @@ class Ostatus_profile extends Managed_DataObject * * Assumes that 'activity' namespace has been previously defined. * - * @fixme replace with wrappers on asActivityObject when it's got everything. + * @todo FIXME: Replace with wrappers on asActivityObject when it's got everything. * * @param string $element one of 'actor', 'subject', 'object', 'target' * @return string @@ -134,8 +156,11 @@ class Ostatus_profile extends Managed_DataObject if ($this->isGroup()) { $noun = ActivityObject::fromGroup($this->localGroup()); return $noun->asString('activity:' . $element); + } else if ($this->isPeopletag()) { + $noun = ActivityObject::fromPeopletag($this->localPeopletag()); + return $noun->asString('activity:' . $element); } else { - $noun = ActivityObject::fromProfile($this->localProfile()); + $noun = $this->localProfile()->asActivityObject(); return $noun->asString('activity:' . $element); } } @@ -145,16 +170,34 @@ class Ostatus_profile extends Managed_DataObject */ function isGroup() { - if ($this->profile_id && !$this->group_id) { + if ($this->profile_id || $this->peopletag_id && !$this->group_id) { return false; - } else if ($this->group_id && !$this->profile_id) { + } else if ($this->group_id && !$this->profile_id && !$this->peopletag_id) { return true; - } else if ($this->group_id && $this->profile_id) { - // TRANS: Server exception. %s is a URI. - throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs set for %s.'),$this->uri)); + } else if ($this->group_id && ($this->profile_id || $this->peopletag_id)) { + // TRANS: Server exception. %s is a URI + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->getUri())); } else { - // TRANS: Server exception. %s is a URI. - throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs empty for %s.'),$this->uri)); + // TRANS: Server exception. %s is a URI + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri())); + } + } + + /** + * @return boolean true if this is a remote peopletag + */ + function isPeopletag() + { + if ($this->profile_id || $this->group_id && !$this->peopletag_id) { + return false; + } else if ($this->peopletag_id && !$this->profile_id && !$this->group_id) { + return true; + } else if ($this->peopletag_id && ($this->profile_id || $this->group_id)) { + // TRANS: Server exception. %s is a URI + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->getUri())); + } else { + // TRANS: Server exception. %s is a URI + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri())); } } @@ -162,42 +205,48 @@ class Ostatus_profile extends Managed_DataObject * Send a subscription request to the hub for this feed. * The hub will later send us a confirmation POST to /main/push/callback. * - * @return bool true on success, false on failure - * @throws ServerException if feed state is not valid + * @return void + * @throws ServerException if feed state is not valid or subscription fails. */ public function subscribe() { $feedsub = FeedSub::ensureFeed($this->feeduri); if ($feedsub->sub_state == 'active') { // Active subscription, we don't need to do anything. - return true; - } else { - // Inactive or we got left in an inconsistent state. - // Run a subscription request to make sure we're current! - return $feedsub->subscribe(); + return; } + + // Inactive or we got left in an inconsistent state. + // Run a subscription request to make sure we're current! + return $feedsub->subscribe(); } /** * Check if this remote profile has any active local subscriptions, and * if not drop the PuSH subscription feed. * - * @return bool true on success, false on failure + * @return boolean true if subscription is removed, false if there are still subscribers to the feed + * @throws Exception of various kinds on failure. */ public function unsubscribe() { - $this->garbageCollect(); + return $this->garbageCollect(); } /** * Check if this remote profile has any active local subscriptions, and * if not drop the PuSH subscription feed. * - * @return boolean + * @return boolean true if subscription is removed, false if there are still subscribers to the feed + * @throws Exception of various kinds on failure. */ public function garbageCollect() { - $feedsub = FeedSub::staticGet('uri', $this->feeduri); - return $feedsub->garbageCollect(); + $feedsub = FeedSub::getKV('uri', $this->feeduri); + if ($feedsub instanceof FeedSub) { + return $feedsub->garbageCollect(); + } + // Since there's no FeedSub we can assume it's already garbage collected + return true; } /** @@ -208,14 +257,23 @@ class Ostatus_profile extends Managed_DataObject * FeedSub::garbageCollect(). * * @return int + * @throws NoProfileException if there is no local profile for the object */ public function subscriberCount() { if ($this->isGroup()) { $members = $this->localGroup()->getMembers(0, 1); $count = $members->N; + } else if ($this->isPeopletag()) { + $subscribers = $this->localPeopletag()->getSubscribers(0, 1); + $count = $subscribers->N; } else { - $count = $this->localProfile()->subscriberCount(); + $profile = $this->localProfile(); + if ($profile->hasLocalTags()) { + $count = 1; + } else { + $count = $profile->subscriberCount(); + } } common_log(LOG_INFO, __METHOD__ . " SUB COUNT BEFORE: $count"); @@ -235,57 +293,49 @@ class Ostatus_profile extends Managed_DataObject * @param string $verb Activity::SUBSCRIBE or Activity::JOIN * @param Object $object object of the action; must define asActivityNoun($tag) */ - public function notify($actor, $verb, $object=null) + public function notify(Profile $actor, $verb, $object=null, $target=null) { - if (!($actor instanceof Profile)) { - $type = gettype($actor); - if ($type == 'object') { - $type = get_class($actor); - } - // TRANS: Server exception. - // TRANS: %1$s is the method name the exception occured in, %2$s is the actor type. - throw new ServerException(sprintf(_m('Invalid actor passed to %1$s: %2$s.'),__METHOD__,$type)); - } if ($object == null) { $object = $this; } - if ($this->salmonuri) { - - $text = 'update'; - $id = TagURI::mint('%s:%s:%s', - $verb, - $actor->getURI(), - common_date_iso8601(time())); - - // @fixme consolidate all these NS settings somewhere - $attributes = array('xmlns' => Activity::ATOM, - 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/', - 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0', - 'xmlns:georss' => 'http://www.georss.org/georss', - 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0', - 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0', - 'xmlns:media' => 'http://purl.org/syndication/atommedia'); - - $entry = new XMLStringer(); - $entry->elementStart('entry', $attributes); - $entry->element('id', null, $id); - $entry->element('title', null, $text); - $entry->element('summary', null, $text); - $entry->element('published', null, common_date_w3dtf(common_sql_now())); - - $entry->element('activity:verb', null, $verb); - $entry->raw($actor->asAtomAuthor()); - $entry->raw($actor->asActivityActor()); - $entry->raw($object->asActivityNoun('object')); - $entry->elementEnd('entry'); - - $xml = $entry->getString(); - common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml"); - - $salmon = new Salmon(); // ? - return $salmon->post($this->salmonuri, $xml, $actor); + if (empty($this->salmonuri)) { + return false; } - return false; + $text = 'update'; + $id = TagURI::mint('%s:%s:%s', + $verb, + $actor->getURI(), + common_date_iso8601(time())); + + // @todo FIXME: Consolidate all these NS settings somewhere. + $attributes = array('xmlns' => Activity::ATOM, + 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/', + 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0', + 'xmlns:georss' => 'http://www.georss.org/georss', + 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0', + 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0', + 'xmlns:media' => 'http://purl.org/syndication/atommedia'); + + $entry = new XMLStringer(); + $entry->elementStart('entry', $attributes); + $entry->element('id', null, $id); + $entry->element('title', null, $text); + $entry->element('summary', null, $text); + $entry->element('published', null, common_date_w3dtf(common_sql_now())); + + $entry->element('activity:verb', null, $verb); + $entry->raw($actor->asAtomAuthor()); + $entry->raw($actor->asActivityActor()); + $entry->raw($object->asActivityNoun('object')); + if ($target != null) { + $entry->raw($target->asActivityNoun('target')); + } + $entry->elementEnd('entry'); + + $xml = $entry->getString(); + common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml"); + + Salmon::post($this->salmonuri, $xml, $actor->getUser()); } /** @@ -296,12 +346,12 @@ class Ostatus_profile extends Managed_DataObject * @param Profile $actor * @return boolean success */ - public function notifyActivity($entry, $actor) + public function notifyActivity($entry, Profile $actor) { if ($this->salmonuri) { - $salmon = new Salmon(); - return $salmon->post($this->salmonuri, $this->notifyPrepXml($entry), $actor); + return Salmon::post($this->salmonuri, $this->notifyPrepXml($entry), $actor->getUser()); } + common_debug(__CLASS__.' error: No salmonuri for Ostatus_profile uri: '.$this->uri); return false; } @@ -346,6 +396,8 @@ class Ostatus_profile extends Managed_DataObject { if ($this->isGroup()) { return $this->localGroup()->getBestName(); + } else if ($this->isPeopletag()) { + return $this->localPeopletag()->getBestName(); } else { return $this->localProfile()->getBestName(); } @@ -365,7 +417,7 @@ class Ostatus_profile extends Managed_DataObject if ($feed->localName == 'feed' && $feed->namespaceURI == Activity::ATOM) { $this->processAtomFeed($feed, $source); - } else if ($feed->localName == 'rss') { // @fixme check namespace + } else if ($feed->localName == 'rss') { // @todo FIXME: Check namespace. $this->processRssFeed($feed, $source); } else { // TRANS: Exception. @@ -414,37 +466,262 @@ class Ostatus_profile extends Managed_DataObject * @param DOMElement $entry * @param DOMElement $feed for context * @param string $source identifier ("push" or "salmon") + * + * @return Notice Notice representing the new (or existing) activity */ - public function processEntry($entry, $feed, $source) { $activity = new Activity($entry, $feed); + return $this->processActivity($activity, $source); + } + + // TODO: Make this throw an exception + public function processActivity($activity, $source) + { + $notice = null; + + // The "WithProfile" events were added later. - if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this)) && + if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this->localProfile(), &$notice)) && Event::handle('StartHandleFeedEntry', array($activity))) { - // @todo process all activity objects - switch ($activity->objects[0]->type) { - case ActivityObject::ARTICLE: - case ActivityObject::BLOGENTRY: - case ActivityObject::NOTE: - case ActivityObject::STATUS: - case ActivityObject::COMMENT: - case null: - if ($activity->verb == ActivityVerb::POST) { - $this->processPost($activity, $source); - } else { - common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb"); + switch ($activity->verb) { + case ActivityVerb::POST: + // @todo process all activity objects + switch ($activity->objects[0]->type) { + case ActivityObject::ARTICLE: + case ActivityObject::BLOGENTRY: + case ActivityObject::NOTE: + case ActivityObject::STATUS: + case ActivityObject::COMMENT: + case null: + $notice = $this->processPost($activity, $source); + break; + default: + // TRANS: Client exception. + throw new ClientException(_m('Cannot handle that kind of post.')); } break; + case ActivityVerb::SHARE: + $notice = $this->processShare($activity, $source); + break; default: - // TRANS: Client exception. - throw new ClientException(_m('Can\'t handle that kind of post.')); + common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb"); } Event::handle('EndHandleFeedEntry', array($activity)); - Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this)); + Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this, $notice)); + } + + return $notice; + } + + public function processShare($activity, $method) + { + $notice = null; + + try { + $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile()); + } catch (ServerException $e) { + return null; + } + + // The id URI will be used as a unique identifier for the notice, + // protecting against duplicate saves. It isn't required to be a URL; + // tag: URIs for instance are found in Google Buzz feeds. + $dupe = Notice::getKV('uri', $activity->id); + if ($dupe instanceof Notice) { + common_log(LOG_INFO, "OStatus: ignoring duplicate post: {$activity->id}"); + return $dupe; + } + + if (count($activity->objects) != 1) { + // TRANS: Client exception thrown when trying to share multiple activities at once. + throw new ClientException(_m('Can only handle share activities with exactly one object.')); + } + + $shared = $activity->objects[0]; + + if (!$shared instanceof Activity) { + // TRANS: Client exception thrown when trying to share a non-activity object. + throw new ClientException(_m('Can only handle shared activities.')); + } + + $sharedId = $shared->id; + if (!empty($shared->objects[0]->id)) { + // Because StatusNet since commit 8cc4660 sets $shared->id to a TagURI which + // fucks up federation, because the URI is no longer recognised by the origin. + // So we set it to the object ID if it exists, otherwise we trust $shared->id + $sharedId = $shared->objects[0]->id; + } + if (empty($sharedId)) { + throw new ClientException(_m('Shared activity does not have an id')); + } + + // First check if we have the shared activity. This has to be done first, because + // we can't use these functions to "ensureActivityObjectProfile" of a local user, + // who might be the creator of the shared activity in question. + $sharedNotice = Notice::getKV('uri', $sharedId); + if (!$sharedNotice instanceof Notice) { + // If no locally stored notice is found, process it! + // TODO: Remember to check Deleted_notice! + // TODO: If a post is shared that we can't retrieve - what to do? + try { + $other = self::ensureActivityObjectProfile($shared->actor); + $sharedNotice = $other->processActivity($shared, $method); + if (!$sharedNotice instanceof Notice) { + // And if we apparently can't get the shared notice, we'll abort the whole thing. + // TRANS: Client exception thrown when saving an activity share fails. + // TRANS: %s is a share ID. + throw new ClientException(sprintf(_m('Failed to save activity %s.'), $sharedId)); + } + } catch (FeedSubException $e) { + // Remote feed could not be found or verified, should we + // transform this into an "RT @user Blah, blah, blah..."? + common_log(LOG_INFO, __METHOD__ . ' got a ' . get_class($e) . ': ' . $e->getMessage()); + return null; + } + } + + // We'll want to save a web link to the original notice, if provided. + + $sourceUrl = null; + if ($activity->link) { + $sourceUrl = $activity->link; + } else if ($activity->link) { + $sourceUrl = $activity->link; + } else if (preg_match('!^https?://!', $activity->id)) { + $sourceUrl = $activity->id; + } + + // Use summary as fallback for content + + if (!empty($activity->content)) { + $sourceContent = $activity->content; + } else if (!empty($activity->summary)) { + $sourceContent = $activity->summary; + } else if (!empty($activity->title)) { + $sourceContent = $activity->title; + } else { + // @todo FIXME: Fetch from $sourceUrl? + // TRANS: Client exception. %s is a source URI. + throw new ClientException(sprintf(_m('No content for notice %s.'), $activity->id)); + } + + // Get (safe!) HTML and text versions of the content + + $rendered = $this->purify($sourceContent); + $content = common_strip_html($rendered); + + $shortened = common_shorten_links($content); + + // If it's too long, try using the summary, and make the + // HTML an attachment. + + $attachment = null; + + if (Notice::contentTooLong($shortened)) { + $attachment = $this->saveHTMLFile($activity->title, $rendered); + $summary = common_strip_html($activity->summary); + if (empty($summary)) { + $summary = $content; + } + $shortSummary = common_shorten_links($summary); + if (Notice::contentTooLong($shortSummary)) { + $url = common_shorten_url($sourceUrl); + $shortSummary = substr($shortSummary, + 0, + Notice::maxContent() - (mb_strlen($url) + 2)); + $content = $shortSummary . ' ' . $url; + + // We mark up the attachment link specially for the HTML output + // so we can fold-out the full version inline. + + // @todo FIXME i18n: This tooltip will be saved with the site's default language + // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime + // TRANS: this will usually be replaced with localised text from StatusNet core messages. + $showMoreText = _m('Show more'); + $attachUrl = common_local_url('attachment', + array('attachment' => $attachment->id)); + $rendered = common_render_text($shortSummary) . + '' . + '…' . + ''; + } + } + + $options = array('is_local' => Notice::REMOTE, + 'url' => $sourceUrl, + 'uri' => $activity->id, + 'rendered' => $rendered, + 'replies' => array(), + 'groups' => array(), + 'peopletags' => array(), + 'tags' => array(), + 'urls' => array(), + 'repeat_of' => $sharedNotice->id, + 'scope' => $sharedNotice->scope); + + // Check for optional attributes... + + if (!empty($activity->time)) { + $options['created'] = common_sql_date($activity->time); } + + if ($activity->context) { + // TODO: context->attention + list($options['groups'], $options['replies']) + = self::filterAttention($profile, $activity->context->attention); + + // Maintain direct reply associations + // @todo FIXME: What about conversation ID? + if (!empty($activity->context->replyToID)) { + $orig = Notice::getKV('uri', + $activity->context->replyToID); + if ($orig instanceof Notice) { + $options['reply_to'] = $orig->id; + } + } + + $location = $activity->context->location; + if ($location) { + $options['lat'] = $location->lat; + $options['lon'] = $location->lon; + if ($location->location_id) { + $options['location_ns'] = $location->location_ns; + $options['location_id'] = $location->location_id; + } + } + } + + if ($this->isPeopletag()) { + $options['peopletags'][] = $this->localPeopletag(); + } + + // Atom categories <-> hashtags + foreach ($activity->categories as $cat) { + if ($cat->term) { + $term = common_canonical_tag($cat->term); + if ($term) { + $options['tags'][] = $term; + } + } + } + + // Atom enclosures -> attachment URLs + foreach ($activity->enclosures as $href) { + // @todo FIXME: Save these locally or....? + $options['urls'][] = $href; + } + + $notice = Notice::saveNew($profile->id, + $content, + 'ostatus', + $options); + + return $notice; } /** @@ -452,28 +729,26 @@ class Ostatus_profile extends Managed_DataObject * @param Activity $activity * @param string $method 'push' or 'salmon' * @return mixed saved Notice or false - * @fixme break up this function, it's getting nasty long + * @todo FIXME: Break up this function, it's getting nasty long */ public function processPost($activity, $method) { - $oprofile = $this->checkAuthorship($activity); + $notice = null; - if (empty($oprofile)) { - return false; - } + $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile()); // It's not always an ActivityObject::NOTE, but... let's just say it is. $note = $activity->objects[0]; - // The id URI will be used as a unique identifier for for the notice, + // The id URI will be used as a unique identifier for the notice, // protecting against duplicate saves. It isn't required to be a URL; // tag: URIs for instance are found in Google Buzz feeds. $sourceUri = $note->id; - $dupe = Notice::staticGet('uri', $sourceUri); - if ($dupe) { + $dupe = Notice::getKV('uri', $sourceUri); + if ($dupe instanceof Notice) { common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri"); - return false; + return $dupe; } // We'll also want to save a web link to the original notice, if provided. @@ -495,7 +770,7 @@ class Ostatus_profile extends Managed_DataObject } else if (!empty($note->title)) { $sourceContent = $note->title; } else { - // @fixme fetch from $sourceUrl? + // @todo FIXME: Fetch from $sourceUrl? // TRANS: Client exception. %s is a source URI. throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri)); } @@ -503,7 +778,7 @@ class Ostatus_profile extends Managed_DataObject // Get (safe!) HTML and text versions of the content $rendered = $this->purify($sourceContent); - $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8'); + $content = common_strip_html($rendered); $shortened = common_shorten_links($content); @@ -514,7 +789,7 @@ class Ostatus_profile extends Managed_DataObject if (Notice::contentTooLong($shortened)) { $attachment = $this->saveHTMLFile($note->title, $rendered); - $summary = html_entity_decode(strip_tags($note->summary), ENT_QUOTES, 'UTF-8'); + $summary = common_strip_html($note->summary); if (empty($summary)) { $summary = $content; } @@ -529,7 +804,7 @@ class Ostatus_profile extends Managed_DataObject // We mark up the attachment link specially for the HTML output // so we can fold-out the full version inline. - // @fixme I18N this tooltip will be saved with the site's default language + // @todo FIXME i18n: This tooltip will be saved with the site's default language // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime // TRANS: this will usually be replaced with localised text from StatusNet core messages. $showMoreText = _m('Show more'); @@ -544,12 +819,13 @@ class Ostatus_profile extends Managed_DataObject } } - $options = array('is_local' => Notice::REMOTE_OMB, + $options = array('is_local' => Notice::REMOTE, 'url' => $sourceUrl, 'uri' => $sourceUri, 'rendered' => $rendered, 'replies' => array(), 'groups' => array(), + 'peopletags' => array(), 'tags' => array(), 'urls' => array()); @@ -560,20 +836,22 @@ class Ostatus_profile extends Managed_DataObject } if ($activity->context) { - // Any individual or group attn: targets? - $replies = $activity->context->attention; - $options['groups'] = $this->filterReplies($oprofile, $replies); - $options['replies'] = $replies; + // TODO: context->attention + list($options['groups'], $options['replies']) + = self::filterAttention($profile, $activity->context->attention); // Maintain direct reply associations - // @fixme what about conversation ID? + // @todo FIXME: What about conversation ID? if (!empty($activity->context->replyToID)) { - $orig = Notice::staticGet('uri', - $activity->context->replyToID); - if (!empty($orig)) { + $orig = Notice::getKV('uri', $activity->context->replyToID); + if ($orig instanceof Notice) { $options['reply_to'] = $orig->id; } } + if (!empty($activity->context->conversation)) { + // we store the URI here, Notice class can look it up later + $options['conversation'] = $activity->context->conversation; + } $location = $activity->context->location; if ($location) { @@ -586,6 +864,10 @@ class Ostatus_profile extends Managed_DataObject } } + if ($this->isPeopletag()) { + $options['peopletags'][] = $this->localPeopletag(); + } + // Atom categories <-> hashtags foreach ($activity->categories as $cat) { if ($cat->term) { @@ -598,16 +880,16 @@ class Ostatus_profile extends Managed_DataObject // Atom enclosures -> attachment URLs foreach ($activity->enclosures as $href) { - // @fixme save these locally or....? + // @todo FIXME: Save these locally or....? $options['urls'][] = $href; } try { - $saved = Notice::saveNew($oprofile->profile_id, + $saved = Notice::saveNew($profile->id, $content, 'ostatus', $options); - if ($saved) { + if ($saved instanceof Notice) { Ostatus_source::saveNew($saved, $this, $method); if (!empty($attachment)) { File_to_post::processNew($attachment->id, $saved->id); @@ -634,36 +916,35 @@ class Ostatus_profile extends Managed_DataObject /** * Filters a list of recipient ID URIs to just those for local delivery. - * @param Ostatus_profile local profile of sender + * @param Profile local profile of sender * @param array in/out &$attention_uris set of URIs, will be pruned on output * @return array of group IDs */ - protected function filterReplies($sender, &$attention_uris) + static public function filterAttention(Profile $sender, array $attention) { - common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', $attention_uris)); + common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', array_keys($attention))); $groups = array(); $replies = array(); - foreach (array_unique($attention_uris) as $recipient) { + foreach ($attention as $recipient=>$type) { // Is the recipient a local user? - $user = User::staticGet('uri', $recipient); - if ($user) { - // @fixme sender verification, spam etc? + $user = User::getKV('uri', $recipient); + if ($user instanceof User) { + // @todo FIXME: Sender verification, spam etc? $replies[] = $recipient; continue; } // Is the recipient a local group? - // $group = User_group::staticGet('uri', $recipient); + // TODO: $group = User_group::getKV('uri', $recipient); $id = OStatusPlugin::localGroupFromUrl($recipient); if ($id) { - $group = User_group::staticGet('id', $id); - if ($group) { + $group = User_group::getKV('id', $id); + if ($group instanceof User_group) { // Deliver to all members of this local group if allowed. - $profile = $sender->localProfile(); - if ($profile->isMember($group)) { + if ($sender->isMember($group)) { $groups[] = $group->id; } else { - common_log(LOG_DEBUG, "Skipping reply to local group $group->nickname as sender $profile->id is not a member"); + common_log(LOG_DEBUG, sprintf('Skipping reply to local group %s as sender %d is not a member', $group->getNickname(), $sender->id)); } continue; } else { @@ -673,14 +954,14 @@ class Ostatus_profile extends Managed_DataObject // Is the recipient a remote user or group? try { - $oprofile = Ostatus_profile::ensureProfileURI($recipient); + $oprofile = self::ensureProfileURI($recipient); if ($oprofile->isGroup()) { // Deliver to local members of this remote group. - // @fixme sender verification? + // @todo FIXME: Sender verification? $groups[] = $oprofile->group_id; } else { // may be canonicalized or something - $replies[] = $oprofile->uri; + $replies[] = $oprofile->getUri(); } continue; } catch (Exception $e) { @@ -689,10 +970,9 @@ class Ostatus_profile extends Managed_DataObject } } - $attention_uris = $replies; common_log(LOG_DEBUG, "Local reply recipients: " . implode(', ', $replies)); common_log(LOG_DEBUG, "Local group recipients: " . implode(', ', $groups)); - return $groups; + return array($groups, $replies); } /** @@ -705,12 +985,11 @@ class Ostatus_profile extends Managed_DataObject * @throws Exception on various error conditions * @throws OStatusShadowException if this reference would obscure a local user/group */ - public static function ensureProfileURL($profile_url, $hints=array()) { $oprofile = self::getFromProfileURL($profile_url); - if (!empty($oprofile)) { + if ($oprofile instanceof Ostatus_profile) { return $oprofile; } @@ -738,7 +1017,7 @@ class Ostatus_profile extends Managed_DataObject $oprofile = self::getFromProfileURL($finalUrl); - if (!empty($oprofile)) { + if ($oprofile instanceof Ostatus_profile) { return $oprofile; } } @@ -755,14 +1034,14 @@ class Ostatus_profile extends Managed_DataObject // Check if they've got an LRDD header - $lrdd = LinkHeader::getLink($response, 'lrdd', 'application/xrd+xml'); - - if (!empty($lrdd)) { - - $xrd = Discovery::fetchXrd($lrdd); + $lrdd = LinkHeader::getLink($response, 'lrdd'); + try { + $xrd = new XML_XRD(); + $xrd->loadFile($lrdd); $xrdHints = DiscoveryHints::fromXRD($xrd); - $hints = array_merge($hints, $xrdHints); + } catch (Exception $e) { + // No hints available from XRD } // If discovery found a feedurl (probably from LRDD), use it. @@ -796,27 +1075,22 @@ class Ostatus_profile extends Managed_DataObject */ static function getFromProfileURL($profile_url) { - $profile = Profile::staticGet('profileurl', $profile_url); - - if (empty($profile)) { + $profile = Profile::getKV('profileurl', $profile_url); + if (!$profile instanceof Profile) { return null; } - // Is it a known Ostatus profile? - - $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id); - - if (!empty($oprofile)) { + try { + $oprofile = self::getFromProfile($profile); + // We found the profile, return it! return $oprofile; - } - - // Is it a local user? - - $user = User::staticGet('id', $profile->id); - - if (!empty($user)) { - // @todo i18n FIXME: use sprintf and add i18n (?) - throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'."); + } catch (NoResultException $e) { + // Could not find an OStatus profile, is it instead a local user? + $user = User::getKV('id', $profile->id); + if ($user instanceof User) { + // @todo i18n FIXME: use sprintf and add i18n (?) + throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'."); + } } // Continue discovery; it's a remote profile @@ -826,6 +1100,16 @@ class Ostatus_profile extends Managed_DataObject return null; } + static function getFromProfile(Profile $profile) + { + $oprofile = new Ostatus_profile(); + $oprofile->profile_id = $profile->id; + if (!$oprofile->find(true)) { + throw new NoResultException($oprofile); + } + return $oprofile; + } + /** * Look up and if necessary create an Ostatus_profile for remote entity * with the given update feed. This should never return null -- you will @@ -843,7 +1127,10 @@ class Ostatus_profile extends Managed_DataObject $huburi = $discover->getHubLink(); $hints['hub'] = $huburi; - $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES); + + // XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future. + $salmonuri = $discover->getAtomLink(Salmon::REL_SALMON) + ?: $discover->getAtomLink(Salmon::NS_REPLIES); $hints['salmon'] = $salmonuri; if (!$huburi && !common_config('feedsub', 'fallback_hub')) { @@ -870,11 +1157,10 @@ class Ostatus_profile extends Managed_DataObject * * @param DOMElement $feedEl root element of a loaded Atom feed * @param array $hints additional discovery information passed from higher levels - * @fixme should this be marked public? + * @todo FIXME: Should this be marked public? * @return Ostatus_profile * @throws Exception */ - public static function ensureAtomFeed($feedEl, $hints) { $author = ActivityUtils::getFeedAuthor($feedEl); @@ -882,7 +1168,7 @@ class Ostatus_profile extends Managed_DataObject if (empty($author)) { // XXX: make some educated guesses here // TRANS: Feed sub exception. - throw new FeedSubException(_m('Can\'t find enough profile '. + throw new FeedSubException(_m('Cannot find enough profile '. 'information to make a feed.')); } @@ -897,7 +1183,7 @@ class Ostatus_profile extends Managed_DataObject * * @param DOMElement $feedEl root element of a loaded RSS feed * @param array $hints additional discovery information passed from higher levels - * @fixme should this be marked public? + * @todo FIXME: Should this be marked public? * @return Ostatus_profile * @throws Exception */ @@ -923,7 +1209,7 @@ class Ostatus_profile extends Managed_DataObject } } - // @fixme we should check whether this feed has elements + // @todo FIXME: We should check whether this feed has elements // with different or elements, and... I dunno. // Do something about that. @@ -946,28 +1232,30 @@ class Ostatus_profile extends Managed_DataObject } if (!common_valid_http_url($url)) { // TRANS: Server exception. %s is a URL. - throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url)); + throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url)); } if ($this->isGroup()) { + // FIXME: throw exception for localGroup $self = $this->localGroup(); } else { + // this throws an exception already $self = $this->localProfile(); } if (!$self) { throw new ServerException(sprintf( // TRANS: Server exception. %s is a URI. - _m("Tried to update avatar for unsaved remote profile %s."), - $this->uri)); + _m('Tried to update avatar for unsaved remote profile %s.'), + $this->getUri())); } - // @fixme this should be better encapsulated + // @todo FIXME: This should be better encapsulated // ripped from oauthstore.php (for old OMB client) $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar'); try { if (!copy($url, $temp_filename)) { // TRANS: Server exception. %s is a URL. - throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url)); + throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url)); } if ($this->isGroup()) { @@ -975,7 +1263,7 @@ class Ostatus_profile extends Managed_DataObject } else { $id = $this->profile_id; } - // @fixme should we be using different ids? + // @todo FIXME: Should we be using different ids? $imagefile = new ImageFile($id, $temp_filename); $filename = Avatar::filename($id, image_type_to_extension($imagefile->type), @@ -986,7 +1274,7 @@ class Ostatus_profile extends Managed_DataObject unlink($temp_filename); throw $e; } - // @fixme hardcoded chmod is lame, but seems to be necessary to + // @todo FIXME: Hardcoded chmod is lame, but seems to be necessary to // keep from accidentally saving images from command-line (queues) // that can't be read from web server, which causes hard-to-notice // problems later on: @@ -1008,7 +1296,6 @@ class Ostatus_profile extends Managed_DataObject * @param array $hints * @return mixed URL string or false */ - public static function getActivityObjectAvatar($object, $hints=array()) { if ($object->avatarLinks) { @@ -1038,7 +1325,6 @@ class Ostatus_profile extends Managed_DataObject * @param DOMElement $feed * @return string */ - protected static function getAvatar($actor, $feed) { $url = ''; @@ -1070,7 +1356,7 @@ class Ostatus_profile extends Managed_DataObject } if ($url) { $opts = array('allowed_schemes' => array('http', 'https')); - if (Validate::uri($url, $opts)) { + if (common_valid_http_url($url)) { return $url; } } @@ -1090,7 +1376,6 @@ class Ostatus_profile extends Managed_DataObject * @return Ostatus_profile * @throws Exception */ - public static function ensureActorProfile($activity, $hints=array()) { return self::ensureActivityObjectProfile($activity->actor, $hints); @@ -1107,11 +1392,10 @@ class Ostatus_profile extends Managed_DataObject * @return Ostatus_profile * @throws Exception */ - public static function ensureActivityObjectProfile($object, $hints=array()) { $profile = self::getActivityObjectProfile($object); - if ($profile) { + if ($profile instanceof Ostatus_profile) { $profile->updateFromActivityObject($object, $hints); } else { $profile = self::createActivityObjectProfile($object, $hints); @@ -1137,7 +1421,7 @@ class Ostatus_profile extends Managed_DataObject protected static function getActivityObjectProfile($object) { $uri = self::getActivityObjectProfileURI($object); - return Ostatus_profile::staticGet('uri', $uri); + return Ostatus_profile::getKV('uri', $uri); } /** @@ -1163,11 +1447,12 @@ class Ostatus_profile extends Managed_DataObject if ($object->link && common_valid_http_url($object->link)) { return $object->link; } - throw new ServerException("No author ID URI found."); + // TRANS: Server exception. + throw new ServerException(_m('No author ID URI found.')); } /** - * @fixme validate stuff somewhere + * @todo FIXME: Validate stuff somewhere. */ /** @@ -1188,18 +1473,28 @@ class Ostatus_profile extends Managed_DataObject if (!$homeuri) { common_log(LOG_DEBUG, __METHOD__ . " empty actor profile URI: " . var_export($activity, true)); - throw new Exception("No profile URI"); + // TRANS: Exception. + throw new Exception(_m('No profile URI.')); } - $user = User::staticGet('uri', $homeuri); - if ($user) { + $user = User::getKV('uri', $homeuri); + if ($user instanceof User) { // TRANS: Exception. - throw new Exception(_m('Local user can\'t be referenced as remote.')); + throw new Exception(_m('Local user cannot be referenced as remote.')); } if (OStatusPlugin::localGroupFromUrl($homeuri)) { // TRANS: Exception. - throw new Exception(_m('Local group can\'t be referenced as remote.')); + throw new Exception(_m('Local group cannot be referenced as remote.')); + } + + $ptag = Profile_list::getKV('uri', $homeuri); + if ($ptag instanceof Profile_list) { + $local_user = User::getKV('id', $ptag->tagger); + if ($local_user instanceof User) { + // TRANS: Exception. + throw new Exception(_m('Local list cannot be referenced as remote.')); + } } if (array_key_exists('feedurl', $hints)) { @@ -1216,7 +1511,9 @@ class Ostatus_profile extends Managed_DataObject $discover = new FeedDiscovery(); $discover->discoverFromFeedURL($hints['feedurl']); } - $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES); + // XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future. + $salmonuri = $discover->getAtomLink(Salmon::REL_SALMON) + ?: $discover->getAtomLink(Salmon::NS_REPLIES); } if (array_key_exists('hub', $hints)) { @@ -1249,28 +1546,69 @@ class Ostatus_profile extends Managed_DataObject self::updateProfile($profile, $object, $hints); $oprofile->profile_id = $profile->insert(); - if (!$oprofile->profile_id) { - // TRANS: Server exception. - throw new ServerException(_m('Can\'t save local profile.')); + if ($oprofile->profile_id === false) { + // TRANS: Server exception. + throw new ServerException(_m('Cannot save local profile.')); } - } else { + } else if ($object->type == ActivityObject::GROUP) { + $profile = new Profile(); + $profile->query('BEGIN'); + $group = new User_group(); $group->uri = $homeuri; $group->created = common_sql_now(); self::updateGroup($group, $object, $hints); + // TODO: We should do this directly in User_group->insert()! + // currently it's duplicated in User_group->update() + // AND User_group->register()!!! + $fields = array(/*group field => profile field*/ + 'nickname' => 'nickname', + 'fullname' => 'fullname', + 'mainpage' => 'profileurl', + 'homepage' => 'homepage', + 'description' => 'bio', + 'location' => 'location', + 'created' => 'created', + 'modified' => 'modified', + ); + foreach ($fields as $gf=>$pf) { + $profile->$pf = $group->$gf; + } + $profile_id = $profile->insert(); + if ($profile_id === false) { + $profile->query('ROLLBACK'); + throw new ServerException(_('Profile insertion failed.')); + } + + $group->profile_id = $profile_id; + $oprofile->group_id = $group->insert(); - if (!$oprofile->group_id) { + if ($oprofile->group_id === false) { + $profile->query('ROLLBACK'); // TRANS: Server exception. - throw new ServerException(_m('Can\'t save local profile.')); + throw new ServerException(_m('Cannot save local profile.')); + } + + $profile->query('COMMIT'); + } else if ($object->type == ActivityObject::_LIST) { + $ptag = new Profile_list(); + $ptag->uri = $homeuri; + $ptag->created = common_sql_now(); + self::updatePeopletag($ptag, $object, $hints); + + $oprofile->peopletag_id = $ptag->insert(); + if ($oprofile->peopletag_id === false) { + // TRANS: Server exception. + throw new ServerException(_m('Cannot save local list.')); } } $ok = $oprofile->insert(); - if (!$ok) { + if ($ok === false) { // TRANS: Server exception. - throw new ServerException(_m('Can\'t save OStatus profile.')); + throw new ServerException(_m('Cannot save OStatus profile.')); } $avatar = self::getActivityObjectAvatar($object, $hints); @@ -1298,12 +1636,16 @@ class Ostatus_profile extends Managed_DataObject if ($this->isGroup()) { $group = $this->localGroup(); self::updateGroup($group, $object, $hints); + } else if ($this->isPeopletag()) { + $ptag = $this->localPeopletag(); + self::updatePeopletag($ptag, $object, $hints); } else { $profile = $this->localProfile(); self::updateProfile($profile, $object, $hints); } + $avatar = self::getActivityObjectAvatar($object, $hints); - if ($avatar) { + if ($avatar && !isset($ptag)) { try { $this->updateAvatar($avatar); } catch (Exception $ex) { @@ -1338,7 +1680,7 @@ class Ostatus_profile extends Managed_DataObject $profile->profileurl = $object->link; } else if (array_key_exists('profileurl', $hints)) { $profile->profileurl = $hints['profileurl']; - } else if (Validate::uri($object->id, array('allowed_schemes' => array('http', 'https')))) { + } else if (common_valid_http_url($object->id)) { $profile->profileurl = $object->id; } @@ -1368,7 +1710,7 @@ class Ostatus_profile extends Managed_DataObject } } - // @fixme tags/categories + // @todo FIXME: tags/categories // @todo tags from categories if ($profile->id) { @@ -1377,7 +1719,7 @@ class Ostatus_profile extends Managed_DataObject } } - protected static function updateGroup($group, $object, $hints=array()) + protected static function updateGroup(User_group $group, $object, $hints=array()) { $orig = clone($group); @@ -1395,12 +1737,33 @@ class Ostatus_profile extends Managed_DataObject $group->location = self::getActivityObjectLocation($object, $hints); $group->homepage = self::getActivityObjectHomepage($object, $hints); - if ($group->id) { + if ($group->id) { // If no id, we haven't called insert() yet, so don't run update() common_log(LOG_DEBUG, "Updating OStatus group $group->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true)); $group->update($orig); } } + protected static function updatePeopletag($tag, $object, $hints=array()) { + $orig = clone($tag); + + $tag->tag = $object->title; + + if (!empty($object->link)) { + $tag->mainpage = $object->link; + } else if (array_key_exists('profileurl', $hints)) { + $tag->mainpage = $hints['profileurl']; + } + + $tag->description = $object->summary; + $tagger = self::ensureActivityObjectProfile($object->owner); + $tag->tagger = $tagger->profile_id; + + if ($tag->id) { + common_log(LOG_DEBUG, "Updating OStatus peopletag $tag->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true)); + $tag->update($orig); + } + } + protected static function getActivityObjectHomepage($object, $hints=array()) { $homepage = null; @@ -1560,18 +1923,17 @@ class Ostatus_profile extends Managed_DataObject // TRANS: Exception. throw new Exception(_m('Not a valid webfinger address.')); } - $oprofile = Ostatus_profile::staticGet('uri', $uri); - if (!empty($oprofile)) { + $oprofile = Ostatus_profile::getKV('uri', $uri); + if ($oprofile instanceof Ostatus_profile) { return $oprofile; } } // Try looking it up + $oprofile = Ostatus_profile::getKV('uri', Discovery::normalize($addr)); - $oprofile = Ostatus_profile::staticGet('uri', 'acct:'.$addr); - - if (!empty($oprofile)) { - self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri); + if ($oprofile instanceof Ostatus_profile) { + self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri()); return $oprofile; } @@ -1583,9 +1945,9 @@ class Ostatus_profile extends Managed_DataObject $xrd = $disco->lookup($addr); } catch (Exception $e) { // Save negative cache entry so we don't waste time looking it up again. - // @fixme distinguish temporary failures? + // @todo FIXME: Distinguish temporary failures? self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null); - // TRANS: Exception. + // TRANS: Exception. throw new Exception(_m('Not a valid webfinger address.')); } @@ -1596,7 +1958,6 @@ class Ostatus_profile extends Managed_DataObject $hints = array_merge($hints, $dhints); // If there's an Hcard, let's grab its info - if (array_key_exists('hcard', $hints)) { if (!array_key_exists('profileurl', $hints) || $hints['hcard'] != $hints['profileurl']) { @@ -1606,12 +1967,13 @@ class Ostatus_profile extends Managed_DataObject } // If we got a feed URL, try that - + $feedUrl = null; if (array_key_exists('feedurl', $hints)) { + $feedUrl = $hints['feedurl']; try { common_log(LOG_INFO, "Discovery on acct:$addr with feed URL " . $hints['feedurl']); $oprofile = self::ensureFeedURL($hints['feedurl'], $hints); - self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri); + self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri()); return $oprofile; } catch (Exception $e) { common_log(LOG_WARNING, "Failed creating profile from feed URL '$feedUrl': " . $e->getMessage()); @@ -1620,23 +1982,24 @@ class Ostatus_profile extends Managed_DataObject } // If we got a profile page, try that! - + $profileUrl = null; if (array_key_exists('profileurl', $hints)) { + $profileUrl = $hints['profileurl']; try { common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl"); $oprofile = self::ensureProfileURL($hints['profileurl'], $hints); - self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri); + self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri()); return $oprofile; } catch (OStatusShadowException $e) { // We've ended up with a remote reference to a local user or group. - // @fixme ideally we should be able to say who it was so we can + // @todo FIXME: Ideally we should be able to say who it was so we can // go back and refer to it the regular way throw $e; } catch (Exception $e) { common_log(LOG_WARNING, "Failed creating profile from profile URL '$profileUrl': " . $e->getMessage()); // keep looking // - // @fixme this means an error discovering from profile page + // @todo FIXME: This means an error discovering from profile page // may give us a corrupt entry using the webfinger URI, which // will obscure the correct page-keyed profile later on. } @@ -1646,7 +2009,6 @@ class Ostatus_profile extends Managed_DataObject // XXX: try FOAF if (array_key_exists('salmon', $hints)) { - $salmonEndpoint = $hints['salmon']; // An account URL, a salmon endpoint, and a dream? Not much to go @@ -1659,16 +2021,16 @@ class Ostatus_profile extends Managed_DataObject $profile->nickname = self::nicknameFromUri($uri); $profile->created = common_sql_now(); - if (isset($profileUrl)) { + if (!is_null($profileUrl)) { $profile->profileurl = $profileUrl; } $profile_id = $profile->insert(); - if (!$profile_id) { + if ($profile_id === false) { common_log_db_error($profile, 'INSERT', __FILE__); // TRANS: Exception. %s is a webfinger address. - throw new Exception(sprintf(_m('Couldn\'t save profile for "%s".'),$addr)); + throw new Exception(sprintf(_m('Could not save profile for "%s".'),$addr)); } $oprofile = new Ostatus_profile(); @@ -1678,24 +2040,25 @@ class Ostatus_profile extends Managed_DataObject $oprofile->profile_id = $profile_id; $oprofile->created = common_sql_now(); - if (isset($feedUrl)) { - $profile->feeduri = $feedUrl; + if (!is_null($feedUrl)) { + $oprofile->feeduri = $feedUrl; } $result = $oprofile->insert(); - if (!$result) { + if ($result === false) { + $profile->delete(); common_log_db_error($oprofile, 'INSERT', __FILE__); // TRANS: Exception. %s is a webfinger address. - throw new Exception(sprintf(_m('Couldn\'t save ostatus_profile for "%s".'),$addr)); + throw new Exception(sprintf(_m('Could not save OStatus profile for "%s".'),$addr)); } - self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri); + self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri()); return $oprofile; } // TRANS: Exception. %s is a webfinger address. - throw new Exception(sprintf(_m('Couldn\'t find a valid profile for "%s".'),$addr)); + throw new Exception(sprintf(_m('Could not find a valid profile for "%s".'),$addr)); } /** @@ -1750,54 +2113,59 @@ class Ostatus_profile extends Managed_DataObject // First, try to query it - $oprofile = Ostatus_profile::staticGet('uri', $uri); + $oprofile = Ostatus_profile::getKV('uri', $uri); - // If unfound, do discovery stuff + if ($oprofile instanceof Ostatus_profile) { + return $oprofile; + } - if (empty($oprofile)) { - if (preg_match("/^(\w+)\:(.*)/", $uri, $match)) { - $protocol = $match[1]; - switch ($protocol) { - case 'http': - case 'https': - $oprofile = Ostatus_profile::ensureProfileURL($uri); - break; - case 'acct': - case 'mailto': - $rest = $match[2]; - $oprofile = Ostatus_profile::ensureWebfinger($rest); - break; - default: - throw new ServerException("Unrecognized URI protocol for profile: $protocol ($uri)"); - break; - } - } else { - throw new ServerException("No URI protocol for profile: ($uri)"); + // If unfound, do discovery stuff + if (preg_match("/^(\w+)\:(.*)/", $uri, $match)) { + $protocol = $match[1]; + switch ($protocol) { + case 'http': + case 'https': + $oprofile = self::ensureProfileURL($uri); + break; + case 'acct': + case 'mailto': + $rest = $match[2]; + $oprofile = self::ensureWebfinger($rest); + break; + default: + // TRANS: Server exception. + // TRANS: %1$s is a protocol, %2$s is a URI. + throw new ServerException(sprintf(_m('Unrecognized URI protocol for profile: %1$s (%2$s).'), + $protocol, + $uri)); + break; } + } else { + // TRANS: Server exception. %s is a URI. + throw new ServerException(sprintf(_m('No URI protocol for profile: %s.'),$uri)); } return $oprofile; } - function checkAuthorship($activity) + public function checkAuthorship(Activity $activity) { - if ($this->isGroup()) { - // A group feed will contain posts from multiple authors. - // @fixme validate these profiles in some way! + if ($this->isGroup() || $this->isPeopletag()) { + // A group or propletag feed will contain posts from multiple authors. $oprofile = self::ensureActorProfile($activity); - if ($oprofile->isGroup()) { + if ($oprofile->isGroup() || $oprofile->isPeopletag()) { // Groups can't post notices in StatusNet. - common_log(LOG_WARNING, - "OStatus: skipping post with group listed as author: ". - "$oprofile->uri in feed from $this->uri"); - return false; + common_log(LOG_WARNING, + "OStatus: skipping post with group listed ". + "as author: " . $oprofile->getUri() . " in feed from " . $this->getUri()); + throw new ServerException('Activity author is a non-actor'); } } else { $actor = $activity->actor; if (empty($actor)) { // OK here! assume the default - } else if ($actor->id == $this->uri || $actor->link == $this->uri) { + } else if ($actor->id == $this->getUri() || $actor->link == $this->getUri()) { $this->updateFromActivityObject($actor); } else if ($actor->id) { // We have an ActivityStreams actor with an explicit ID that doesn't match the feed owner. @@ -1806,7 +2174,7 @@ class Ostatus_profile extends Managed_DataObject // Most likely this is a plain ol' blog feed of some kind which // doesn't match our expectations. We'll take the entry, but ignore // the info. - common_log(LOG_WARNING, "Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for {$this->uri}"); + common_log(LOG_WARNING, "Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for " . $this->getUri()); } else { // Plain without ActivityStreams actor info. // We'll just ignore this info for now and save the update under the feed's identity. @@ -1815,7 +2183,7 @@ class Ostatus_profile extends Managed_DataObject $oprofile = $this; } - return $oprofile; + return $oprofile->localProfile(); } }