X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=4c831c7cc75645ccfdead4b2f1fc6cd5d8324e6d;hb=7e597ea7cc85c3b7c7226d443b21fb3252c8fd7e;hp=4d5819bd5810e656fe1634a7b10981ac589ed12f;hpb=a5d870765833152b9a633fa96a36723e1facfc65;p=quix0rs-gnu-social.git diff --git a/classes/Notice.php b/classes/Notice.php index 4d5819bd58..4c831c7cc7 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -29,18 +29,16 @@ * @author Robin Millette * @author Sarven Capadisli * @author Tom Adams + * @author Mikael Nordfeldth * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license GNU Affero General Public License http://www.gnu.org/licenses/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * Table Definition for notice */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; /* We keep 200 notices, the max number of notices available per API request, * in the memcached cache. */ @@ -143,25 +141,29 @@ 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) { + if (!isset($this->_profile[$this->profile_id])) { $this->_setProfile(Profile::getKV('id', $this->profile_id)); } - if (!$this->_profile instanceof Profile) { - throw new NoProfileException($this->profile_id); - } - return $this->_profile; + return $this->_profile[$this->profile_id]; } - function _setProfile(Profile $profile) + public function _setProfile(Profile $profile=null) { - $this->_profile = $profile; + if (!$profile instanceof Profile) { + throw new NoProfileException($this->profile_id); + } + $this->_profile[$this->profile_id] = $profile; } - function delete() + function delete($useWhere=false) { // For auditing purposes, save a record that the notice // was deleted. @@ -170,11 +172,11 @@ class Notice extends Managed_DataObject // insert fails. $deleted = Deleted_notice::getKV('id', $this->id); - if (!$deleted) { + if (!$deleted instanceof Deleted_notice) { $deleted = Deleted_notice::getKV('uri', $this->uri); } - if (!$deleted) { + if (!$deleted instanceof Deleted_notice) { $deleted = new Deleted_notice(); $deleted->id = $this->id; @@ -192,16 +194,15 @@ class Notice extends Managed_DataObject $this->clearReplies(); $this->clearRepeats(); - $this->clearFaves(); $this->clearTags(); $this->clearGroupInboxes(); $this->clearFiles(); + $this->clearAttentions(); - // NOTE: we don't clear inboxes // NOTE: we don't clear queue items } - $result = parent::delete(); + $result = parent::delete($useWhere); $this->blowOnDelete(); return $result; @@ -212,10 +213,72 @@ class Notice extends Managed_DataObject return $this->uri; } + /* + * @param $root boolean If true, link to just the conversation root. + * + * @return URL to conversation + */ + public function getConversationUrl($anchor=true) + { + return Conversation::getUrlFromNotice($this, $anchor); + } + + /* + * Get the local representation URL of this notice. + */ + public function getLocalUrl() + { + 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; + } + + /* + * Get the original representation URL of this notice. + */ public function getUrl() { // The risk is we start having empty urls and non-http uris... - return $this->url ?: $this->uri; + // 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(): + // 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); + } + } + + public function get_object_type($canonical=false) { + return $canonical + ? ActivityObject::canonicalType($this->object_type) + : $this->object_type; + } + + public static function getByUri($uri) + { + $notice = new Notice(); + $notice->uri = $uri; + if (!$notice->find(true)) { + throw new NoResultException($notice); + } + return $notice; } /** @@ -300,7 +363,7 @@ class Notice extends Managed_DataObject * int 'location_ns' geoname namespace to interpret location_id * int 'reply_to'; notice ID this is a reply to * int 'repeat_of'; notice ID this is a repeat of - * string 'uri' unique ID for notice; defaults to local notice URL + * string 'uri' unique ID for notice; a unique tag uri (can be url or anything too) * string 'url' permalink to notice; defaults to local notice URL * string 'rendered' rendered HTML version of content * array 'replies' list of profile URIs for reply delivery in @@ -343,8 +406,13 @@ class Notice extends Managed_DataObject } $profile = Profile::getKV('id', $profile_id); + if (!$profile instanceof Profile) { + // TRANS: Client exception thrown when trying to save a notice for an unknown user. + throw new ClientException(_('Problem saving notice. Unknown user.')); + } + $user = User::getKV('id', $profile_id); - if ($user) { + if ($user instanceof User) { // Use the local user's shortening preferences, if applicable. $final = $user->shortenLinks($content); } else { @@ -356,11 +424,6 @@ class Notice extends Managed_DataObject throw new ClientException(_('Problem saving notice. Too long.')); } - if (empty($profile)) { - // TRANS: Client exception thrown when trying to save a notice for an unknown user. - throw new ClientException(_('Problem saving notice. Unknown user.')); - } - if (common_config('throttle', 'enabled') && !Notice::checkEditThrottle($profile_id)) { common_log(LOG_WARNING, 'Excessive posting by profile #' . $profile_id . '; throttled.'); // TRANS: Client exception thrown when a user tries to post too many notices in a given time frame. @@ -402,6 +465,16 @@ class Notice extends Managed_DataObject $notice->created = common_sql_now(); } + if (!$notice->isLocal()) { + // Only do these checks for non-local notices. Local notices will generate these values later. + if (!common_valid_http_url($url)) { + common_debug('Bad notice URL: ['.$url.'], URI: ['.$uri.']. Cannot link back to original! This is normal for shared notices etc.'); + } + if (empty($uri)) { + throw new ServerException('No URI for remote notice. Cannot accept that.'); + } + } + $notice->content = $final; $notice->source = $source; @@ -409,9 +482,8 @@ class Notice extends Managed_DataObject $notice->url = $url; // Get the groups here so we can figure out replies and such - if (!isset($groups)) { - $groups = self::groupsFromText($notice->content, $profile); + $groups = User_group::idsFromText($notice->content, $profile); } $reply = null; @@ -451,12 +523,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). @@ -464,11 +546,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 (!empty($reply->repeat_of)) { + $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(); @@ -545,7 +633,7 @@ class Notice extends Managed_DataObject foreach ($groups as $groupId) { $group = User_group::getKV('id', $groupId); - if (!empty($group)) { + if ($group instanceof User_group) { if ($group->force_scope) { $notice->scope |= Notice::GROUP_SCOPE; break; @@ -571,8 +659,13 @@ class Notice extends Managed_DataObject $changed = false; - if (empty($uri)) { - $notice->uri = common_notice_uri($notice); + // 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; } @@ -580,13 +673,13 @@ class Notice extends Managed_DataObject // the beginning of a new conversation. if (empty($notice->conversation)) { - $conv = Conversation::create(); + $conv = Conversation::create($notice); $notice->conversation = $conv->id; $changed = true; } if ($changed) { - if (!$notice->update($orig)) { + 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.')); @@ -653,16 +746,16 @@ class Notice extends Managed_DataObject $original = Notice::getKV('id', $this->repeat_of); - if (!empty($original)) { + if ($original instanceof Notice) { $originalUser = User::getKV('id', $original->profile_id); - if (!empty($originalUser)) { + if ($originalUser instanceof User) { $this->blowStream('user:repeats_of_me:%d', $originalUser->id); } } $profile = Profile::getKV($this->profile_id); - if (!empty($profile)) { + if ($profile instanceof Profile) { $profile->blowNoticeCount(); } @@ -728,7 +821,7 @@ class Notice extends Managed_DataObject $window = explode(',', $lastStr); $lastID = $window[0]; $lastNotice = Notice::getKV('id', $lastID); - if (empty($lastNotice) // just weird + if (!$lastNotice instanceof Notice // just weird || strtotime($lastNotice->created) >= strtotime($this->created)) { $c->delete($lastKey); } @@ -761,7 +854,11 @@ class Notice extends Managed_DataObject 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? + } } } } @@ -770,12 +867,16 @@ 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) { $profile = Profile::getKV($profile_id); - if (empty($profile)) { + if (!$profile instanceof Profile) { return false; } $notice = $profile->getNotices(0, CachingNoticeStream::CACHE_WINDOW); @@ -803,7 +904,7 @@ class Notice extends Managed_DataObject static function checkEditThrottle($profile_id) { $profile = Profile::getKV($profile_id); - if (empty($profile)) { + if (!$profile instanceof Profile) { return false; } // Get the Nth notice @@ -819,12 +920,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)); @@ -837,14 +937,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) @@ -972,30 +1072,23 @@ class Notice extends Managed_DataObject } } - if (is_null($groups)) { - $groups = $this->getGroups(); - } - if (is_null($recipients)) { $recipients = $this->getReplies(); } - $users = $this->getSubscribedUsers(); - $ptags = $this->getProfileTags(); - - // FIXME: kind of ignoring 'transitional'... - // we'll probably stop supporting inboxless mode - // in 0.9.x - $ni = array(); // Give plugins a chance to add folks in at start... if (Event::handle('StartNoticeWhoGets', array($this, &$ni))) { + $users = $this->getSubscribedUsers(); foreach ($users as $id) { $ni[$id] = NOTICE_INBOX_SOURCE_SUB; } + if (is_null($groups)) { + $groups = $this->getGroups(); + } foreach ($groups as $group) { $users = $group->getUserMembers(); foreach ($users as $id) { @@ -1005,12 +1098,10 @@ class Notice extends Managed_DataObject } } - foreach ($ptags as $ptag) { - $users = $ptag->getUserSubscribers(); - foreach ($users as $id) { - if (!array_key_exists($id, $ni)) { - $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG; - } + $ptAtts = $this->getAttentionsFromProfileTags(); + foreach ($ptAtts as $key=>$val) { + if (!array_key_exists($key, $ni)) { + $ni[$key] = $val; } } @@ -1026,7 +1117,7 @@ class Notice extends Managed_DataObject if ($this->repeat_of) { // Check blocks against the original notice's poster as well. $original = Notice::getKV('id', $this->repeat_of); - if ($original) { + if ($original instanceof Notice) { $originalProfile = $original->getProfile(); } } @@ -1034,7 +1125,7 @@ class Notice extends Managed_DataObject foreach ($ni as $id => $source) { try { $user = User::getKV('id', $id); - if (empty($user) || + if (!$user instanceof User || $user->hasBlocked($profile) || ($originalProfile && $user->hasBlocked($originalProfile))) { unset($ni[$id]); @@ -1057,43 +1148,6 @@ class Notice extends Managed_DataObject return $ni; } - /** - * Adds this notice to the inboxes of each local user who should receive - * it, based on author subscriptions, group memberships, and @-replies. - * - * Warning: running a second time currently will make items appear - * multiple times in users' inboxes. - * - * @fixme make more robust against errors - * @fixme break up massive deliveries to smaller background tasks - * - * @param array $groups optional list of Group objects; - * if left empty, will be loaded from group_inbox records - * @param array $recipient optional list of reply profile ids - * if left empty, will be loaded from reply records - */ - function addToInboxes(array $groups=null, array $recipients=null) - { - $ni = $this->whoGets($groups, $recipients); - - $ids = array_keys($ni); - - // We remove the author (if they're a local user), - // since we'll have already done this in distribute() - - $i = array_search($this->profile_id, $ids); - - if ($i !== false) { - unset($ids[$i]); - } - - // Bulk insert - - Inbox::bulkInsert($this->id, $ids); - - return; - } - function getSubscribedUsers() { $user = new User(); @@ -1134,6 +1188,19 @@ class Notice extends Managed_DataObject return $ptags; } + public function getAttentionsFromProfileTags() + { + $ni = array(); + $ptags = $this->getProfileTags(); + foreach ($ptags as $ptag) { + $users = $ptag->getUserSubscribers(); + foreach ($users as $id) { + $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG; + } + } + return $ni; + } + /** * Record this notice to the given group inboxes for delivery. * Overrides the regular parsing of !group markup. @@ -1153,7 +1220,7 @@ class Notice extends Managed_DataObject $groups = array(); foreach (array_unique($group_ids) as $id) { $group = User_group::getKV('id', $id); - if ($group) { + if ($group instanceof User_group) { common_log(LOG_ERR, "Local delivery to group id $id, $group->nickname"); $result = $this->addToGroupInbox($group); if (!$result) { @@ -1180,53 +1247,12 @@ class Notice extends Managed_DataObject return $groups; } - /** - * Parse !group delivery and record targets into group_inbox. - * @return array of Group objects - */ - function saveGroups() - { - // Don't save groups for repeats - - if (!empty($this->repeat_of)) { - return array(); - } - - $profile = $this->getProfile(); - - $groups = self::groupsFromText($this->content, $profile); - - /* Add them to the database */ - - foreach ($groups as $group) { - /* XXX: remote groups. */ - - if (empty($group)) { - continue; - } - - - if ($profile->isMember($group)) { - - $result = $this->addToGroupInbox($group); - - if (!$result) { - common_log_db_error($gi, 'INSERT', __FILE__); - } - - $groups[] = clone($group); - } - } - - return $groups; - } - - function addToGroupInbox($group) + function addToGroupInbox(User_group $group) { $gi = Group_inbox::pkeyGet(array('group_id' => $group->id, 'notice_id' => $this->id)); - if (empty($gi)) { + if (!$gi instanceof Group_inbox) { $gi = new Group_inbox(); @@ -1269,10 +1295,9 @@ class Notice extends Managed_DataObject $sender = Profile::getKV($this->profile_id); foreach (array_unique($uris) as $uri) { - - $profile = Profile::fromURI($uri); - - if (empty($profile)) { + try { + $profile = Profile::fromUri($uri); + } catch (UnknownUriException $e) { common_log(LOG_WARNING, "Unable to determine profile for URI '$uri'"); continue; } @@ -1307,19 +1332,17 @@ class Notice extends Managed_DataObject 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! } @@ -1345,7 +1368,7 @@ class Notice extends Managed_DataObject // Don't save replies from blocked profile to local user $mentioned_user = User::getKV('id', $mentioned->id); - if (!empty($mentioned_user) && $mentioned_user->hasBlocked($sender)) { + if ($mentioned_user instanceof User && $mentioned_user->hasBlocked($sender)) { continue; } @@ -1373,7 +1396,7 @@ class Notice extends Managed_DataObject return $reply; } - protected $_replies = -1; + protected $_replies = array(); /** * Pull the complete list of @-reply targets for this notice. @@ -1382,8 +1405,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)); @@ -1394,14 +1417,14 @@ class Notice extends Managed_DataObject $ids[] = $reply->profile_id; } - $this->_replies = $ids; + $this->_replies[$this->id] = $ids; return $ids; } function _setReplies($replies) { - $this->_replies = $replies; + $this->_replies[$this->id] = $replies; } /** @@ -1436,7 +1459,7 @@ class Notice extends Managed_DataObject foreach ($recipientIds as $recipientId) { $user = User::getKV('id', $recipientId); - if (!empty($user)) { + if ($user instanceof User) { mail_notify_attn($user, $this); } } @@ -1444,12 +1467,12 @@ class Notice extends Managed_DataObject /** * Pull list of groups this notice needs to be delivered to, - * as previously recorded by saveGroups() or saveKnownGroups(). + * as previously recorded by saveKnownGroups(). * * @return array of Group objects */ - protected $_groups = -1; + protected $_groups = array(); function getGroups() { @@ -1459,9 +1482,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)); @@ -1475,14 +1497,14 @@ class Notice extends Managed_DataObject $groups = User_group::multiGet('id', $ids); - $this->_groups = $groups->fetchAll(); + $this->_groups[$this->id] = $groups->fetchAll(); - return $this->_groups; + return $this->_groups[$this->id]; } function _setGroups($groups) { - $this->_groups = $groups; + $this->_groups[$this->id] = $groups; } /** @@ -1497,7 +1519,7 @@ class Notice extends Managed_DataObject { $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id)); - if (!empty($act)) { + if ($act instanceof Activity) { return $act; } $act = new Activity(); @@ -1506,7 +1528,12 @@ class Notice extends Managed_DataObject $act->id = $this->uri; $act->time = strtotime($this->created); - $act->link = $this->bestUrl(); + try { + $act->link = $this->getUrl(); + } catch (InvalidUrlException $e) { + // The notice is probably a share or similar, which don't + // have a representational URL of their own. + } $act->content = common_xml_safe_str($this->rendered); $profile = $this->getProfile(); @@ -1518,7 +1545,7 @@ class Notice extends Managed_DataObject if ($this->repeat_of) { $repeated = Notice::getKV('id', $this->repeat_of); - if (!empty($repeated)) { + if ($repeated instanceof Notice) { $act->objects[] = $repeated->asActivity($cur); } } else { @@ -1554,8 +1581,8 @@ class Notice extends Managed_DataObject try { $reply = $this->getParent(); - $ctx->replyToID = $reply->uri; - $ctx->replyToUrl = $reply->bestUrl(); + $ctx->replyToID = $reply->getUri(); + $ctx->replyToUrl = $reply->getUrl(); } catch (Exception $e) { // This is not a reply to something } @@ -1566,7 +1593,7 @@ class Notice extends Managed_DataObject if (!empty($this->conversation)) { $conv = Conversation::getKV('id', $this->conversation); - if (!empty($conv)) { + if ($conv instanceof Conversation) { $ctx->conversation = $conv->uri; } } @@ -1575,28 +1602,24 @@ class Notice extends Managed_DataObject foreach ($reply_ids as $id) { $rprofile = Profile::getKV('id', $id); - if (!empty($rprofile)) { - $ctx->attention[] = $rprofile->getUri(); - $ctx->attentionType[$rprofile->getUri()] = ActivityObject::PERSON; + if ($rprofile instanceof Profile) { + $ctx->attention[$rprofile->getUri()] = ActivityObject::PERSON; } } $groups = $this->getGroups(); foreach ($groups as $group) { - $ctx->attention[] = $group->getUri(); - $ctx->attentionType[$group->getUri()] = ActivityObject::GROUP; + $ctx->attention[$group->getUri()] = ActivityObject::GROUP; } switch ($this->scope) { case Notice::PUBLIC_SCOPE: - $ctx->attention[] = "http://activityschema.org/collection/public"; - $ctx->attentionType["http://activityschema.org/collection/public"] = ActivityObject::COLLECTION; + $ctx->attention[ActivityContext::ATTN_PUBLIC] = ActivityObject::COLLECTION; break; case Notice::FOLLOWER_SCOPE: $surl = common_local_url("subscribers", array('nickname' => $profile->nickname)); - $ctx->attention[] = $surl; - $ctx->attentionType[$surl] = ActivityObject::COLLECTION; + $ctx->attention[$surl] = ActivityObject::COLLECTION; break; } @@ -1604,7 +1627,7 @@ class Notice extends Managed_DataObject $source = $this->getSource(); - if ($source) { + if ($source instanceof Notice_source) { $act->generator = ActivityObject::fromNoticeSource($source); } @@ -1631,13 +1654,13 @@ class Notice extends Managed_DataObject $notice = $profile->getCurrentNotice(); - if (!empty($notice)) { + if ($notice instanceof Notice) { $act->source->updated = self::utcDate($notice->created); } $user = User::getKV('id', $profile->id); - if (!empty($user)) { + if ($user instanceof User) { $act->source->links['license'] = common_config('license', 'url'); } } @@ -1690,7 +1713,7 @@ class Notice extends Managed_DataObject $ns = $this->getSource(); - if (!empty($ns)) { + if ($ns instanceof Notice_source) { $noticeInfoAttr['source'] = $ns->code; if (!empty($ns->url)) { $noticeInfoAttr['source_link'] = $ns->url; @@ -1706,16 +1729,18 @@ class Notice extends Managed_DataObject // favorite and repeated + $scoped = null; if (!empty($cur)) { - $cp = $cur->getProfile(); - $noticeInfoAttr['favorite'] = ($cp->hasFave($this)) ? "true" : "false"; - $noticeInfoAttr['repeated'] = ($cp->hasRepeated($this)) ? "true" : "false"; + $scoped = $cur->getProfile(); + $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); } @@ -1735,92 +1760,41 @@ class Notice extends Managed_DataObject return $noun->asString('activity:' . $element); } - function bestUrl() - { - if (!empty($this->url)) { - return $this->url; - } else if (!empty($this->uri) && preg_match('/^https?:/', $this->uri)) { - return $this->uri; - } else { - return common_local_url('shownotice', - array('notice' => $this->id)); - } - } - - /** * 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: - * - * 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; - * } + * 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). * - * 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 (!empty($reply_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 (empty($sender)) { - return null; - } - $recipient = common_relative_profile($sender, $nickname, common_sql_now()); - if (empty($recipient)) { - return null; - } - - // Get their last notice - - $last = $recipient->getCurrentNotice(); - - if (!empty($last)) { - 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; @@ -1862,36 +1836,24 @@ 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'); - if ($maxlen > 0 && mb_strlen($content) > $maxlen) { - // Web interface and current Twitter API clients will - // pull the original notice's text, but some older - // clients and RSS/Atom feeds will see this trimmed text. - // - // 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, + return self::saveNew($repeater->id, $content, $source, array('repeat_of' => $this->id, @@ -1955,7 +1917,7 @@ class Notice extends Managed_DataObject $location = Location::fromId($location_id, $location_ns); - if (!empty($location)) { + if ($location instanceof Location) { $options['lat'] = $location->lat; $options['lon'] = $location->lon; } @@ -1966,7 +1928,7 @@ class Notice extends Managed_DataObject $location = Location::fromLatLon($lat, $lon); - if (!empty($location)) { + if ($location instanceof Location) { $options['location_id'] = $location->location_id; $options['location_ns'] = $location->location_ns; } @@ -1985,6 +1947,20 @@ class Notice extends Managed_DataObject return $options; } + function clearAttentions() + { + $att = new Attention(); + $att->notice_id = $this->getID(); + + if ($att->find()) { + while ($att->fetch()) { + // Can't do delete() on the object directly since it won't remove all of it + $other = clone($att); + $other->delete(); + } + } + } + function clearReplies() { $replyNotice = new Notice(); @@ -2046,24 +2022,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(); @@ -2104,33 +2062,23 @@ class Notice extends Managed_DataObject // have to wait Event::handle('StartNoticeDistribute', array($this)); - $user = User::getKV('id', $this->profile_id); - if (!empty($user)) { - Inbox::insertNotice($user->id, $this->id); - } - - if (common_config('queue', 'inboxes')) { - // If there's a failure, we want to _force_ - // distribution at this point. + // If there's a failure, we want to _force_ + // distribution at this point. + try { + $qm = QueueManager::get(); + $qm->enqueue($this, 'distrib'); + } catch (Exception $e) { + // If the exception isn't transient, this + // may throw more exceptions as DQH does + // its own enqueueing. So, we ignore them! try { - $qm = QueueManager::get(); - $qm->enqueue($this, 'distrib'); + $handler = new DistribQueueHandler(); + $handler->handle($this); } catch (Exception $e) { - // If the exception isn't transient, this - // may throw more exceptions as DQH does - // its own enqueueing. So, we ignore them! - try { - $handler = new DistribQueueHandler(); - $handler->handle($this); - } catch (Exception $e) { - common_log(LOG_ERR, "emergency redistribution resulted in " . $e->getMessage()); - } - // Re-throw so somebody smarter can handle it. - throw $e; + common_log(LOG_ERR, "emergency redistribution resulted in " . $e->getMessage()); } - } else { - $handler = new DistribQueueHandler(); - $handler->handle($this); + // Re-throw so somebody smarter can handle it. + throw $e; } } @@ -2138,7 +2086,7 @@ class Notice extends Managed_DataObject { $result = parent::insert(); - if ($result) { + if ($result !== false) { // Profile::hasRepeated() abuses pkeyGet(), so we // have to clear manually if (!empty($this->repeat_of)) { @@ -2428,10 +2376,10 @@ class Notice extends Managed_DataObject if ($scope & Notice::ADDRESSEE_SCOPE) { - $repl = Reply::pkeyGet(array('notice_id' => $this->id, + $reply = Reply::pkeyGet(array('notice_id' => $this->id, 'profile_id' => $profile->id)); - if (empty($repl)) { + if (!$reply instanceof Reply) { return false; } } @@ -2494,7 +2442,7 @@ class Notice extends Managed_DataObject } if ($author->hasRole(Profile_role::SILENCED)) { - if (empty($profile) || (($profile->id !== $author->id) && (!$profile->hasRight(Right::REVIEWSPAM)))) { + if (!$profile instanceof Profile || (($profile->id !== $author->id) && (!$profile->hasRight(Right::REVIEWSPAM)))) { return true; } } @@ -2503,29 +2451,6 @@ class Notice extends Managed_DataObject return false; } - static function groupsFromText($text, $profile) - { - $groups = array(); - - /* extract all !group */ - $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/', - strtolower($text), - $match); - - if (!$count) { - return $groups; - } - - foreach (array_unique($match[1]) as $nickname) { - $group = User_group::getForNickname($nickname, $profile); - if (!empty($group) && $profile->isMember($group)) { - $groups[] = $group->id; - } - } - - return $groups; - } - public function getParent() { $parent = Notice::getKV('id', $this->reply_to); @@ -2571,10 +2496,15 @@ class Notice extends Managed_DataObject { $map = self::getProfiles($notices); - foreach ($notices as $notice) { - if (array_key_exists($notice->profile_id, $map)) { - $notice->_setProfile($map[$notice->profile_id]); - } + foreach ($notices as $entry=>$notice) { + try { + if (array_key_exists($notice->profile_id, $map)) { + $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->profile_id}"); + unset($notices[$entry]); + } } return array_values($map); @@ -2623,14 +2553,13 @@ 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) @@ -2662,47 +2591,6 @@ 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) { $ids = self::_idsOf($notices); @@ -2717,21 +2605,21 @@ 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->_repeats[$this->id] = $repeatMap[$this->id]; + return $this->_repeats[$this->id]; } function _setRepeats($repeats) { - $this->_repeats = $repeats; + $this->_repeats[$this->id] = $repeats; } static function fillRepeats(&$notices)