X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=263cc4e32394ecbcd2880ac2f8cc91e3067a9779;hb=76babcb430e6fae9254541f5a26483e576dfe5f3;hp=b83af67563980ee9fbbe0de47a9b6ed959c1355d;hpb=04b7194511ec503eb40ffc3a9d468863ab1e0a42;p=quix0rs-gnu-social.git diff --git a/classes/Notice.php b/classes/Notice.php index b83af67563..263cc4e323 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -141,14 +141,21 @@ class Notice extends Managed_DataObject const GROUP_SCOPE = 4; const FOLLOWER_SCOPE = 8; - protected $_profile = -1; + protected $_profile = array(); + /** + * Will always return a profile, if anything fails it will + * (through _setProfile) throw a NoProfileException. + */ public function getProfile() { - if ($this->_profile === -1) { - $this->_setProfile(Profile::getKV('id', $this->profile_id)); + if (!isset($this->_profile[$this->profile_id])) { + // We could've sent getKV directly to _setProfile, but occasionally we get + // a "false" (instead of null), likely because it indicates a cache miss. + $profile = Profile::getKV('id', $this->profile_id); + $this->_setProfile($profile instanceof Profile ? $profile : null); } - return $this->_profile; + return $this->_profile[$this->profile_id]; } public function _setProfile(Profile $profile=null) @@ -156,7 +163,7 @@ class Notice extends Managed_DataObject if (!$profile instanceof Profile) { throw new NoProfileException($this->profile_id); } - $this->_profile = $profile; + $this->_profile[$this->profile_id] = $profile; } function delete($useWhere=false) @@ -190,7 +197,6 @@ class Notice extends Managed_DataObject $this->clearReplies(); $this->clearRepeats(); - $this->clearFaves(); $this->clearTags(); $this->clearGroupInboxes(); $this->clearFiles(); @@ -210,6 +216,28 @@ class Notice extends Managed_DataObject return $this->uri; } + /* + * Get a Notice object by URI. Will call external plugins for help + * using the event StartGetNoticeFromURI. + * + * @param string $uri A unique identifier for a resource (notice in this case) + */ + static function fromUri($uri) + { + $notice = null; + + if (Event::handle('StartGetNoticeFromUri', array($uri, &$notice))) { + $notice = Notice::getKV('uri', $uri); + Event::handle('EndGetNoticeFromUri', array($uri, $notice)); + } + + if (!$notice instanceof Notice) { + throw new UnknownUriException($uri); + } + + return $notice; + } + /* * @param $root boolean If true, link to just the conversation root. * @@ -228,21 +256,41 @@ class Notice extends Managed_DataObject return common_local_url('shownotice', array('notice' => $this->id), null, null, false); } + public function getTitle() + { + $title = null; + if (Event::handle('GetNoticeTitle', array($this, &$title))) { + // TRANS: Title of a notice posted without a title value. + // TRANS: %1$s is a user name, %2$s is the notice creation date/time. + $title = sprintf(_('%1$s\'s status on %2$s'), + $this->getProfile()->getFancyName(), + common_exact_date($this->created)); + } + return $title; + } + + public function getContent() + { + return $this->content; + } + /* * Get the original representation URL of this notice. + * + * @param boolean $fallback Whether to fall back to generate a local URL or throw InvalidUrlException */ - public function getUrl() + public function getUrl($fallback=false) { // The risk is we start having empty urls and non-http uris... // and we can't really handle any other protocol right now. switch (true) { case common_valid_http_url($this->url): // should we allow non-http/https URLs? return $this->url; - case $this->isLocal(): + case !$this->isLocal() && common_valid_http_url($this->uri): // Sometimes we only have the URI for remote posts. + return $this->uri; + case $this->isLocal() || $fallback: // let's generate a valid link to our locally available notice on demand return common_local_url('shownotice', array('notice' => $this->id), null, null, false); - case common_valid_http_url($this->uri): - return $this->uri; default: common_debug('No URL available for notice: id='.$this->id); throw new InvalidUrlException($this->url); @@ -284,7 +332,7 @@ class Notice extends Managed_DataObject * Record the given set of hash tags in the db for this notice. * Given tag strings will be normalized and checked for dupes. */ - function saveKnownTags($hashtags) + function saveKnownTags(array $hashtags) { //turn each into their canonical tag //this is needed to remove dupes before saving e.g. #hash.tag = #hashtag @@ -368,23 +416,27 @@ class Notice extends Managed_DataObject * @return Notice * @throws ClientException */ - static function saveNew($profile_id, $content, $source, array $options=null) { + static function saveNew($profile_id, $content, $source, array $options=array()) { $defaults = array('uri' => null, 'url' => null, - 'reply_to' => null, - 'repeat_of' => null, + 'conversation' => null, // URI of conversation + 'reply_to' => null, // This will override convo URI if the parent is known + 'repeat_of' => null, // This will override convo URI if the repeated notice is known 'scope' => null, 'distribute' => true, 'object_type' => null, 'verb' => null); - if (!empty($options) && is_array($options)) { + /* + * Above type-hint is already array, so simply count it, this saves + * "some" CPU cycles. + */ + if (count($options) > 0) { $options = array_merge($defaults, $options); - extract($options); - } else { - extract($defaults); } + extract($options); + if (!isset($is_local)) { $is_local = Notice::LOCAL_PUBLIC; } @@ -490,8 +542,7 @@ class Notice extends Managed_DataObject throw new ClientException(_('You cannot repeat your own notice.')); } - if ($repeat->scope != Notice::SITE_SCOPE && - $repeat->scope != Notice::PUBLIC_SCOPE) { + if ($repeat->isPrivateScope()) { // TRANS: Client error displayed when trying to repeat a non-public notice. throw new ClientException(_('Cannot repeat a private notice.'), 403); } @@ -507,12 +558,22 @@ class Notice extends Managed_DataObject throw new ClientException(_('You already repeated that notice.')); } - $notice->repeat_of = $repeat_of; + $notice->repeat_of = $repeat->id; + $notice->conversation = $repeat->conversation; } else { - $reply = self::getReplyTo($reply_to, $profile_id, $source, $final); + $reply = null; - if (!empty($reply)) { + // If $reply_to is specified, we check that it exists, and then + // return it if it does + if (!empty($reply_to)) { + $reply = Notice::getKV('id', $reply_to); + } elseif (in_array($source, array('xmpp', 'mail', 'sms'))) { + // If the source lacks capability of sending the "reply_to" + // metadata, let's try to find an inline replyto-reference. + $reply = self::getInlineReplyTo($profile, $final); + } + if ($reply instanceof Notice) { if (!$reply->inScope($profile)) { // TRANS: Client error displayed when trying to reply to a notice a the target has no access to. // TRANS: %1$s is a user nickname, %2$d is a notice ID (number). @@ -520,11 +581,17 @@ class Notice extends Managed_DataObject $profile->nickname, $reply->id), 403); } - $notice->reply_to = $reply->id; + // If it's a repeat, the reply_to should be to the original + if ($reply->isRepeat()) { + $notice->reply_to = $reply->repeat_of; + } else { + $notice->reply_to = $reply->id; + } + // But the conversation ought to be the same :) $notice->conversation = $reply->conversation; - // If the original is private to a group, and notice has no group specified, - // make it to the same group(s) + // If the original is private to a group, and notice has + // no group specified, make it to the same group(s) if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) { $groups = array(); @@ -538,6 +605,26 @@ class Notice extends Managed_DataObject // Scope set below } + + // If we don't know the reply, we might know the conversation! + // This will happen if a known remote user replies to an + // unknown remote user - within a known conversation. + if (empty($notice->conversation) and !empty($options['conversation'])) { + $conv = Conversation::getKV('uri', $options['conversation']); + if ($conv instanceof Conversation) { + common_debug('Conversation stitched together from (probably) reply to unknown remote user. Activity creation time ('.$notice->created.') should maybe be compared to conversation creation time ('.$conv->created.').'); + $notice->conversation = $conv->id; + } else { + // Conversation URI was not found, so we must create it. But we can't create it + // until we have a Notice ID because of the database layout... + $notice->tmp_conv_uri = $options['conversation']; + } + } else { + // If we're not using the attached conversation URI let's remove it + // so we don't mistake ourselves later, when creating our own Conversation. + // This implies that the notice knows which conversation it belongs to. + $options['conversation'] = null; + } } if (!empty($lat) && !empty($lon)) { @@ -557,7 +644,7 @@ class Notice extends Managed_DataObject } if (empty($verb)) { - if (!empty($notice->repeat_of)) { + if ($notice->isRepeat()) { $notice->verb = ActivityVerb::SHARE; $notice->object_type = ActivityObject::ACTIVITY; } else { @@ -573,126 +660,337 @@ class Notice extends Managed_DataObject $notice->object_type = $object_type; } - if (is_null($scope)) { // 0 is a valid value - if (!empty($reply)) { - $notice->scope = $reply->scope; - } else { - $notice->scope = self::defaultScope(); - } + if (is_null($scope) && $reply instanceof Notice) { + $notice->scope = $reply->scope; } else { $notice->scope = $scope; } - // For private streams + $notice->scope = self::figureOutScope($profile, $groups, $notice->scope); - try { - $user = $profile->getUser(); + if (Event::handle('StartNoticeSave', array(&$notice))) { - if ($user->private_stream && - ($notice->scope == Notice::PUBLIC_SCOPE || - $notice->scope == Notice::SITE_SCOPE)) { - $notice->scope |= Notice::FOLLOWER_SCOPE; + // XXX: some of these functions write to the DB + + try { + $notice->insert(); // throws exception on failure + // If it's not part of a conversation, it's + // the beginning of a new conversation. + if (empty($notice->conversation)) { + $orig = clone($notice); + // $act->context->conversation will be null if it was not provided + $conv = Conversation::create($notice, $options['conversation']); + $notice->conversation = $conv->id; + $notice->update($orig); + } + } catch (Exception $e) { + // Let's test if we managed initial insert, which would imply + // failing on some update-part (check 'insert()'). Delete if + // something had been stored to the database. + if (!empty($notice->id)) { + $notice->delete(); + } + throw $e; } - } catch (NoSuchUserException $e) { - // Cannot handle private streams for remote profiles } - // Force the scope for private groups + // Clear the cache for subscribed users, so they'll update at next request + // XXX: someone clever could prepend instead of clearing the cache - foreach ($groups as $groupId) { - $group = User_group::getKV('id', $groupId); - if ($group instanceof User_group) { - if ($group->force_scope) { - $notice->scope |= Notice::GROUP_SCOPE; - break; + // Save per-notice metadata... + + if (isset($replies)) { + $notice->saveKnownReplies($replies); + } else { + $notice->saveReplies(); + } + + if (isset($tags)) { + $notice->saveKnownTags($tags); + } else { + $notice->saveTags(); + } + + // Note: groups may save tags, so must be run after tags are saved + // to avoid errors on duplicates. + // Note: groups should always be set. + + $notice->saveKnownGroups($groups); + + if (isset($urls)) { + $notice->saveKnownUrls($urls); + } else { + $notice->saveUrls(); + } + + if ($distribute) { + // Prepare inbox delivery, may be queued to background. + $notice->distribute(); + } + + return $notice; + } + + static function saveActivity(Activity $act, Profile $actor, array $options=array()) + { + // First check if we're going to let this Activity through from the specific actor + if (!$actor->hasRight(Right::NEWNOTICE)) { + common_log(LOG_WARNING, "Attempted post from user disallowed to post: " . $actor->getNickname()); + + // TRANS: Client exception thrown when a user tries to post while being banned. + throw new ClientException(_m('You are banned from posting notices on this site.'), 403); + } + if (common_config('throttle', 'enabled') && !self::checkEditThrottle($actor->id)) { + common_log(LOG_WARNING, 'Excessive posting by profile #' . $actor->id . '; throttled.'); + // TRANS: Client exception thrown when a user tries to post too many notices in a given time frame. + throw new ClientException(_m('Too many notices too fast; take a breather '. + 'and post again in a few minutes.')); + } + + // Get ActivityObject properties + if (!empty($act->id)) { + // implied object + $options['uri'] = $act->id; + $options['url'] = $act->link; + } else { + $actobj = count($act->objects)==1 ? $act->objects[0] : null; + if (!is_null($actobj) && !empty($actobj->id)) { + $options['uri'] = $actobj->id; + if ($actobj->link) { + $options['url'] = $actobj->link; + } elseif (preg_match('!^https?://!', $actobj->id)) { + $options['url'] = $actobj->id; } } } - if (Event::handle('StartNoticeSave', array(&$notice))) { - - // XXX: some of these functions write to the DB + $defaults = array( + 'groups' => array(), + 'is_local' => self::LOCAL_PUBLIC, + 'mentions' => array(), + 'reply_to' => null, + 'repeat_of' => null, + 'scope' => null, + 'source' => 'unknown', + 'tags' => array(), + 'uri' => null, + 'url' => null, + 'urls' => array(), + 'distribute' => true); - $id = $notice->insert(); + // options will have default values when nothing has been supplied + $options = array_merge($defaults, $options); + foreach (array_keys($defaults) as $key) { + // Only convert the keynames we specify ourselves from 'defaults' array into variables + $$key = $options[$key]; + } + extract($options, EXTR_SKIP); - if (!$id) { - common_log_db_error($notice, 'INSERT', __FILE__); - // TRANS: Server exception thrown when a notice cannot be saved. - throw new ServerException(_('Problem saving notice.')); + $stored = new Notice(); + if (!empty($uri)) { + $stored->uri = $uri; + if ($stored->find()) { + common_debug('cannot create duplicate Notice URI: '.$stored->uri); + throw new Exception('Notice URI already exists'); } + } + + $stored->profile_id = $actor->id; + $stored->source = $source; + $stored->uri = $uri; + $stored->url = $url; + $stored->verb = $act->verb; - // Update ID-dependent columns: URI, conversation + // Use the local user's shortening preferences, if applicable. + $stored->rendered = $actor->isLocal() + ? $actor->shortenLinks($act->content) + : $act->content; + $stored->content = common_strip_html($stored->rendered); - $orig = clone($notice); + $autosource = common_config('public', 'autosource'); - $changed = false; + // Sandboxed are non-false, but not 1, either + if (!$actor->hasRight(Right::PUBLICNOTICE) || + ($source && $autosource && in_array($source, $autosource))) { + $stored->is_local = Notice::LOCAL_NONPUBLIC; + } + + // Maybe a missing act-time should be fatal if the actor is not local? + if (!empty($act->time)) { + $stored->created = common_sql_date($act->time); + } else { + $stored->created = common_sql_now(); + } - // We can only get here if it's a local notice, since remote notices - // should've bailed out earlier due to lacking a URI. - if (empty($notice->uri)) { - $notice->uri = sprintf('%s%s=%d:%s=%s', - TagURI::mint(), - 'noticeId', $notice->id, - 'objectType', $notice->get_object_type(true)); - $changed = true; + $reply = null; + if ($act->context instanceof ActivityContext && !empty($act->context->replyToID)) { + $reply = self::getKV('uri', $act->context->replyToID); + } + if (!$reply instanceof Notice && $act->target instanceof ActivityObject) { + $reply = self::getKV('uri', $act->target->id); + } + + if ($reply instanceof Notice) { + if (!$reply->inScope($actor)) { + // TRANS: Client error displayed when trying to reply to a notice a the target has no access to. + // TRANS: %1$s is a user nickname, %2$d is a notice ID (number). + throw new ClientException(sprintf(_m('%1$s has no right to reply to notice %2$d.'), $actor->getNickname(), $reply->id), 403); } - // If it's not part of a conversation, it's - // the beginning of a new conversation. + $stored->reply_to = $reply->id; + $stored->conversation = $reply->conversation; + + // If the original is private to a group, and notice has no group specified, + // make it to the same group(s) + if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) { + $groups = array(); + $replyGroups = $reply->getGroups(); + foreach ($replyGroups as $group) { + if ($actor->isMember($group)) { + $groups[] = $group->id; + } + } + } - if (empty($notice->conversation)) { - $conv = Conversation::create($notice); - $notice->conversation = $conv->id; - $changed = true; + if (is_null($scope)) { + $scope = $reply->scope; } + } - if ($changed) { - if ($notice->update($orig) === false) { - common_log_db_error($notice, 'UPDATE', __FILE__); - // TRANS: Server exception thrown when a notice cannot be updated. - throw new ServerException(_('Problem saving notice.')); + if ($act->context instanceof ActivityContext) { + $location = $act->context->location; + if ($location) { + $stored->lat = $location->lat; + $stored->lon = $location->lon; + if ($location->location_id) { + $stored->location_ns = $location->location_ns; + $stored->location_id = $location->location_id; } } + } else { + $act->context = new ActivityContext(); + } + + $stored->scope = self::figureOutScope($actor, $groups, $scope); + foreach ($act->categories as $cat) { + if ($cat->term) { + $term = common_canonical_tag($cat->term); + if (!empty($term)) { + $tags[] = $term; + } + } } - // Clear the cache for subscribed users, so they'll update at next request - // XXX: someone clever could prepend instead of clearing the cache + foreach ($act->enclosures as $href) { + // @todo FIXME: Save these locally or....? + $urls[] = $href; + } - $notice->blowOnInsert(); + if (Event::handle('StartNoticeSave', array(&$stored))) { + // XXX: some of these functions write to the DB + + try { + $stored->insert(); // throws exception on error + $orig = clone($stored); // for updating later in this try clause + + // If it's not part of a conversation, it's + // the beginning of a new conversation. + if (empty($stored->conversation)) { + // $act->context->conversation will be null if it was not provided + $conv = Conversation::create($stored, $act->context->conversation); + $stored->conversation = $conv->id; + } + + $object = null; + Event::handle('StoreActivityObject', array($act, $stored, $options, &$object)); + if (empty($object)) { + throw new ServerException('No object from StoreActivityObject '.$stored->uri . ': '.$act->asString()); + } + $stored->object_type = ActivityUtils::resolveUri($object->getObjectType(), true); + $stored->update($orig); + } catch (Exception $e) { + if (empty($stored->id)) { + common_debug('Failed to save stored object entry in database ('.$e->getMessage().')'); + } else { + common_debug('Failed to store activity object in database ('.$e->getMessage().'), deleting notice id '.$stored->id); + $stored->delete(); + } + throw $e; + } + } + if (!$stored instanceof Notice) { + throw new ServerException('StartNoticeSave did not give back a Notice'); + } // Save per-notice metadata... + $mentions = array(); + $groups = array(); - if (isset($replies)) { - $notice->saveKnownReplies($replies); + // This event lets plugins filter out non-local recipients (attentions we don't care about) + // Used primarily for OStatus (and if we don't federate, all attentions would be local anyway) + Event::handle('GetLocalAttentions', array($actor, $act->context->attention, &$mentions, &$groups)); + + if (!empty($mentions)) { + $stored->saveKnownReplies($mentions); } else { - $notice->saveReplies(); + $stored->saveReplies(); } - if (isset($tags)) { - $notice->saveKnownTags($tags); + if (!empty($tags)) { + $stored->saveKnownTags($tags); } else { - $notice->saveTags(); + $stored->saveTags(); } // Note: groups may save tags, so must be run after tags are saved // to avoid errors on duplicates. // Note: groups should always be set. - $notice->saveKnownGroups($groups); + $stored->saveKnownGroups($groups); - if (isset($urls)) { - $notice->saveKnownUrls($urls); + if (!empty($urls)) { + $stored->saveKnownUrls($urls); } else { - $notice->saveUrls(); + $stored->saveUrls(); } if ($distribute) { // Prepare inbox delivery, may be queued to background. - $notice->distribute(); + $stored->distribute(); + } + + return $stored; + } + + static public function figureOutScope(Profile $actor, array $groups, $scope=null) { + if (is_null($scope)) { + $scope = self::defaultScope(); } - return $notice; + // For private streams + try { + $user = $actor->getUser(); + // FIXME: We can't do bit comparison with == (Legacy StatusNet thing. Let's keep it for now.) + if ($user->private_stream && ($scope == Notice::PUBLIC_SCOPE || $scope == Notice::SITE_SCOPE)) { + $scope |= Notice::FOLLOWER_SCOPE; + } + } catch (NoSuchUserException $e) { + // TODO: Not a local user, so we don't know about scope preferences... yet! + } + + // Force the scope for private groups + foreach ($groups as $group_id) { + $group = User_group::staticGet('id', $group_id); + if ($group instanceof User_group) { + if ($group->force_scope) { + $scope |= Notice::GROUP_SCOPE; + break; + } + } + } + + return $scope; } function blowOnInsert($conversation = false) @@ -701,12 +999,13 @@ class Notice extends Managed_DataObject if ($this->isPublic()) { $this->blowStream('public'); + $this->blowStream('networkpublic'); } self::blow('notice:list-ids:conversation:%s', $this->conversation); self::blow('conversation:notice_count:%d', $this->conversation); - if (!empty($this->repeat_of)) { + if ($this->isRepeat()) { // XXX: we should probably only use one of these $this->blowStream('notice:repeats:%d', $this->repeat_of); self::blow('notice:list-ids:repeat_of:%d', $this->repeat_of); @@ -745,6 +1044,7 @@ class Notice extends Managed_DataObject if ($this->isPublic()) { self::blow('public;last'); + self::blow('networkpublic;last'); } self::blow('fave:by_notice', $this->id); @@ -817,12 +1117,16 @@ class Notice extends Managed_DataObject * * @return void */ - function saveKnownUrls($urls) + function saveKnownUrls(array $urls) { if (common_config('attachments', 'process_links')) { // @fixme validation? foreach (array_unique($urls) as $url) { - File::processNew($url, $this->id); + try { + File::processNew($url, $this->id); + } catch (ServerException $e) { + // Could not save URL. Log it? + } } } } @@ -831,7 +1135,11 @@ class Notice extends Managed_DataObject * @private callback */ function saveUrl($url, $notice_id) { - File::processNew($url, $notice_id); + try { + File::processNew($url, $notice_id); + } catch (ServerException $e) { + // Could not save URL. Log it? + } } static function checkDupes($profile_id, $content) { @@ -880,12 +1188,11 @@ class Notice extends Managed_DataObject return true; } - protected $_attachments = -1; + protected $_attachments = array(); function attachments() { - - if ($this->_attachments != -1) { - return $this->_attachments; + if (isset($this->_attachments[$this->id])) { + return $this->_attachments[$this->id]; } $f2ps = File_to_post::listGet('post_id', array($this->id)); @@ -898,14 +1205,14 @@ class Notice extends Managed_DataObject $files = File::multiGet('id', $ids); - $this->_attachments = $files->fetchAll(); + $this->_attachments[$this->id] = $files->fetchAll(); - return $this->_attachments; + return $this->_attachments[$this->id]; } function _setAttachments($attachments) { - $this->_attachments = $attachments; + $this->_attachments[$this->id] = $attachments; } function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0) @@ -970,10 +1277,16 @@ class Notice extends Managed_DataObject } // If this isn't a reply to anything, then it's its own - // root. + // root if it's the earliest notice in the conversation: if (empty($this->reply_to)) { - return $this; + $root = new Notice; + $root->conversation = $this->conversation; + $root->orderBy('notice.created ASC'); + $root->find(); + $root->fetch(); + $root->free(); + return $root; } if (is_null($profile)) { @@ -1075,7 +1388,7 @@ class Notice extends Managed_DataObject // Exclude any deleted, non-local, or blocking recipients. $profile = $this->getProfile(); $originalProfile = null; - if ($this->repeat_of) { + if ($this->isRepeat()) { // Check blocks against the original notice's poster as well. $original = Notice::getKV('id', $this->repeat_of); if ($original instanceof Notice) { @@ -1182,7 +1495,7 @@ class Notice extends Managed_DataObject foreach (array_unique($group_ids) as $id) { $group = User_group::getKV('id', $id); if ($group instanceof User_group) { - common_log(LOG_ERR, "Local delivery to group id $id, $group->nickname"); + common_log(LOG_DEBUG, "Local delivery to group id $id, $group->nickname"); $result = $this->addToGroupInbox($group); if (!$result) { common_log_db_error($gi, 'INSERT', __FILE__); @@ -1256,10 +1569,9 @@ class Notice extends Managed_DataObject $sender = Profile::getKV($this->profile_id); foreach (array_unique($uris) as $uri) { - - $profile = Profile::fromURI($uri); - - if (!$profile instanceof Profile) { + try { + $profile = Profile::fromUri($uri); + } catch (UnknownUriException $e) { common_log(LOG_WARNING, "Unable to determine profile for URI '$uri'"); continue; } @@ -1290,23 +1602,21 @@ class Notice extends Managed_DataObject { // Don't save reply data for repeats - if (!empty($this->repeat_of)) { + if ($this->isRepeat()) { return array(); } - $sender = Profile::getKV($this->profile_id); + $sender = $this->getProfile(); $replied = array(); // If it's a reply, save for the replied-to author try { $parent = $this->getParent(); - $author = $parent->getProfile(); - if ($author instanceof Profile) { - $this->saveReply($author->id); - $replied[$author->id] = 1; - self::blow('reply:stream:%d', $author->id); - } + $parentauthor = $parent->getProfile(); + $this->saveReply($parentauthor->id); + $replied[$parentauthor->id] = 1; + self::blow('reply:stream:%d', $parentauthor->id); } catch (Exception $e) { // Not a reply, since it has no parent! } @@ -1360,7 +1670,7 @@ class Notice extends Managed_DataObject return $reply; } - protected $_replies = -1; + protected $_replies = array(); /** * Pull the complete list of @-reply targets for this notice. @@ -1369,8 +1679,8 @@ class Notice extends Managed_DataObject */ function getReplies() { - if ($this->_replies != -1) { - return $this->_replies; + if (isset($this->_replies[$this->id])) { + return $this->_replies[$this->id]; } $replyMap = Reply::listGet('notice_id', array($this->id)); @@ -1381,14 +1691,14 @@ class Notice extends Managed_DataObject $ids[] = $reply->profile_id; } - $this->_replies = $ids; + $this->_setReplies($ids); return $ids; } - function _setReplies($replies) + function _setReplies(array $replies) { - $this->_replies = $replies; + $this->_replies[$this->id] = $replies; } /** @@ -1415,17 +1725,21 @@ class Notice extends Managed_DataObject { // Don't send reply notifications for repeats - if (!empty($this->repeat_of)) { + if ($this->isRepeat()) { return array(); } $recipientIds = $this->getReplies(); + if (Event::handle('StartNotifyMentioned', array($this, &$recipientIds))) { + require_once INSTALLDIR.'/lib/mail.php'; - foreach ($recipientIds as $recipientId) { - $user = User::getKV('id', $recipientId); - if ($user instanceof User) { - mail_notify_attn($user, $this); + foreach ($recipientIds as $recipientId) { + $user = User::getKV('id', $recipientId); + if ($user instanceof User) { + mail_notify_attn($user, $this); + } } + Event::handle('EndNotifyMentioned', array($this, $recipientIds)); } } @@ -1436,7 +1750,7 @@ class Notice extends Managed_DataObject * @return array of Group objects */ - protected $_groups = -1; + protected $_groups = array(); function getGroups() { @@ -1446,9 +1760,8 @@ class Notice extends Managed_DataObject return array(); } - if ($this->_groups != -1) - { - return $this->_groups; + if (isset($this->_groups[$this->id])) { + return $this->_groups[$this->id]; } $gis = Group_inbox::listGet('notice_id', array($this->id)); @@ -1461,26 +1774,24 @@ class Notice extends Managed_DataObject } $groups = User_group::multiGet('id', $ids); - - $this->_groups = $groups->fetchAll(); - - return $this->_groups; + $this->_setGroups($groups->fetchAll()); + return $this->_groups[$this->id]; } - - function _setGroups($groups) + + function _setGroups(array $groups) { - $this->_groups = $groups; + $this->_groups[$this->id] = $groups; } /** * Convert a notice into an activity for export. * - * @param User $cur Current user + * @param Profile $scoped The currently logged in/scoped profile * * @return Activity activity object representing this Notice. */ - function asActivity($cur=null) + function asActivity(Profile $scoped=null) { $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id)); @@ -1489,7 +1800,7 @@ class Notice extends Managed_DataObject } $act = new Activity(); - if (Event::handle('StartNoticeAsActivity', array($this, &$act))) { + if (Event::handle('StartNoticeAsActivity', array($this, $act, $scoped))) { $act->id = $this->uri; $act->time = strtotime($this->created); @@ -1503,18 +1814,23 @@ class Notice extends Managed_DataObject $profile = $this->getProfile(); - $act->actor = ActivityObject::fromProfile($profile); - $act->actor->extra[] = $profile->profileInfo($cur); + $act->actor = $profile->asActivityObject(); + $act->actor->extra[] = $profile->profileInfo($scoped); $act->verb = $this->verb; if ($this->repeat_of) { $repeated = Notice::getKV('id', $this->repeat_of); if ($repeated instanceof Notice) { - $act->objects[] = $repeated->asActivity($cur); + // TRANS: A repeat activity's title. %1$s is repeater's nickname + // and %2$s is the repeated user's nickname. + $act->title = sprintf(_('%1$s repeated a notice by %2$s'), + $this->getProfile()->getNickname(), + $repeated->getProfile()->getNickname()); + $act->objects[] = $repeated->asActivity($scoped); } } else { - $act->objects[] = ActivityObject::fromNotice($this); + $act->objects[] = $this->asActivityObject(); } // XXX: should this be handled by default processing for object entry? @@ -1636,7 +1952,7 @@ class Notice extends Managed_DataObject $act->editLink = $act->selfLink; } - Event::handle('EndNoticeAsActivity', array($this, &$act)); + Event::handle('EndNoticeAsActivity', array($this, $act, $scoped)); } self::cacheSet(Cache::codeKey('notice:as-activity:'.$this->id), $act); @@ -1650,10 +1966,10 @@ class Notice extends Managed_DataObject function asAtomEntry($namespace=false, $source=false, $author=true, - $cur=null) + Profile $scoped=null) { - $act = $this->asActivity($cur); - $act->extra[] = $this->noticeInfo($cur); + $act = $this->asActivity($scoped); + $act->extra[] = $this->noticeInfo($scoped); return $act->asString($namespace, $author, $source); } @@ -1663,12 +1979,12 @@ class Notice extends Managed_DataObject * Clients use some extra notice info in the atom stream. * This gives it to them. * - * @param User $cur Current user + * @param Profile $scoped The currently logged in/scoped profile * * @return array representation of element */ - function noticeInfo($cur) + function noticeInfo(Profile $scoped=null) { // local notice ID (useful to clients for ordering) @@ -1694,16 +2010,16 @@ class Notice extends Managed_DataObject // favorite and repeated - if (!empty($cur)) { - $cp = $cur->getProfile(); - $noticeInfoAttr['favorite'] = ($cp->hasFave($this)) ? "true" : "false"; - $noticeInfoAttr['repeated'] = ($cp->hasRepeated($this)) ? "true" : "false"; + if ($scoped instanceof Profile) { + $noticeInfoAttr['repeated'] = ($scoped->hasRepeated($this)) ? "true" : "false"; } if (!empty($this->repeat_of)) { $noticeInfoAttr['repeat_of'] = $this->repeat_of; } + Event::handle('StatusNetApiNoticeInfo', array($this, &$noticeInfoAttr, $scoped)); + return array('statusnet:notice_info', $noticeInfoAttr, null); } @@ -1719,83 +2035,64 @@ class Notice extends Managed_DataObject function asActivityNoun($element) { - $noun = ActivityObject::fromNotice($this); + $noun = $this->asActivityObject(); return $noun->asString('activity:' . $element); } + public function asActivityObject() + { + $object = new ActivityObject(); + + if (Event::handle('StartActivityObjectFromNotice', array($this, &$object))) { + $object->type = $this->object_type ?: ActivityObject::NOTE; + $object->id = $this->getUri(); + $object->title = sprintf('New %1$s by %2$s', ActivityObject::canonicalType($object->type), $this->getProfile()->getNickname()); + $object->content = $this->rendered; + $object->link = $this->getUrl(); + + $object->extra[] = array('status_net', array('notice_id' => $this->id)); + + Event::handle('EndActivityObjectFromNotice', array($this, &$object)); + } + + return $object; + } + /** * Determine which notice, if any, a new notice is in reply to. * * For conversation tracking, we try to see where this notice fits - * in the tree. Rough algorithm is: + * in the tree. Beware that this may very well give false positives + * and add replies to wrong threads (if there have been newer posts + * by the same user as we're replying to). * - * if (reply_to is set and valid) { - * return reply_to; - * } else if ((source not API or Web) and (content starts with "T NAME" or "@name ")) { - * return ID of last notice by initial @name in content; - * } - * - * Note that all @nickname instances will still be used to save "reply" records, - * so the notice shows up in the mentioned users' "replies" tab. - * - * @param integer $reply_to ID passed in by Web or API - * @param integer $profile_id ID of author - * @param string $source Source tag, like 'web' or 'gwibber' + * @param Profile $sender Author profile * @param string $content Final notice content * * @return integer ID of replied-to notice, or null for not a reply. */ - static function getReplyTo($reply_to, $profile_id, $source, $content) + static function getInlineReplyTo(Profile $sender, $content) { - static $lb = array('xmpp', 'mail', 'sms', 'omb'); - - // If $reply_to is specified, we check that it exists, and then - // return it if it does - - if (!empty($reply_to)) { - $reply_notice = Notice::getKV('id', $reply_to); - if ($reply_notice instanceof Notice) { - return $reply_notice; - } - } - - // If it's not a "low bandwidth" source (one where you can't set - // a reply_to argument), we return. This is mostly web and API - // clients. - - if (!in_array($source, $lb)) { - return null; - } - // Is there an initial @ or T? - - if (preg_match('/^T ([A-Z0-9]{1,64}) /', $content, $match) || - preg_match('/^@([a-z0-9]{1,64})\s+/', $content, $match)) { + if (preg_match('/^T ([A-Z0-9]{1,64}) /', $content, $match) + || preg_match('/^@([a-z0-9]{1,64})\s+/', $content, $match)) { $nickname = common_canonical_nickname($match[1]); } else { return null; } // Figure out who that is. - - $sender = Profile::getKV('id', $profile_id); - if (!$sender instanceof Profile) { - return null; - } - $recipient = common_relative_profile($sender, $nickname, common_sql_now()); - if (!$recipient instanceof Profile) { - return null; - } - - // Get their last notice - - $last = $recipient->getCurrentNotice(); - - if ($last instanceof Notice) { - return $last; + if ($recipient instanceof Profile) { + // Get their last notice + $last = $recipient->getCurrentNotice(); + if ($last instanceof Notice) { + return $last; + } + // Maybe in the future we want to handle something else below + // so don't return getCurrentNotice() immediately. } return null; @@ -1837,23 +2134,23 @@ class Notice extends Managed_DataObject /** * Convenience function for posting a repeat of an existing message. * - * @param int $repeater_id: profile ID of user doing the repeat + * @param Profile $repeater Profile which is doing the repeat * @param string $source: posting source key, eg 'web', 'api', etc * @return Notice * * @throws Exception on failure or permission problems */ - function repeat($repeater_id, $source) + function repeat(Profile $repeater, $source) { - $author = Profile::getKV('id', $this->profile_id); + $author = $this->getProfile(); // TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. // TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. $content = sprintf(_('RT @%1$s %2$s'), - $author->nickname, + $author->getNickname(), $this->content); - $maxlen = common_config('site', 'textlimit'); + $maxlen = self::maxContent(); if ($maxlen > 0 && mb_strlen($content) > $maxlen) { // Web interface and current Twitter API clients will // pull the original notice's text, but some older @@ -1862,11 +2159,11 @@ class Notice extends Managed_DataObject // Unfortunately this is likely to lose tags or URLs // at the end of long notices. $content = mb_substr($content, 0, $maxlen - 4) . ' ...'; - } + } - // Scope is same as this one's - return self::saveNew($repeater_id, + // Scope is same as this one's + return self::saveNew($repeater->id, $content, $source, array('repeat_of' => $this->id, @@ -2035,24 +2332,6 @@ class Notice extends Managed_DataObject } } - function clearFaves() - { - $fave = new Fave(); - $fave->notice_id = $this->id; - - if ($fave->find()) { - while ($fave->fetch()) { - self::blow('fave:ids_by_user_own:%d', $fave->user_id); - self::blow('fave:ids_by_user_own:%d;last', $fave->user_id); - self::blow('fave:ids_by_user:%d', $fave->user_id); - self::blow('fave:ids_by_user:%d;last', $fave->user_id); - $fave->delete(); - } - } - - $fave->free(); - } - function clearTags() { $tag = new Notice_tag(); @@ -2117,20 +2396,47 @@ class Notice extends Managed_DataObject { $result = parent::insert(); - if ($result !== false) { - // Profile::hasRepeated() abuses pkeyGet(), so we - // have to clear manually - if (!empty($this->repeat_of)) { - $c = self::memcache(); - if (!empty($c)) { - $ck = self::multicacheKey('Notice', - array('profile_id' => $this->profile_id, - 'repeat_of' => $this->repeat_of)); - $c->delete($ck); - } + if ($result === false) { + common_log_db_error($this, 'INSERT', __FILE__); + // TRANS: Server exception thrown when a stored object entry cannot be saved. + throw new ServerException('Could not save Notice'); + } + + // Profile::hasRepeated() abuses pkeyGet(), so we + // have to clear manually + if (!empty($this->repeat_of)) { + $c = self::memcache(); + if (!empty($c)) { + $ck = self::multicacheKey('Notice', + array('profile_id' => $this->profile_id, + 'repeat_of' => $this->repeat_of)); + $c->delete($ck); } } + // Update possibly ID-dependent columns: URI, conversation + // (now that INSERT has added the notice's local id) + $orig = clone($this); + $changed = false; + + // We can only get here if it's a local notice, since remote notices + // should've bailed out earlier due to lacking a URI. + if (empty($this->uri)) { + $this->uri = sprintf('%s%s=%d:%s=%s', + TagURI::mint(), + 'noticeId', $this->id, + 'objectType', $this->get_object_type(true)); + $changed = true; + } + + if ($changed && $this->update($orig) === false) { + common_log_db_error($notice, 'UPDATE', __FILE__); + // TRANS: Server exception thrown when a notice cannot be updated. + throw new ServerException(_('Problem saving notice.')); + } + + $this->blowOnInsert(); + return $result; } @@ -2142,31 +2448,34 @@ class Notice extends Managed_DataObject */ function getSource() { + if (empty($this->source)) { + return false; + } + $ns = new Notice_source(); - if (!empty($this->source)) { - switch ($this->source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'system': - case 'api': + switch ($this->source) { + case 'web': + case 'xmpp': + case 'mail': + case 'omb': + case 'system': + case 'api': + $ns->code = $this->source; + break; + default: + $ns = Notice_source::getKV($this->source); + if (!$ns) { + $ns = new Notice_source(); $ns->code = $this->source; - break; - default: - $ns = Notice_source::getKV($this->source); - if (!$ns) { - $ns = new Notice_source(); - $ns->code = $this->source; - $app = Oauth_application::getKV('name', $this->source); - if ($app) { - $ns->name = $app->name; - $ns->url = $app->source_url; - } + $app = Oauth_application::getKV('name', $this->source); + if ($app) { + $ns->name = $app->name; + $ns->url = $app->source_url; } - break; } + break; } + return $ns; } @@ -2182,6 +2491,11 @@ class Notice extends Managed_DataObject $this->is_local == Notice::LOCAL_NONPUBLIC); } + public function isRepeat() + { + return !empty($this->repeat_of); + } + /** * Get the list of hash tags saved with this notice. * @@ -2189,6 +2503,37 @@ class Notice extends Managed_DataObject */ public function getTags() { + // Check default scope (non-private notices) + $inScope = (!$this->isPrivateScope()); + + // Get current profile + $profile = Profile::current(); + + // Is the general scope check okay and the user in logged in? + //* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . ']: inScope=' . intval($inScope) . ',profile[]=' . gettype($profile)); + if (($inScope === TRUE) && ($profile instanceof Profile)) { + /* + * Check scope, else a privacy leaks happens this way: + * + * 1) Bob and Alice follow each other and write private notices + * (this->scope=2) to each other. + * 2) Bob uses tags in his private notice to alice (which she can + * read from him). + * 3) Alice adds that notice (with tags) to her favorites + * ("faving") it. + * 4) The tags from Bob's private notice becomes visible in Alice's + * profile. + * + * This has the simple background that the scope is not being + * re-checked. This has to be done here at this point because given + * above scenario is a privacy leak as the tags may be *really* + * private (nobody else shall see them) such as initmate words or + * very political words. + */ + $inScope = $this->inScope($profile); + //* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . ']: inScope=' . intval($inScope) . ' - After inScope() has been called.'); + } + $tags = array(); $keypart = sprintf('notice:tags:%d', $this->id); @@ -2200,7 +2545,9 @@ class Notice extends Managed_DataObject } else { $tag = new Notice_tag(); $tag->notice_id = $this->id; - if ($tag->find()) { + + // Check scope for privacy-leak protection (see some lines above why) + if (($inScope === TRUE) && ($tag->find())) { while ($tag->fetch()) { $tags[] = $tag->tag; } @@ -2324,12 +2671,8 @@ class Notice extends Managed_DataObject function isPublic() { - if (common_config('public', 'localonly')) { - return ($this->is_local == Notice::LOCAL_PUBLIC); - } else { - return (($this->is_local != Notice::LOCAL_NONPUBLIC) && - ($this->is_local != Notice::GATEWAY)); - } + return (($this->is_local != Notice::LOCAL_NONPUBLIC) && + ($this->is_local != Notice::GATEWAY)); } /** @@ -2346,7 +2689,7 @@ class Notice extends Managed_DataObject * * @return boolean whether the profile is in the notice's scope */ - function inScope($profile) + function inScope(Profile $profile=null) { if (is_null($profile)) { $keypart = sprintf('notice:in-scope-for:%d:null', $this->id); @@ -2369,7 +2712,7 @@ class Notice extends Managed_DataObject return ($result == 1) ? true : false; } - protected function _inScope($profile) + protected function _inScope(Profile $profile=null) { if (!is_null($this->scope)) { $scope = $this->scope; @@ -2409,7 +2752,7 @@ class Notice extends Managed_DataObject $reply = Reply::pkeyGet(array('notice_id' => $this->id, 'profile_id' => $profile->id)); - + if (!$reply instanceof Reply) { return false; } @@ -2458,8 +2801,8 @@ class Notice extends Managed_DataObject } } - function isHiddenSpam($profile) { - + function isHiddenSpam(Profile $profile=null) { + // Hide posts by silenced users from everyone but moderators. if (common_config('notice', 'hidespam')) { @@ -2523,7 +2866,7 @@ class Notice extends Managed_DataObject return $scope; } - static function fillProfiles($notices) + static function fillProfiles(array $notices) { $map = self::getProfiles($notices); @@ -2533,15 +2876,15 @@ class Notice extends Managed_DataObject $notice->_setProfile($map[$notice->profile_id]); } } catch (NoProfileException $e) { - common_log(LOG_WARNING, "Failed to fill profile in Notice with non-existing entry for profile_id: {$e->id}"); + common_log(LOG_WARNING, "Failed to fill profile in Notice with non-existing entry for profile_id: {$e->profile_id}"); unset($notices[$entry]); } } return array_values($map); } - - static function getProfiles(&$notices) + + static function getProfiles(array &$notices) { $ids = array(); foreach ($notices as $notice) { @@ -2552,8 +2895,8 @@ class Notice extends Managed_DataObject return Profile::pivotGet('id', $ids); } - - static function fillGroups(&$notices) + + static function fillGroups(array &$notices) { $ids = self::_idsOf($notices); @@ -2584,17 +2927,16 @@ class Notice extends Managed_DataObject } } - static function _idsOf(&$notices) + static function _idsOf(array &$notices) { $ids = array(); foreach ($notices as $notice) { - $ids[] = $notice->id; + $ids[$notice->id] = true; } - $ids = array_unique($ids); - return $ids; + return array_keys($ids); } - static function fillAttachments(&$notices) + static function fillAttachments(array &$notices) { $ids = self::_idsOf($notices); @@ -2623,48 +2965,7 @@ class Notice extends Managed_DataObject } } - protected $_faves; - - /** - * All faves of this notice - * - * @return array Array of Fave objects - */ - - function getFaves() - { - if (isset($this->_faves) && is_array($this->_faves)) { - return $this->_faves; - } - $faveMap = Fave::listGet('notice_id', array($this->id)); - $this->_faves = $faveMap[$this->id]; - return $this->_faves; - } - - function _setFaves($faves) - { - $this->_faves = $faves; - } - - static function fillFaves(&$notices) - { - $ids = self::_idsOf($notices); - $faveMap = Fave::listGet('notice_id', $ids); - $cnt = 0; - $faved = array(); - foreach ($faveMap as $id => $faves) { - $cnt += count($faves); - if (count($faves) > 0) { - $faved[] = $id; - } - } - foreach ($notices as $notice) { - $faves = $faveMap[$notice->id]; - $notice->_setFaves($faves); - } - } - - static function fillReplies(&$notices) + static function fillReplies(array &$notices) { $ids = self::_idsOf($notices); $replyMap = Reply::listGet('notice_id', $ids); @@ -2678,30 +2979,41 @@ class Notice extends Managed_DataObject } } - protected $_repeats; + protected $_repeats = array(); function getRepeats() { - if (isset($this->_repeats) && is_array($this->_repeats)) { - return $this->_repeats; + if (isset($this->_repeats[$this->id])) { + return $this->_repeats[$this->id]; } $repeatMap = Notice::listGet('repeat_of', array($this->id)); - $this->_repeats = $repeatMap[$this->id]; - return $this->_repeats; + $this->_setRepeats($repeatMap[$this->id]); + return $this->_repeats[$this->id]; } - function _setRepeats($repeats) + function _setRepeats(array $repeats) { - $this->_repeats = $repeats; + $this->_repeats[$this->id] = $repeats; } - static function fillRepeats(&$notices) + static function fillRepeats(array &$notices) { $ids = self::_idsOf($notices); $repeatMap = Notice::listGet('repeat_of', $ids); foreach ($notices as $notice) { - $repeats = $repeatMap[$notice->id]; + $repeats = $repeatMap[$notice->id]; $notice->_setRepeats($repeats); } } + + /** + * Checks whether this notice is in "private scope" (non-public notice) + * + * @return $isPrivate Whether this notice is private + */ + public function isPrivateScope () + { + return ($this->scope != Notice::SITE_SCOPE && + $this->scope != Notice::PUBLIC_SCOPE); + } }