Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

diff --combined classes/Notice.php
index ca67306df1a7d7d025a57c24e8eb9923e5b56b23,0b1017e126d95e0da7dd79c102a19e2474ed333c..895b5d2c71c8a3720587ec57a16abb62f0adf7cc
--- 1/classes/Notice.php
--- 2/classes/Notice.php
+++ b/classes/Notice.php
@@@ -124,8 -124,6 +124,8 @@@ class Notice extends Memcached_DataObje
  
          $profile = Profile::staticGet($profile_id);
  
 +        $final =  common_shorten_links($content);
 +
          if (!$profile) {
              common_log(LOG_ERR, 'Problem saving notice. Unknown user.');
              return _('Problem saving notice. Unknown user.');
@@@ -136,7 -134,7 +136,7 @@@
              return _('Too many notices too fast; take a breather and post again in a few minutes.');
          }
  
 -        if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $content)) {
 +        if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
              common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
                        return _('Too many duplicate messages too quickly; take a breather and post again in a few minutes.');
          }
@@@ -167,8 -165,8 +167,8 @@@
  
                $notice->reply_to = $reply_to;
                $notice->created = common_sql_now();
 -              $notice->content = $content;
 -              $notice->rendered = common_render_content($content, $notice);
 +              $notice->content = $final;
 +              $notice->rendered = common_render_content($final, $notice);
                $notice->source = $source;
                $notice->uri = $uri;
  
@@@ -204,9 -202,13 +204,9 @@@
  
              $notice->saveReplies();
              $notice->saveTags();
 -            $notice->saveGroups();
  
 -            if (common_config('queue', 'enabled')) {
 -                $notice->addToAuthorInbox();
 -            } else {
 -                $notice->addToInboxes();
 -            }
 +            $notice->addToInboxes();
 +            $notice->saveGroups();
  
              $notice->query('COMMIT');
  
@@@ -216,7 -218,13 +216,7 @@@
          # Clear the cache for subscribed users, so they'll update at next request
          # XXX: someone clever could prepend instead of clearing the cache
  
 -        if (common_config('memcached', 'enabled')) {
 -            if (common_config('queue', 'enabled')) {
 -                $notice->blowAuthorCaches();
 -            } else {
 -                $notice->blowCaches();
 -            }
 -        }
 +        $notice->blowCaches();
  
          return $notice;
      }
@@@ -269,6 -277,18 +269,18 @@@
          return true;
      }
  
+     function getUploadedAttachment() {
+         $post = clone $this;
+         $query = 'select file.url as uploaded 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();
+         $ret = $post->uploaded;
+ //        var_dump($post);
+         $post->free();
+ //        die();
+         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);
@@@ -289,6 -309,17 +301,6 @@@
          $this->blowGroupCache($blowLast);
      }
  
 -    function blowAuthorCaches($blowLast=false)
 -    {
 -        // Clear the user's cache
 -        $cache = common_memcache();
 -        if (!empty($cache)) {
 -            $cache->delete(common_cache_key('notice_inbox:by_user:'.$this->profile_id));
 -        }
 -        $this->blowNoticeCache($blowLast);
 -        $this->blowPublicCache($blowLast);
 -    }
 -
      function blowGroupCache($blowLast=false)
      {
          $cache = common_memcache();
@@@ -424,22 -455,22 +436,22 @@@
      # XXX: too many args; we need to move to named params or even a separate
      # class for notice streams
  
 -    static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $order=null, $since=null) {
 +    static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $order=null, $since=null) {
  
          if (common_config('memcached', 'enabled')) {
  
 -            # Skip the cache if this is a since, since_id or before_id qry
 -            if ($since_id > 0 || $before_id > 0 || $since) {
 -                return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since);
 +            # Skip the cache if this is a since, since_id or max_id qry
 +            if ($since_id > 0 || $max_id > 0 || $since) {
 +                return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
              } else {
                  return Notice::getCachedStream($qry, $cachekey, $offset, $limit, $order);
              }
          }
  
 -        return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since);
 +        return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
      }
  
 -    static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since) {
 +    static function getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since) {
  
          $needAnd = false;
          $needWhere = true;
@@@ -461,7 -492,7 +473,7 @@@
              $qry .= ' notice.id > ' . $since_id;
          }
  
 -        if ($before_id > 0) {
 +        if ($max_id > 0) {
  
              if ($needWhere) {
                  $qry .= ' WHERE ';
@@@ -470,7 -501,7 +482,7 @@@
                  $qry .= ' AND ';
              }
  
 -            $qry .= ' notice.id < ' . $before_id;
 +            $qry .= ' notice.id <= ' . $max_id;
          }
  
          if ($since) {
@@@ -628,17 -659,17 +640,17 @@@
          }
      }
  
 -    function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
 +    function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
      {
          $ids = Notice::stream(array('Notice', '_publicStreamDirect'),
                                array(),
                                'public',
 -                              $offset, $limit, $since_id, $before_id, $since);
 +                              $offset, $limit, $since_id, $max_id, $since);
  
          return Notice::getStreamByIds($ids);
      }
  
 -    function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
 +    function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
      {
          $notice = new Notice();
  
@@@ -662,8 -693,8 +674,8 @@@
              $notice->whereAdd('id > ' . $since_id);
          }
  
 -        if ($before_id != 0) {
 -            $notice->whereAdd('id < ' . $before_id);
 +        if ($max_id != 0) {
 +            $notice->whereAdd('id <= ' . $max_id);
          }
  
          if (!is_null($since)) {
@@@ -707,6 -738,33 +719,6 @@@
          return;
      }
  
 -    function addToAuthorInbox()
 -    {
 -        $enabled = common_config('inboxes', 'enabled');
 -
 -        if ($enabled === true || $enabled === 'transitional') {
 -            $user = User::staticGet('id', $this->profile_id);
 -            if (empty($user)) {
 -                return;
 -            }
 -            $inbox = new Notice_inbox();
 -            $UT = common_config('db','type')=='pgsql'?'"user"':'user';
 -            $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
 -              "SELECT $UT.id, " . $this->id . ", '" . $this->created . "' " .
 -              "FROM $UT " .
 -              "WHERE $UT.id = " . $this->profile_id . ' ' .
 -              'AND NOT EXISTS (SELECT user_id, notice_id ' .
 -              'FROM notice_inbox ' .
 -              "WHERE user_id = " . $this->profile_id . ' '.
 -              'AND notice_id = ' . $this->id . ' )';
 -            if ($enabled === 'transitional') {
 -                $qry .= " AND $UT.inboxed = 1";
 -            }
 -            $inbox->query($qry);
 -        }
 -        return;
 -    }
 -
      function saveGroups()
      {
          $enabled = common_config('inboxes', 'enabled');
@@@ -978,15 -1036,15 +990,15 @@@
          }
      }
  
 -    function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $since=null, $tag=null)
 +    function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
      {
          $cache = common_memcache();
  
          if (empty($cache) ||
 -            $since_id != 0 || $before_id != 0 || !is_null($since) ||
 +            $since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) ||
              ($offset + $limit) > NOTICE_CACHE_WINDOW) {
              return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
 -                                                                      $before_id, $since, $tag)));
 +                                                                      $max_id, $since)));
          }
  
          $idkey = common_cache_key($cachekey);