Do mention lookup for Webfinger accounts in OStatusPlugin

[quix0rs-gnu-social.git] / classes / Notice_inbox.php

diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index dec14b0d18897cf0fcb40ddf8e44305929ca5103..c27dcdfd616079359df0f4db998f7c09ca285537 100644 (file)
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2010, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,13 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
 // We keep 5 pages of inbox notices in memcache, +1 for pagination check
 
 define('INBOX_CACHE_WINDOW', 101);
+define('NOTICE_INBOX_GC_BOXCAR', 128);
+define('NOTICE_INBOX_GC_MAX', 12800);
+define('NOTICE_INBOX_LIMIT', 1000);
+define('NOTICE_INBOX_SOFT_LIMIT', 1000);
 
 class Notice_inbox extends Memcached_DataObject
 {
@@ -43,46 +49,33 @@ class Notice_inbox extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function stream($user_id, $offset, $limit, $since_id, $before_id, $since)
+    function stream($user_id, $offset, $limit, $since_id, $max_id, $since, $own=false)
     {
-        return Notice::stream(array('Notice_inbox', '_streamDirect'),
-                              array($user_id),
-                              'notice_inbox:by_user:'.$user_id,
-                              $offset, $limit, $since_id, $before_id, $since);
+        throw new Exception('Notice_inbox no longer used; use Inbox');
     }
 
-    function _streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since)
+    function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id, $since)
     {
-        $inbox = new Notice_inbox();
-
-        $inbox->user_id = $user_id;
-
-        if ($since_id != 0) {
-            $inbox->whereAdd('notice_id > ' . $since_id);
-        }
-
-        if ($before_id != 0) {
-            $inbox->whereAdd('notice_id < ' . $before_id);
-        }
-
-        if (!is_null($since)) {
-            $inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
-        }
-
-        $inbox->orderBy('notice_id DESC');
+        throw new Exception('Notice_inbox no longer used; use Inbox');
+    }
 
-        if (!is_null($offset)) {
-            $inbox->limit($offset, $limit);
-        }
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
+    }
 
-        $ids = array();
+    static function gc($user_id)
+    {
+        throw new Exception('Notice_inbox no longer used; use Inbox');
+    }
 
-        if ($inbox->find()) {
-            while ($inbox->fetch()) {
-                $ids[] = $inbox->notice_id;
-            }
-        }
+    static function deleteMatching($user_id, $notices)
+    {
+        throw new Exception('Notice_inbox no longer used; use Inbox');
+    }
 
-        return $ids;
+    static function bulkInsert($notice_id, $created, $ni)
+    {
+        throw new Exception('Notice_inbox no longer used; use Inbox');
     }
 }