X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=4812dff91a29b5caf70fb9e2262154fcaef43889;hb=a8bcdc905f197c75f502e44bdca486b8418e1d3a;hp=573437caefe4d4c13f328c9ffeacf81549e9854e;hpb=d918ee95f482bc3fc67160c4272e97ad1e0c2412;p=quix0rs-gnu-social.git diff --git a/classes/Notice.php b/classes/Notice.php index 573437caef..4812dff91a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -49,7 +49,7 @@ define('NOTICE_CACHE_WINDOW', CachingNoticeStream::CACHE_WINDOW); define('MAX_BOXCARS', 128); -class Notice extends Memcached_DataObject +class Notice extends Managed_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -72,22 +72,64 @@ class Notice extends Memcached_DataObject public $location_id; // int(4) public $location_ns; // int(4) public $repeat_of; // int(4) + public $verb; // varchar(255) public $object_type; // varchar(255) public $scope; // int(4) - /* Static get */ - function staticGet($k,$v=NULL) - { - return Memcached_DataObject::staticGet('Notice',$k,$v); - } - /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function multiGet($kc, $kvs, $skipNulls=true) - { - return Memcached_DataObject::multiGet('Notice', $kc, $kvs, $skipNulls); - } + public static function schemaDef() + { + $def = array( + 'fields' => array( + 'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'), + 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'who made the update'), + 'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'), + 'content' => array('type' => 'text', 'description' => 'update content', 'collate' => 'utf8_general_ci'), + 'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'), + 'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'), + 'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'), + 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'), + 'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'), + 'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'), + 'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'), + 'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'), + 'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'), + 'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'), + 'location_id' => array('type' => 'int', 'description' => 'location id if possible'), + 'location_ns' => array('type' => 'int', 'description' => 'namespace for location'), + 'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'), + 'object_type' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'), + 'verb' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams verb', 'default' => 'http://activitystrea.ms/schema/1.0/post'), + 'scope' => array('type' => 'int', + 'description' => 'bit map for distribution scope; 0 = everywhere; 1 = this server only; 2 = addressees; 4 = followers; null = default'), + ), + 'primary key' => array('id'), + 'unique keys' => array( + 'notice_uri_key' => array('uri'), + ), + 'foreign keys' => array( + 'notice_profile_id_fkey' => array('profile', array('profile_id' => 'id')), + 'notice_reply_to_fkey' => array('notice', array('reply_to' => 'id')), + 'notice_conversation_fkey' => array('conversation', array('conversation' => 'id')), # note... used to refer to notice.id + 'notice_repeat_of_fkey' => array('notice', array('repeat_of' => 'id')), # @fixme: what about repeats of deleted notices? + ), + 'indexes' => array( + 'notice_created_id_is_local_idx' => array('created', 'id', 'is_local'), + 'notice_profile_id_idx' => array('profile_id', 'created', 'id'), + 'notice_repeat_of_created_id_idx' => array('repeat_of', 'created', 'id'), + 'notice_conversation_created_id_idx' => array('conversation', 'created', 'id'), + 'notice_replyto_idx' => array('reply_to') + ) + ); + + if (common_config('search', 'type') == 'fulltext') { + $def['fulltext indexes'] = array('content' => array('content')); + } + + return $def; + } /* Notice types */ const LOCAL_PUBLIC = 1; @@ -106,7 +148,7 @@ class Notice extends Memcached_DataObject function getProfile() { if (is_int($this->_profile) && $this->_profile == -1) { - $this->_setProfile(Profile::staticGet('id', $this->profile_id)); + $this->_setProfile(Profile::getKV('id', $this->profile_id)); if (empty($this->_profile)) { // TRANS: Server exception thrown when a user profile for a notice cannot be found. @@ -130,10 +172,10 @@ class Notice extends Memcached_DataObject // @fixme we have some cases where things get re-run and so the // insert fails. - $deleted = Deleted_notice::staticGet('id', $this->id); + $deleted = Deleted_notice::getKV('id', $this->id); if (!$deleted) { - $deleted = Deleted_notice::staticGet('uri', $this->uri); + $deleted = Deleted_notice::getKV('uri', $this->uri); } if (!$deleted) { @@ -169,6 +211,11 @@ class Notice extends Memcached_DataObject return $result; } + public function getUri() + { + return $this->uri; + } + /** * Extract #hashtags from this notice's content and save them to the database. */ @@ -264,6 +311,7 @@ class Notice extends Memcached_DataObject * notice in place of extracting links from content * boolean 'distribute' whether to distribute the notice, default true * string 'object_type' URL of the associated object type (default ActivityObject::NOTE) + * string 'verb' URL of the associated verb (default ActivityVerb::POST) * int 'scope' Scope bitmask; default to SITE_SCOPE on private sites, 0 otherwise * * @fixme tag override @@ -271,13 +319,15 @@ class Notice extends Memcached_DataObject * @return Notice * @throws ClientException */ - static function saveNew($profile_id, $content, $source, $options=null) { + static function saveNew($profile_id, $content, $source, array $options=null) { $defaults = array('uri' => null, 'url' => null, 'reply_to' => null, 'repeat_of' => null, 'scope' => null, - 'distribute' => true); + 'distribute' => true, + 'object_type' => null, + 'verb' => null); if (!empty($options) && is_array($options)) { $options = array_merge($defaults, $options); @@ -290,8 +340,8 @@ class Notice extends Memcached_DataObject $is_local = Notice::LOCAL_PUBLIC; } - $profile = Profile::staticGet('id', $profile_id); - $user = User::staticGet('id', $profile_id); + $profile = Profile::getKV('id', $profile_id); + $user = User::getKV('id', $profile_id); if ($user) { // Use the local user's shortening preferences, if applicable. $final = $user->shortenLinks($content); @@ -370,9 +420,9 @@ class Notice extends Memcached_DataObject // Check for a private one - $repeat = Notice::staticGet('id', $repeat_of); + $repeat = Notice::getKV('id', $repeat_of); - if (empty($repeat)) { + if (!($repeat instanceof Notice)) { // TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice. throw new ClientException(_('Cannot repeat; original notice is missing or deleted.')); } @@ -394,7 +444,7 @@ class Notice extends Memcached_DataObject throw new ClientException(_('Cannot repeat a notice you cannot read.'), 403); } - if ($profile->hasRepeated($repeat->id)) { + if ($profile->hasRepeated($repeat)) { // TRANS: Client error displayed when trying to repeat an already repeated notice. throw new ClientException(_('You already repeated that notice.')); } @@ -418,7 +468,7 @@ class Notice extends Memcached_DataObject // 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)) { + if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) { $groups = array(); $replyGroups = $reply->getGroups(); foreach ($replyGroups as $group) { @@ -448,6 +498,17 @@ class Notice extends Memcached_DataObject $notice->rendered = common_render_content($final, $notice); } + if (empty($verb)) { + if (!empty($notice->repeat_of)) { + $notice->verb = ActivityVerb::SHARE; + $notice->object_type = ActivityObject::ACTIVITY; + } else { + $notice->verb = ActivityVerb::POST; + } + } else { + $notice->verb = $verb; + } + if (empty($object_type)) { $notice->object_type = (empty($notice->reply_to)) ? ActivityObject::NOTE : ActivityObject::COMMENT; } else { @@ -466,20 +527,22 @@ class Notice extends Memcached_DataObject // For private streams - $user = $profile->getUser(); + try { + $user = $profile->getUser(); - if (!empty($user)) { if ($user->private_stream && ($notice->scope == Notice::PUBLIC_SCOPE || $notice->scope == Notice::SITE_SCOPE)) { $notice->scope |= Notice::FOLLOWER_SCOPE; } + } catch (NoSuchUserException $e) { + // Cannot handle private streams for remote profiles } // Force the scope for private groups foreach ($groups as $groupId) { - $group = User_group::staticGet('id', $groupId); + $group = User_group::getKV('id', $groupId); if (!empty($group)) { if ($group->force_scope) { $notice->scope |= Notice::GROUP_SCOPE; @@ -577,26 +640,25 @@ class Notice extends Memcached_DataObject $this->blowStream('public'); } - // XXX: Before we were blowing the casche only if the notice id - // was not the root of the conversation. What to do now? - - self::blow('notice:conversation_ids:%d', $this->conversation); - self::blow('conversation::notice_count:%d', $this->conversation); + self::blow('notice:list-ids:conversation:%s', $this->conversation); + self::blow('conversation:notice_count:%d', $this->conversation); if (!empty($this->repeat_of)) { + // 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); } - $original = Notice::staticGet('id', $this->repeat_of); + $original = Notice::getKV('id', $this->repeat_of); if (!empty($original)) { - $originalUser = User::staticGet('id', $original->profile_id); + $originalUser = User::getKV('id', $original->profile_id); if (!empty($originalUser)) { $this->blowStream('user:repeats_of_me:%d', $originalUser->id); } } - $profile = Profile::staticGet($this->profile_id); + $profile = Profile::getKV($this->profile_id); if (!empty($profile)) { $profile->blowNoticeCount(); @@ -663,7 +725,7 @@ class Notice extends Memcached_DataObject if ($lastStr !== false) { $window = explode(',', $lastStr); $lastID = $window[0]; - $lastNotice = Notice::staticGet('id', $lastID); + $lastNotice = Notice::getKV('id', $lastID); if (empty($lastNotice) // just weird || strtotime($lastNotice->created) >= strtotime($this->created)) { $c->delete($lastKey); @@ -710,7 +772,7 @@ class Notice extends Memcached_DataObject } static function checkDupes($profile_id, $content) { - $profile = Profile::staticGet($profile_id); + $profile = Profile::getKV($profile_id); if (empty($profile)) { return false; } @@ -738,7 +800,7 @@ class Notice extends Memcached_DataObject } static function checkEditThrottle($profile_id) { - $profile = Profile::staticGet($profile_id); + $profile = Profile::getKV($profile_id); if (empty($profile)) { return false; } @@ -755,62 +817,33 @@ class Notice extends Memcached_DataObject return true; } - function getUploadedAttachment() { - $post = clone $this; - $query = 'select file.url as up, file.id as i from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"'; - $post->query($query); - $post->fetch(); - if (empty($post->up) || empty($post->i)) { - $ret = false; - } else { - $ret = array($post->up, $post->i); - } - $post->free(); - return $ret; - } - - function hasAttachments() { - $post = clone $this; - $query = "select count(file_id) as n_attachments from file join file_to_post on (file_id = file.id) join notice on (post_id = notice.id) where post_id = " . $post->escape($post->id); - $post->query($query); - $post->fetch(); - $n_attachments = intval($post->n_attachments); - $post->free(); - return $n_attachments; - } - + protected $_attachments = -1; + function attachments() { - $keypart = sprintf('notice:file_ids:%d', $this->id); - - $idstr = self::cacheGet($keypart); - - if ($idstr !== false) { - $ids = explode(',', $idstr); - } else { - $ids = array(); - $f2p = new File_to_post; - $f2p->post_id = $this->id; - if ($f2p->find()) { - while ($f2p->fetch()) { - $ids[] = $f2p->file_id; - } - } - self::cacheSet($keypart, implode(',', $ids)); + if ($this->_attachments != -1) { + return $this->_attachments; } - - $att = array(); - - foreach ($ids as $id) { - $f = File::staticGet('id', $id); - if (!empty($f)) { - $att[] = clone($f); - } + + $f2ps = File_to_post::listGet('post_id', array($this->id)); + + $ids = array(); + + foreach ($f2ps[$this->id] as $f2p) { + $ids[] = $f2p->file_id; } + + $files = File::multiGet('id', $ids); - return $att; + $this->_attachments = $files->fetchAll(); + + return $this->_attachments; } + function _setAttachments($attachments) + { + $this->_attachments = $attachments; + } function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0) { @@ -892,23 +925,26 @@ class Notice extends Memcached_DataObject if ($root !== false && $root->inScope($profile)) { return $root; - } else { - $last = $this; + } - do { - $parent = $last->getOriginal(); - if (!empty($parent) && $parent->inScope($profile)) { + $last = $this; + while (true) { + try { + $parent = $last->getParent(); + if ($parent->inScope($profile)) { $last = $parent; continue; - } else { - $root = $last; - break; } - } while (!empty($parent)); - - self::cacheSet($keypart, $root); + } catch (Exception $e) { + // Latest notice has no parent + } + // No parent, or parent out of scope + $root = $last; + break; } + self::cacheSet($keypart, $root); + return $root; } @@ -923,7 +959,7 @@ class Notice extends Memcached_DataObject * if left empty, will be loaded from reply records * @return array associating recipient user IDs with an inbox source constant */ - function whoGets($groups=null, $recipients=null) + function whoGets(array $groups=null, array $recipients=null) { $c = self::memcache(); @@ -971,10 +1007,7 @@ class Notice extends Memcached_DataObject $users = $ptag->getUserSubscribers(); foreach ($users as $id) { if (!array_key_exists($id, $ni)) { - $user = User::staticGet('id', $id); - if (!$user->hasBlocked($profile)) { - $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG; - } + $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG; } } } @@ -983,23 +1016,30 @@ class Notice extends Memcached_DataObject if (!array_key_exists($recipient, $ni)) { $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY; } + } - // Exclude any deleted, non-local, or blocking recipients. - $profile = $this->getProfile(); - $originalProfile = null; - if ($this->repeat_of) { - // Check blocks against the original notice's poster as well. - $original = Notice::staticGet('id', $this->repeat_of); - if ($original) { - $originalProfile = $original->getProfile(); - } + // Exclude any deleted, non-local, or blocking recipients. + $profile = $this->getProfile(); + $originalProfile = null; + if ($this->repeat_of) { + // Check blocks against the original notice's poster as well. + $original = Notice::getKV('id', $this->repeat_of); + if ($original) { + $originalProfile = $original->getProfile(); } - foreach ($ni as $id => $source) { - $user = User::staticGet('id', $id); - if (empty($user) || $user->hasBlocked($profile) || + } + + foreach ($ni as $id => $source) { + try { + $user = User::getKV('id', $id); + if (empty($user) || + $user->hasBlocked($profile) || ($originalProfile && $user->hasBlocked($originalProfile))) { unset($ni[$id]); } + } catch (UserNoProfileException $e) { + // User doesn't have a profile; invalid; skip them. + unset($ni[$id]); } } @@ -1030,7 +1070,7 @@ class Notice extends Memcached_DataObject * @param array $recipient optional list of reply profile ids * if left empty, will be loaded from reply records */ - function addToInboxes($groups=null, $recipients=null) + function addToInboxes(array $groups=null, array $recipients=null) { $ni = $this->whoGets($groups, $recipients); @@ -1110,7 +1150,7 @@ class Notice extends Memcached_DataObject $groups = array(); foreach (array_unique($group_ids) as $id) { - $group = User_group::staticGet('id', $id); + $group = User_group::getKV('id', $id); if ($group) { common_log(LOG_ERR, "Local delivery to group id $id, $group->nickname"); $result = $this->addToGroupInbox($group); @@ -1216,15 +1256,15 @@ class Notice extends Memcached_DataObject * * Mail notifications etc will be handled later. * - * @param array of unique identifier URIs for recipients + * @param array $uris Array of unique identifier URIs for recipients */ - function saveKnownReplies($uris) + function saveKnownReplies(array $uris) { if (empty($uris)) { return; } - $sender = Profile::staticGet($this->profile_id); + $sender = Profile::getKV($this->profile_id); foreach (array_unique($uris) as $uri) { @@ -1265,22 +1305,20 @@ class Notice extends Memcached_DataObject return array(); } - $sender = Profile::staticGet($this->profile_id); + $sender = Profile::getKV($this->profile_id); $replied = array(); // If it's a reply, save for the replied-to author - - if (!empty($this->reply_to)) { - $original = $this->getOriginal(); - if (!empty($original)) { // that'd be weird - $author = $original->getProfile(); - if (!empty($author)) { - $this->saveReply($author->id); - $replied[$author->id] = 1; - self::blow('reply:stream:%d', $author->id); - } + try { + $author = $this->getParent()->getProfile(); + if ($author instanceof Profile) { + $this->saveReply($author->id); + $replied[$author->id] = 1; + self::blow('reply:stream:%d', $author->id); } + } catch (Exception $e) { + // Not a reply, since it has no parent! } // @todo ideally this parser information would only @@ -1303,7 +1341,7 @@ class Notice extends Memcached_DataObject // Don't save replies from blocked profile to local user - $mentioned_user = User::staticGet('id', $mentioned->id); + $mentioned_user = User::getKV('id', $mentioned->id); if (!empty($mentioned_user) && $mentioned_user->hasBlocked($sender)) { continue; } @@ -1332,6 +1370,8 @@ class Notice extends Memcached_DataObject return $reply; } + protected $_replies = -1; + /** * Pull the complete list of @-reply targets for this notice. * @@ -1339,31 +1379,28 @@ class Notice extends Memcached_DataObject */ function getReplies() { - $keypart = sprintf('notice:reply_ids:%d', $this->id); - - $idstr = self::cacheGet($keypart); + if ($this->_replies != -1) { + return $this->_replies; + } - if ($idstr !== false) { - $ids = explode(',', $idstr); - } else { - $ids = array(); + $replyMap = Reply::listGet('notice_id', array($this->id)); - $reply = new Reply(); - $reply->selectAdd(); - $reply->selectAdd('profile_id'); - $reply->notice_id = $this->id; + $ids = array(); - if ($reply->find()) { - while($reply->fetch()) { - $ids[] = $reply->profile_id; - } - } - self::cacheSet($keypart, implode(',', $ids)); + foreach ($replyMap[$this->id] as $reply) { + $ids[] = $reply->profile_id; } + $this->_replies = $ids; + return $ids; } + function _setReplies($replies) + { + $this->_replies = $replies; + } + /** * Pull the complete list of @-reply targets for this notice. * @@ -1395,7 +1432,7 @@ class Notice extends Memcached_DataObject $recipientIds = $this->getReplies(); foreach ($recipientIds as $recipientId) { - $user = User::staticGet('id', $recipientId); + $user = User::getKV('id', $recipientId); if (!empty($user)) { mail_notify_attn($user, $this); } @@ -1424,8 +1461,10 @@ class Notice extends Memcached_DataObject return $this->_groups; } - $gis = Memcached_DataObject::listGet('Group_inbox', 'notice_id', array($this->id)); - + $gis = Group_inbox::listGet('notice_id', array($this->id)); + + $ids = array(); + foreach ($gis[$this->id] as $gi) { $ids[] = $gi->group_id; @@ -1451,7 +1490,7 @@ class Notice extends Memcached_DataObject * @return Activity activity object representing this Notice. */ - function asActivity($cur) + function asActivity($cur=null) { $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id)); @@ -1462,29 +1501,24 @@ class Notice extends Memcached_DataObject if (Event::handle('StartNoticeAsActivity', array($this, &$act))) { - $act->id = $this->uri; + $act->id = TagURI::mint("post:".$this->id); $act->time = strtotime($this->created); - $act->link = $this->bestUrl(); $act->content = common_xml_safe_str($this->rendered); - $act->title = common_xml_safe_str($this->content); $profile = $this->getProfile(); $act->actor = ActivityObject::fromProfile($profile); $act->actor->extra[] = $profile->profileInfo($cur); - if ($this->repeat_of) { - - $repeated = Notice::staticGet('id', $this->repeat_of); - - $act->verb = ActivityVerb::SHARE; - $act->objects[] = $repeated->asActivity($cur); + $act->verb = $this->verb; + if ($this->repeat_of) { + $repeated = Notice::getKV('id', $this->repeat_of); + if (!empty($repeated)) { + $act->objects[] = $repeated->asActivity($cur); + } } else { - - $act->verb = ActivityVerb::POST; - $act->objects[] = ActivityObject::fromNotice($this); - + $act->objects[] = ActivityObject::fromNotice($this); } // XXX: should this be handled by default processing for object entry? @@ -1506,16 +1540,16 @@ class Notice extends Memcached_DataObject $attachments = $this->attachments(); foreach ($attachments as $attachment) { - $enclosure = $attachment->getEnclosure(); - if ($enclosure) { - $act->enclosures[] = $enclosure; + // Save local attachments + if (!empty($attachment->filename)) { + $act->attachments[] = ActivityObject::fromFile($attachment); } } $ctx = new ActivityContext(); if (!empty($this->reply_to)) { - $reply = Notice::staticGet('id', $this->reply_to); + $reply = Notice::getKV('id', $this->reply_to); if (!empty($reply)) { $ctx->replyToID = $reply->uri; $ctx->replyToUrl = $reply->bestUrl(); @@ -1527,7 +1561,7 @@ class Notice extends Memcached_DataObject $conv = null; if (!empty($this->conversation)) { - $conv = Conversation::staticGet('id', $this->conversation); + $conv = Conversation::getKV('id', $this->conversation); if (!empty($conv)) { $ctx->conversation = $conv->uri; } @@ -1536,9 +1570,10 @@ class Notice extends Memcached_DataObject $reply_ids = $this->getReplies(); foreach ($reply_ids as $id) { - $rprofile = Profile::staticGet('id', $id); + $rprofile = Profile::getKV('id', $id); if (!empty($rprofile)) { $ctx->attention[] = $rprofile->getUri(); + $ctx->attentionType[$rprofile->getUri()] = ActivityObject::PERSON; } } @@ -1546,6 +1581,19 @@ class Notice extends Memcached_DataObject foreach ($groups as $group) { $ctx->attention[] = $group->getUri(); + $ctx->attentionType[$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; + break; + case Notice::FOLLOWER_SCOPE: + $surl = common_local_url("subscribers", array('nickname' => $profile->nickname)); + $ctx->attention[] = $surl; + $ctx->attentionType[$surl] = ActivityObject::COLLECTION; + break; } // XXX: deprecated; use ActivityVerb::SHARE instead @@ -1553,13 +1601,21 @@ class Notice extends Memcached_DataObject $repeat = null; if (!empty($this->repeat_of)) { - $repeat = Notice::staticGet('id', $this->repeat_of); - $ctx->forwardID = $repeat->uri; - $ctx->forwardUrl = $repeat->bestUrl(); + $repeat = Notice::getKV('id', $this->repeat_of); + if (!empty($repeat)) { + $ctx->forwardID = $repeat->uri; + $ctx->forwardUrl = $repeat->bestUrl(); + } } $act->context = $ctx; + $source = $this->getSource(); + + if ($source) { + $act->generator = ActivityObject::fromNoticeSource($source); + } + // Source $atom_feed = $profile->getAtomFeed(); @@ -1587,7 +1643,7 @@ class Notice extends Memcached_DataObject $act->source->updated = self::utcDate($notice->created); } - $user = User::staticGet('id', $profile->id); + $user = User::getKV('id', $profile->id); if (!empty($user)) { $act->source->links['license'] = common_config('license', 'url'); @@ -1659,9 +1715,9 @@ class Notice extends Memcached_DataObject // favorite and repeated if (!empty($cur)) { - $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false"; $cp = $cur->getProfile(); - $noticeInfoAttr['repeated'] = ($cp->hasRepeated($this->id)) ? "true" : "false"; + $noticeInfoAttr['favorite'] = ($cp->hasFave($this)) ? "true" : "false"; + $noticeInfoAttr['repeated'] = ($cp->hasRepeated($this)) ? "true" : "false"; } if (!empty($this->repeat_of)) { @@ -1731,7 +1787,7 @@ class Notice extends Memcached_DataObject // return it if it does if (!empty($reply_to)) { - $reply_notice = Notice::staticGet('id', $reply_to); + $reply_notice = Notice::getKV('id', $reply_to); if (!empty($reply_notice)) { return $reply_notice; } @@ -1756,7 +1812,7 @@ class Notice extends Memcached_DataObject // Figure out who that is. - $sender = Profile::staticGet('id', $profile_id); + $sender = Profile::getKV('id', $profile_id); if (empty($sender)) { return null; } @@ -1822,7 +1878,7 @@ class Notice extends Memcached_DataObject */ function repeat($repeater_id, $source) { - $author = Profile::staticGet('id', $this->profile_id); + $author = Profile::getKV('id', $this->profile_id); // 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. @@ -2056,7 +2112,7 @@ class Notice extends Memcached_DataObject // have to wait Event::handle('StartNoticeDistribute', array($this)); - $user = User::staticGet('id', $this->profile_id); + $user = User::getKV('id', $this->profile_id); if (!empty($user)) { Inbox::insertNotice($user->id, $this->id); } @@ -2127,11 +2183,11 @@ class Notice extends Memcached_DataObject $ns->code = $this->source; break; default: - $ns = Notice_source::staticGet($this->source); + $ns = Notice_source::getKV($this->source); if (!$ns) { $ns = new Notice_source(); $ns->code = $this->source; - $app = Oauth_application::staticGet('name', $this->source); + $app = Oauth_application::getKV('name', $this->source); if ($app) { $ns->name = $app->name; $ns->url = $app->source_url; @@ -2204,12 +2260,12 @@ class Notice extends Memcached_DataObject return false; } - $notice = Notice::staticGet('id', $id); + $notice = Notice::getKV('id', $id); if ($notice) { return $notice->created; } - $deleted = Deleted_notice::staticGet('id', $id); + $deleted = Deleted_notice::getKV('id', $id); if ($deleted) { return $deleted->created; } @@ -2330,7 +2386,11 @@ class Notice extends Memcached_DataObject $result = self::cacheGet($keypart); if ($result === false) { - $bResult = $this->_inScope($profile); + $bResult = false; + if (Event::handle('StartNoticeInScope', array($this, $profile, &$bResult))) { + $bResult = $this->_inScope($profile); + Event::handle('EndNoticeInScope', array($this, $profile, &$bResult)); + } $result = ($bResult) ? 1 : 0; self::cacheSet($keypart, $result, 0, 300); } @@ -2340,77 +2400,115 @@ class Notice extends Memcached_DataObject protected function _inScope($profile) { + if (!is_null($this->scope)) { + $scope = $this->scope; + } else { + $scope = self::defaultScope(); + } + // If there's no scope, anyone (even anon) is in scope. - if ($this->scope == 0) { - return true; - } + if ($scope == 0) { // Not private - // If there's scope, anon cannot be in scope + return !$this->isHiddenSpam($profile); - if (empty($profile)) { - return false; - } + } else { // Private, somehow - // Author is always in scope + // If there's scope, anon cannot be in scope - if ($this->profile_id == $profile->id) { - return true; - } + if (empty($profile)) { + return false; + } - // Only for users on this site + // Author is always in scope - if ($this->scope & Notice::SITE_SCOPE) { - $user = $profile->getUser(); - if (empty($user)) { + if ($this->profile_id == $profile->id) { + return true; + } + + // Only for users on this site + + if (($scope & Notice::SITE_SCOPE) && !$profile->isLocal()) { return false; } - } - // Only for users mentioned in the notice + // Only for users mentioned in the notice - if ($this->scope & Notice::ADDRESSEE_SCOPE) { + if ($scope & Notice::ADDRESSEE_SCOPE) { - $repl = Reply::pkeyGet(array('notice_id' => $this->id, - 'profile_id' => $profile->id)); + $repl = Reply::pkeyGet(array('notice_id' => $this->id, + 'profile_id' => $profile->id)); - if (empty($repl)) { - return false; + if (empty($repl)) { + return false; + } } - } - // Only for members of the given group + // Only for members of the given group - if ($this->scope & Notice::GROUP_SCOPE) { + if ($scope & Notice::GROUP_SCOPE) { - // XXX: just query for the single membership + // XXX: just query for the single membership - $groups = $this->getGroups(); + $groups = $this->getGroups(); - $foundOne = false; + $foundOne = false; - foreach ($groups as $group) { - if ($profile->isMember($group)) { - $foundOne = true; - break; + foreach ($groups as $group) { + if ($profile->isMember($group)) { + $foundOne = true; + break; + } + } + + if (!$foundOne) { + return false; } } - if (!$foundOne) { - return false; + // Only for followers of the author + + $author = null; + + if ($scope & Notice::FOLLOWER_SCOPE) { + + try { + $author = $this->getProfile(); + } catch (Exception $e) { + return false; + } + + if (!Subscription::exists($profile, $author)) { + return false; + } } + + return !$this->isHiddenSpam($profile); } + } - // Only for followers of the author + function isHiddenSpam($profile) { + + // Hide posts by silenced users from everyone but moderators. - if ($this->scope & Notice::FOLLOWER_SCOPE) { - $author = $this->getProfile(); - if (!Subscription::exists($profile, $author)) { - return false; + if (common_config('notice', 'hidespam')) { + + try { + $author = $this->getProfile(); + } catch(Exception $e) { + // If we can't get an author, keep it hidden. + // XXX: technically not spam, but, whatever. + return true; + } + + if ($author->hasRole(Profile_role::SILENCED)) { + if (empty($profile) || (($profile->id !== $author->id) && (!$profile->hasRight(Right::REVIEWSPAM)))) { + return true; + } } } - return true; + return false; } static function groupsFromText($text, $profile) @@ -2436,18 +2534,21 @@ class Notice extends Memcached_DataObject return $groups; } - protected $_original = -1; + protected $_parent = -1; - function getOriginal() + public function getParent() { - if (is_int($this->_original) && $this->_original == -1) { - if (empty($this->reply_to)) { - $this->_original = null; - } else { - $this->_original = Notice::staticGet('id', $this->reply_to); - } + if (empty($this->reply_to)) { + // Should this also be NoResultException? I don't think so. + throw new Exception('Notice has no parent'); + } elseif ($this->_parent === -1) { // local object cache + $this->_parent = Notice::getKV('id', $this->reply_to); + } + + if (!($this->_parent instanceof Notice)) { + throw new NoResultException($this->_parent); } - return $this->_original; + return $this->_parent; } /** @@ -2463,7 +2564,7 @@ class Notice extends Memcached_DataObject function __sleep() { $vars = parent::__sleep(); - $skip = array('_original', '_profile', '_groups'); + $skip = array('_parent', '_profile', '_groups', '_attachments', '_faves', '_replies', '_repeats'); return array_diff($vars, $skip); } @@ -2502,21 +2603,17 @@ class Notice extends Memcached_DataObject $ids = array_unique($ids); - return Memcached_DataObject::pivotGet('Profile', 'id', $ids); + return Profile::pivotGet('id', $ids); } static function fillGroups(&$notices) { - $ids = array(); - foreach ($notices as $notice) { - $ids[] = $notice->id; - } - $ids = array_unique($ids); - - $gis = Memcached_DataObject::listGet('Group_inbox', 'notice_id', $ids); + $ids = self::_idsOf($notices); - common_debug(sprintf("Notice::fillGroups(): got %d results for %d notices", count($gis), count($ids))); + $gis = Group_inbox::listGet('notice_id', $ids); + $gids = array(); + foreach ($gis as $id => $gi) { foreach ($gi as $g) @@ -2527,7 +2624,7 @@ class Notice extends Memcached_DataObject $gids = array_unique($gids); - $group = Memcached_DataObject::pivotGet('User_group', 'id', $gids); + $group = User_group::pivotGet('id', $gids); foreach ($notices as $notice) { @@ -2539,4 +2636,125 @@ class Notice extends Memcached_DataObject $notice->_setGroups($grps); } } + + static function _idsOf(&$notices) + { + $ids = array(); + foreach ($notices as $notice) { + $ids[] = $notice->id; + } + $ids = array_unique($ids); + return $ids; + } + + static function fillAttachments(&$notices) + { + $ids = self::_idsOf($notices); + + $f2pMap = File_to_post::listGet('post_id', $ids); + + $fileIds = array(); + + foreach ($f2pMap as $noticeId => $f2ps) { + foreach ($f2ps as $f2p) { + $fileIds[] = $f2p->file_id; + } + } + + $fileIds = array_unique($fileIds); + + $fileMap = File::pivotGet('id', $fileIds); + + foreach ($notices as $notice) + { + $files = array(); + $f2ps = $f2pMap[$notice->id]; + foreach ($f2ps as $f2p) { + $files[] = $fileMap[$f2p->file_id]; + } + $notice->_setAttachments($files); + } + } + + 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); + $replyMap = Reply::listGet('notice_id', $ids); + foreach ($notices as $notice) { + $replies = $replyMap[$notice->id]; + $ids = array(); + foreach ($replies as $reply) { + $ids[] = $reply->profile_id; + } + $notice->_setReplies($ids); + } + } + + protected $_repeats; + + function getRepeats() + { + if (isset($this->_repeats) && is_array($this->_repeats)) { + return $this->_repeats; + } + $repeatMap = Notice::listGet('repeat_of', array($this->id)); + $this->_repeats = $repeatMap[$this->id]; + return $this->_repeats; + } + + function _setRepeats($repeats) + { + $this->_repeats = $repeats; + } + + static function fillRepeats(&$notices) + { + $ids = self::_idsOf($notices); + $repeatMap = Notice::listGet('repeat_of', $ids); + foreach ($notices as $notice) { + $repeats = $repeatMap[$notice->id]; + $notice->_setRepeats($repeats); + } + } }