]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - classes/Notice.php
Improve ShownoticeAction remote redirect code
[quix0rs-gnu-social.git] / classes / Notice.php
index 6eb4d9001e4c032f66d78ba8cac8f4f46c1c5a1d..e46ed227a179cbb4cd4f9119a2b2bcb4a7e13ffd 100644 (file)
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @author   Tom Adams <tom@holizz.com>
+ * @author   Mikael Nordfeldth <mmn@hethane.se>
  * @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. */
@@ -49,7 +47,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,18 +70,65 @@ 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
 
+    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;
     const REMOTE          =  0;
@@ -97,36 +142,37 @@ class Notice extends Memcached_DataObject
     const FOLLOWER_SCOPE  = 8;
 
     protected $_profile = -1;
-
-    function getProfile()
+    
+    public function getProfile()
     {
-        if (is_int($this->_profile) && $this->_profile == -1) {
-            $this->_profile = Profile::staticGet('id', $this->profile_id);
-
-            if (empty($this->_profile)) {
-                // TRANS: Server exception thrown when a user profile for a notice cannot be found.
-                // TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-                throw new ServerException(sprintf(_('No such profile (%1$d) for notice (%2$d).'), $this->profile_id, $this->id));
-            }
+        if ($this->_profile === -1) {
+            $this->_setProfile(Profile::getKV('id', $this->profile_id));
         }
-
         return $this->_profile;
     }
+    
+    public function _setProfile(Profile $profile=null)
+    {
+        if (!$profile instanceof Profile) {
+            throw new NoProfileException($this->profile_id);
+        }
+        $this->_profile = $profile;
+    }
 
-    function delete()
+    function delete($useWhere=false)
     {
         // For auditing purposes, save a record that the notice
         // was deleted.
 
         // @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);
+        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;
@@ -148,17 +194,56 @@ class Notice extends Memcached_DataObject
             $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;
     }
 
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    public function getUrl()
+    {
+        // 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():
+            // 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;
+    }
+
     /**
      * Extract #hashtags from this notice's content and save them to the database.
      */
@@ -241,7 +326,7 @@ class Notice extends Memcached_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
@@ -254,6 +339,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
@@ -261,16 +347,18 @@ 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)) {
-            $options = $options + $defaults;
+        if (!empty($options) && is_array($options)) {
+            $options = array_merge($defaults, $options);
             extract($options);
         } else {
             extract($defaults);
@@ -280,9 +368,14 @@ class Notice extends Memcached_DataObject
             $is_local = Notice::LOCAL_PUBLIC;
         }
 
-        $profile = Profile::staticGet('id', $profile_id);
-        $user = User::staticGet('id', $profile_id);
-        if ($user) {
+        $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 instanceof User) {
             // Use the local user's shortening preferences, if applicable.
             $final = $user->shortenLinks($content);
         } else {
@@ -294,11 +387,6 @@ class Notice extends Memcached_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.
@@ -340,6 +428,16 @@ class Notice extends Memcached_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;
@@ -347,9 +445,8 @@ class Notice extends Memcached_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;
@@ -360,9 +457,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.'));
             }
@@ -384,7 +481,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.'));
             }
@@ -408,7 +505,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) {
@@ -438,6 +535,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 {
@@ -456,21 +564,23 @@ 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);
-            if (!empty($group)) {
+            $group = User_group::getKV('id', $groupId);
+            if ($group instanceof User_group) {
                 if ($group->force_scope) {
                     $notice->scope |= Notice::GROUP_SCOPE;
                     break;
@@ -496,8 +606,13 @@ class Notice extends Memcached_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;
             }
 
@@ -505,13 +620,13 @@ class Notice extends Memcached_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.'));
@@ -567,28 +682,27 @@ 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);
-            if (!empty($originalUser)) {
+        if ($original instanceof Notice) {
+            $originalUser = User::getKV('id', $original->profile_id);
+            if ($originalUser instanceof User) {
                 $this->blowStream('user:repeats_of_me:%d', $originalUser->id);
             }
         }
 
-        $profile = Profile::staticGet($this->profile_id);
+        $profile = Profile::getKV($this->profile_id);
 
-        if (!empty($profile)) {
+        if ($profile instanceof Profile) {
             $profile->blowNoticeCount();
         }
 
@@ -653,8 +767,8 @@ class Notice extends Memcached_DataObject
         if ($lastStr !== false) {
             $window     = explode(',', $lastStr);
             $lastID     = $window[0];
-            $lastNotice = Notice::staticGet('id', $lastID);
-            if (empty($lastNotice) // just weird
+            $lastNotice = Notice::getKV('id', $lastID);
+            if (!$lastNotice instanceof Notice // just weird
                 || strtotime($lastNotice->created) >= strtotime($this->created)) {
                 $c->delete($lastKey);
             }
@@ -700,8 +814,8 @@ class Notice extends Memcached_DataObject
     }
 
     static function checkDupes($profile_id, $content) {
-        $profile = Profile::staticGet($profile_id);
-        if (empty($profile)) {
+        $profile = Profile::getKV($profile_id);
+        if (!$profile instanceof Profile) {
             return false;
         }
         $notice = $profile->getNotices(0, CachingNoticeStream::CACHE_WINDOW);
@@ -728,8 +842,8 @@ class Notice extends Memcached_DataObject
     }
 
     static function checkEditThrottle($profile_id) {
-        $profile = Profile::staticGet($profile_id);
-        if (empty($profile)) {
+        $profile = Profile::getKV($profile_id);
+        if (!$profile instanceof Profile) {
             return false;
         }
         // Get the Nth notice
@@ -745,62 +859,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)
     {
@@ -882,23 +967,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;
     }
 
@@ -913,7 +1001,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();
 
@@ -924,30 +1012,23 @@ class Notice extends Memcached_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) {
@@ -957,15 +1038,10 @@ class Notice extends Memcached_DataObject
                 }
             }
 
-            foreach ($ptags as $ptag) {
-                $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;
-                        }
-                    }
+            $ptAtts = $this->getAttentionsFromProfileTags();
+            foreach ($ptAtts as $key=>$val) {
+                if (!array_key_exists($key, $ni)) {
+                    $ni[$key] = $val;
                 }
             }
 
@@ -973,23 +1049,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 instanceof Notice) {
+                    $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 (!$user instanceof 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]);
                 }
             }
 
@@ -1005,43 +1088,6 @@ class Notice extends Memcached_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($groups=null, $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();
@@ -1082,6 +1128,19 @@ class Notice extends Memcached_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.
@@ -1100,8 +1159,8 @@ class Notice extends Memcached_DataObject
 
         $groups = array();
         foreach (array_unique($group_ids) as $id) {
-            $group = User_group::staticGet('id', $id);
-            if ($group) {
+            $group = User_group::getKV('id', $id);
+            if ($group instanceof User_group) {
                 common_log(LOG_ERR, "Local delivery to group id $id, $group->nickname");
                 $result = $this->addToGroupInbox($group);
                 if (!$result) {
@@ -1128,53 +1187,12 @@ class Notice extends Memcached_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();
 
@@ -1206,21 +1224,21 @@ 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) {
 
             $profile = Profile::fromURI($uri);
 
-            if (empty($profile)) {
+            if (!$profile instanceof Profile) {
                 common_log(LOG_WARNING, "Unable to determine profile for URI '$uri'");
                 continue;
             }
@@ -1255,22 +1273,21 @@ 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 {
+            $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);
             }
+        } catch (Exception $e) {
+            // Not a reply, since it has no parent!
         }
 
         // @todo ideally this parser information would only
@@ -1293,8 +1310,8 @@ class Notice extends Memcached_DataObject
 
                 // Don't save replies from blocked profile to local user
 
-                $mentioned_user = User::staticGet('id', $mentioned->id);
-                if (!empty($mentioned_user) && $mentioned_user->hasBlocked($sender)) {
+                $mentioned_user = User::getKV('id', $mentioned->id);
+                if ($mentioned_user instanceof User && $mentioned_user->hasBlocked($sender)) {
                     continue;
                 }
 
@@ -1322,6 +1339,8 @@ class Notice extends Memcached_DataObject
         return $reply;
     }
 
+    protected $_replies = -1;
+
     /**
      * Pull the complete list of @-reply targets for this notice.
      *
@@ -1329,31 +1348,28 @@ class Notice extends Memcached_DataObject
      */
     function getReplies()
     {
-        $keypart = sprintf('notice:reply_ids:%d', $this->id);
+        if ($this->_replies != -1) {
+            return $this->_replies;
+        }
 
-        $idstr = self::cacheGet($keypart);
+        $replyMap = Reply::listGet('notice_id', array($this->id));
 
-        if ($idstr !== false) {
-            $ids = explode(',', $idstr);
-        } else {
-            $ids = array();
-
-            $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.
      *
@@ -1361,17 +1377,11 @@ class Notice extends Memcached_DataObject
      */
     function getReplyProfiles()
     {
-        $ids      = $this->getReplies();
-        $profiles = array();
-
-        foreach ($ids as $id) {
-            $profile = Profile::staticGet('id', $id);
-            if (!empty($profile)) {
-                $profiles[] = $profile;
-            }
-        }
+        $ids = $this->getReplies();
+        
+        $profiles = Profile::multiGet('id', $ids);
         
-        return $profiles;
+        return $profiles->fetchAll();
     }
 
     /**
@@ -1391,8 +1401,8 @@ class Notice extends Memcached_DataObject
         $recipientIds = $this->getReplies();
 
         foreach ($recipientIds as $recipientId) {
-            $user = User::staticGet('id', $recipientId);
-            if (!empty($user)) {
+            $user = User::getKV('id', $recipientId);
+            if ($user instanceof User) {
                 mail_notify_attn($user, $this);
             }
         }
@@ -1400,10 +1410,13 @@ class Notice extends Memcached_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;
+    
     function getGroups()
     {
         // Don't save groups for repeats
@@ -1411,42 +1424,31 @@ class Notice extends Memcached_DataObject
         if (!empty($this->repeat_of)) {
             return array();
         }
-
-        $ids = array();
-
-        $keypart = sprintf('notice:groups:%d', $this->id);
-
-        $idstr = self::cacheGet($keypart);
-
-        if ($idstr !== false) {
-            $ids = explode(',', $idstr);
-        } else {
-            $gi = new Group_inbox();
-
-            $gi->selectAdd();
-            $gi->selectAdd('group_id');
-
-            $gi->notice_id = $this->id;
-
-            if ($gi->find()) {
-                while ($gi->fetch()) {
-                    $ids[] = $gi->group_id;
-                }
-            }
-
-            self::cacheSet($keypart, implode(',', $ids));
+        
+        if ($this->_groups != -1)
+        {
+            return $this->_groups;
         }
+        
+        $gis = Group_inbox::listGet('notice_id', array($this->id));
 
-        $groups = array();
-
-        foreach ($ids as $id) {
-            $group = User_group::staticGet('id', $id);
-            if ($group) {
-                $groups[] = $group;
-            }
-        }
+        $ids = array();
 
-        return $groups;
+               foreach ($gis[$this->id] as $gi)
+               {
+                   $ids[] = $gi->group_id;
+               }
+               
+               $groups = User_group::multiGet('id', $ids);
+               
+               $this->_groups = $groups->fetchAll();
+               
+               return $this->_groups;
+    }
+    
+    function _setGroups($groups)
+    {
+        $this->_groups = $groups;
     }
 
     /**
@@ -1457,32 +1459,39 @@ 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));
 
-        if (!empty($act)) {
+        if ($act instanceof Activity) {
             return $act;
         }
         $act = new Activity();
 
         if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
 
+            $act->id      = $this->uri;
+            $act->time    = strtotime($this->created);
+            $act->link    = $this->bestUrl();
+            $act->content = common_xml_safe_str($this->rendered);
+
             $profile = $this->getProfile();
 
             $act->actor            = ActivityObject::fromProfile($profile);
             $act->actor->extra[]   = $profile->profileInfo($cur);
-            $act->verb             = ActivityVerb::POST;
-            $act->objects[]        = ActivityObject::fromNotice($this);
 
-            // XXX: should this be handled by default processing for object entry?
+            $act->verb = $this->verb;
 
-            $act->time    = strtotime($this->created);
-            $act->link    = $this->bestUrl();
+            if ($this->repeat_of) {
+                $repeated = Notice::getKV('id', $this->repeat_of);
+                if ($repeated instanceof Notice) {
+                    $act->objects[] = $repeated->asActivity($cur);
+                }
+            } else {
+                $act->objects[] = ActivityObject::fromNotice($this);
+            }
 
-            $act->content = common_xml_safe_str($this->rendered);
-            $act->id      = $this->uri;
-            $act->title   = common_xml_safe_str($this->content);
+            // XXX: should this be handled by default processing for object entry?
 
             // Categories
 
@@ -1501,20 +1510,20 @@ 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);
-                if (!empty($reply)) {
-                    $ctx->replyToID  = $reply->uri;
-                    $ctx->replyToUrl = $reply->bestUrl();
-                }
+            try {
+                $reply = $this->getParent();
+                $ctx->replyToID  = $reply->uri;
+                $ctx->replyToUrl = $reply->bestUrl();
+            } catch (Exception $e) {
+                // This is not a reply to something
             }
 
             $ctx->location = $this->getLocation();
@@ -1522,8 +1531,8 @@ class Notice extends Memcached_DataObject
             $conv = null;
 
             if (!empty($this->conversation)) {
-                $conv = Conversation::staticGet('id', $this->conversation);
-                if (!empty($conv)) {
+                $conv = Conversation::getKV('id', $this->conversation);
+                if ($conv instanceof Conversation) {
                     $ctx->conversation = $conv->uri;
                 }
             }
@@ -1531,30 +1540,36 @@ class Notice extends Memcached_DataObject
             $reply_ids = $this->getReplies();
 
             foreach ($reply_ids as $id) {
-                $rprofile = Profile::staticGet('id', $id);
-                if (!empty($rprofile)) {
-                    $ctx->attention[] = $rprofile->getUri();
+                $rprofile = Profile::getKV('id', $id);
+                if ($rprofile instanceof Profile) {
+                    $ctx->attention[$rprofile->getUri()] = ActivityObject::PERSON;
                 }
             }
 
             $groups = $this->getGroups();
 
             foreach ($groups as $group) {
-                $ctx->attention[] = $group->getUri();
+                $ctx->attention[$group->getUri()] = ActivityObject::GROUP;
             }
 
-            // XXX: deprecated; use ActivityVerb::SHARE instead
-
-            $repeat = null;
-
-            if (!empty($this->repeat_of)) {
-                $repeat = Notice::staticGet('id', $this->repeat_of);
-                $ctx->forwardID  = $repeat->uri;
-                $ctx->forwardUrl = $repeat->bestUrl();
+            switch ($this->scope) {
+            case Notice::PUBLIC_SCOPE:
+                $ctx->attention[ActivityContext::ATTN_PUBLIC] = ActivityObject::COLLECTION;
+                break;
+            case Notice::FOLLOWER_SCOPE:
+                $surl = common_local_url("subscribers", array('nickname' => $profile->nickname));
+                $ctx->attention[$surl] = ActivityObject::COLLECTION;
+                break;
             }
 
             $act->context = $ctx;
 
+            $source = $this->getSource();
+
+            if ($source instanceof Notice_source) {
+                $act->generator = ActivityObject::fromNoticeSource($source);
+            }
+
             // Source
 
             $atom_feed = $profile->getAtomFeed();
@@ -1578,13 +1593,13 @@ class Notice extends Memcached_DataObject
 
                 $notice = $profile->getCurrentNotice();
 
-                if (!empty($notice)) {
+                if ($notice instanceof Notice) {
                     $act->source->updated = self::utcDate($notice->created);
                 }
 
-                $user = User::staticGet('id', $profile->id);
+                $user = User::getKV('id', $profile->id);
 
-                if (!empty($user)) {
+                if ($user instanceof User) {
                     $act->source->links['license'] = common_config('license', 'url');
                 }
             }
@@ -1637,7 +1652,7 @@ class Notice extends Memcached_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;
@@ -1654,9 +1669,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)) {
@@ -1726,8 +1741,8 @@ class Notice extends Memcached_DataObject
         // return it if it does
 
         if (!empty($reply_to)) {
-            $reply_notice = Notice::staticGet('id', $reply_to);
-            if (!empty($reply_notice)) {
+            $reply_notice = Notice::getKV('id', $reply_to);
+            if ($reply_notice instanceof Notice) {
                 return $reply_notice;
             }
         }
@@ -1751,14 +1766,14 @@ class Notice extends Memcached_DataObject
 
         // Figure out who that is.
 
-        $sender = Profile::staticGet('id', $profile_id);
-        if (empty($sender)) {
+        $sender = Profile::getKV('id', $profile_id);
+        if (!$sender instanceof Profile) {
             return null;
         }
 
         $recipient = common_relative_profile($sender, $nickname, common_sql_now());
 
-        if (empty($recipient)) {
+        if (!$recipient instanceof Profile) {
             return null;
         }
 
@@ -1766,7 +1781,7 @@ class Notice extends Memcached_DataObject
 
         $last = $recipient->getCurrentNotice();
 
-        if (!empty($last)) {
+        if ($last instanceof Notice) {
             return $last;
         }
 
@@ -1817,7 +1832,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.
@@ -1856,7 +1871,11 @@ class Notice extends Memcached_DataObject
         } else {
             $idstr = $cache->get(Cache::key('notice:repeats:'.$this->id));
             if ($idstr !== false) {
-                $ids = explode(',', $idstr);
+               if (empty($idstr)) {
+                       $ids = array();
+               } else {
+                       $ids = explode(',', $idstr);
+               }
             } else {
                 $ids = $this->_repeatStreamDirect(100);
                 $cache->set(Cache::key('notice:repeats:'.$this->id), implode(',', $ids));
@@ -1885,18 +1904,7 @@ class Notice extends Memcached_DataObject
             $notice->limit(0, $limit);
         }
 
-        $ids = array();
-
-        if ($notice->find()) {
-            while ($notice->fetch()) {
-                $ids[] = $notice->id;
-            }
-        }
-
-        $notice->free();
-        $notice = NULL;
-
-        return $ids;
+        return $notice->fetchAll('id');
     }
 
     function locationOptions($lat, $lon, $location_id, $location_ns, $profile = null)
@@ -1909,7 +1917,7 @@ class Notice extends Memcached_DataObject
 
             $location = Location::fromId($location_id, $location_ns);
 
-            if (!empty($location)) {
+            if ($location instanceof Location) {
                 $options['lat'] = $location->lat;
                 $options['lon'] = $location->lon;
             }
@@ -1920,7 +1928,7 @@ class Notice extends Memcached_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;
             }
@@ -1939,6 +1947,20 @@ class Notice extends Memcached_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();
@@ -2058,33 +2080,23 @@ class Notice extends Memcached_DataObject
         // have to wait
         Event::handle('StartNoticeDistribute', array($this));
 
-        $user = User::staticGet('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;
         }
     }
 
@@ -2092,7 +2104,7 @@ class Notice extends Memcached_DataObject
     {
         $result = parent::insert();
 
-        if ($result) {
+        if ($result !== false) {
             // Profile::hasRepeated() abuses pkeyGet(), so we
             // have to clear manually
             if (!empty($this->repeat_of)) {
@@ -2129,11 +2141,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;
@@ -2206,12 +2218,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;
         }
@@ -2332,7 +2344,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);
         }
@@ -2342,115 +2358,126 @@ class Notice extends Memcached_DataObject
 
     protected function _inScope($profile)
     {
-        // If there's no scope, anyone (even anon) is in scope.
-
-        if ($this->scope == 0) {
-            return true;
+        if (!is_null($this->scope)) {
+            $scope = $this->scope;
+        } else {
+            $scope = self::defaultScope();
         }
 
-        // If there's scope, anon cannot be in scope
+        // If there's no scope, anyone (even anon) is in scope.
 
-        if (empty($profile)) {
-            return false;
-        }
+        if ($scope == 0) { // Not private
 
-        // Author is always in scope
+            return !$this->isHiddenSpam($profile);
 
-        if ($this->profile_id == $profile->id) {
-            return true;
-        }
+        } else { // Private, somehow
 
-        // Only for users on this site
+            // If there's scope, anon cannot be in scope
 
-        if ($this->scope & Notice::SITE_SCOPE) {
-            $user = $profile->getUser();
-            if (empty($user)) {
+            if (empty($profile)) {
                 return false;
             }
-        }
 
-        // Only for users mentioned in the notice
+            // Author is always in scope
 
-        if ($this->scope & Notice::ADDRESSEE_SCOPE) {
-
-            // XXX: just query for the single reply
+            if ($this->profile_id == $profile->id) {
+                return true;
+            }
 
-            $replies = $this->getReplies();
+            // Only for users on this site
 
-            if (!in_array($profile->id, $replies)) {
+            if (($scope & Notice::SITE_SCOPE) && !$profile->isLocal()) {
                 return false;
             }
-        }
 
-        // Only for members of the given group
+            // Only for users mentioned in the notice
 
-        if ($this->scope & Notice::GROUP_SCOPE) {
+            if ($scope & Notice::ADDRESSEE_SCOPE) {
 
-            // XXX: just query for the single membership
+                $reply = Reply::pkeyGet(array('notice_id' => $this->id,
+                                             'profile_id' => $profile->id));
+                                                                                
+                if (!$reply instanceof Reply) {
+                    return false;
+                }
+            }
 
-            $groups = $this->getGroups();
+            // Only for members of the given group
 
-            $foundOne = false;
+            if ($scope & Notice::GROUP_SCOPE) {
 
-            foreach ($groups as $group) {
-                if ($profile->isMember($group)) {
-                    $foundOne = true;
-                    break;
+                // XXX: just query for the single membership
+
+                $groups = $this->getGroups();
+
+                $foundOne = false;
+
+                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
+            // Only for followers of the author
 
-        if ($this->scope & Notice::FOLLOWER_SCOPE) {
-            $author = $this->getProfile();
-            if (!Subscription::exists($profile, $author)) {
-                return false;
+            $author = null;
+
+            if ($scope & Notice::FOLLOWER_SCOPE) {
+
+                try {
+                    $author = $this->getProfile();
+                } catch (Exception $e) {
+                    return false;
+                }
+        
+                if (!Subscription::exists($profile, $author)) {
+                    return false;
+                }
             }
-        }
 
-        return true;
+            return !$this->isHiddenSpam($profile);
+        }
     }
 
-    static function groupsFromText($text, $profile)
-    {
-        $groups = array();
+    function isHiddenSpam($profile) {
+        
+        // Hide posts by silenced users from everyone but moderators.
 
-        /* extract all !group */
-        $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
-                                strtolower($text),
-                                $match);
+        if (common_config('notice', 'hidespam')) {
 
-        if (!$count) {
-            return $groups;
-        }
+            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;
+            }
 
-        foreach (array_unique($match[1]) as $nickname) {
-            $group = User_group::getForNickname($nickname, $profile);
-            if (!empty($group) && $profile->isMember($group)) {
-                $groups[] = $group->id;
+            if ($author->hasRole(Profile_role::SILENCED)) {
+                if (!$profile instanceof Profile || (($profile->id !== $author->id) && (!$profile->hasRight(Right::REVIEWSPAM)))) {
+                    return true;
+                }
             }
         }
 
-        return $groups;
+        return false;
     }
 
-    protected $_original = -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);
-            }
+        $parent = Notice::getKV('id', $this->reply_to);
+
+        if (!$parent instanceof Notice) {
+            throw new ServerException('Notice has no parent');
         }
-        return $this->_original;
+
+        return $parent;
     }
 
     /**
@@ -2466,7 +2493,7 @@ class Notice extends Memcached_DataObject
     function __sleep()
     {
         $vars = parent::__sleep();
-        $skip = array('_original', '_profile');
+        $skip = array('_profile', '_groups', '_attachments', '_faves', '_replies', '_repeats');
         return array_diff($vars, $skip);
     }
     
@@ -2483,4 +2510,185 @@ class Notice extends Memcached_DataObject
        return $scope;
     }
 
+       static function fillProfiles($notices)
+       {
+               $map = self::getProfiles($notices);
+               
+               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->id}");
+                unset($notices[$entry]);
+            }
+               }
+               
+               return array_values($map);
+       }
+       
+       static function getProfiles(&$notices)
+       {
+               $ids = array();
+               foreach ($notices as $notice) {
+                       $ids[] = $notice->profile_id;
+               }
+               
+               $ids = array_unique($ids);
+               
+               return Profile::pivotGet('id', $ids); 
+       }
+       
+       static function fillGroups(&$notices)
+       {
+        $ids = self::_idsOf($notices);
+               
+        $gis = Group_inbox::listGet('notice_id', $ids);
+               
+        $gids = array();
+
+               foreach ($gis as $id => $gi)
+               {
+                   foreach ($gi as $g)
+                   {
+                       $gids[] = $g->group_id;
+                   }
+               }
+               
+               $gids = array_unique($gids);
+               
+               $group = User_group::pivotGet('id', $gids);
+               
+               foreach ($notices as $notice)
+               {
+                       $grps = array();
+                       $gi = $gis[$notice->id];
+                       foreach ($gi as $g) {
+                           $grps[] = $group[$g->group_id];
+                       }
+                   $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);
+        }
+    }
 }