X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice_inbox.php;h=d3ddad656a7aae8492f1bee4d80afd3959193b92;hb=7b452e4f7142c0a2b580b174cbab5d51ab7f9d1e;hp=d3e7853b1bd804eeb35adb0cc4eccec7cbd143fe;hpb=bbb830e14c718c687f0636710a1827c90b11f4cc;p=quix0rs-gnu-social.git

diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index d3e7853b1b..d3ddad656a 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -32,6 +32,7 @@ define('NOTICE_INBOX_SOFT_LIMIT', 1000);
 define('NOTICE_INBOX_SOURCE_SUB', 1);
 define('NOTICE_INBOX_SOURCE_GROUP', 2);
 define('NOTICE_INBOX_SOURCE_REPLY', 3);
+define('NOTICE_INBOX_SOURCE_FORWARD', 4);
 define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
 
 class Notice_inbox extends Memcached_DataObject
@@ -83,7 +84,7 @@ class Notice_inbox extends Memcached_DataObject
             $inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
         }
 
-        $inbox->orderBy('notice_id DESC');
+        $inbox->orderBy('created DESC');
 
         if (!is_null($offset)) {
             $inbox->limit($offset, $limit);
@@ -105,6 +106,13 @@ class Notice_inbox extends Memcached_DataObject
         return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
     }
 
+    /**
+     * Trim inbox for a given user to latest NOTICE_INBOX_LIMIT items
+     * (up to NOTICE_INBOX_GC_MAX will be deleted).
+     *
+     * @param int $user_id
+     * @return int count of notices dropped from the inbox, if any
+     */
     static function gc($user_id)
     {
         $entry = new Notice_inbox();
@@ -132,6 +140,8 @@ class Notice_inbox extends Memcached_DataObject
                 $notices = array();
             }
         }
+
+        return $total;
     }
 
     static function deleteMatching($user_id, $notices)
@@ -141,4 +151,43 @@ class Notice_inbox extends Memcached_DataObject
                              'WHERE user_id = ' . $user_id . ' ' .
                              'AND notice_id in ('.implode(',', $notices).')');
     }
+
+    static function bulkInsert($notice_id, $created, $ni)
+    {
+        $cnt = 0;
+
+        $qryhdr = 'INSERT INTO notice_inbox (user_id, notice_id, source, created) VALUES ';
+        $qry = $qryhdr;
+
+        foreach ($ni as $id => $source) {
+            if ($cnt > 0) {
+                $qry .= ', ';
+            }
+            $qry .= '('.$id.', '.$notice_id.', '.$source.", '".$created. "') ";
+            $cnt++;
+            if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
+                // FIXME: Causes lag in replicated servers
+                // Notice_inbox::gc($id);
+            }
+            if ($cnt >= MAX_BOXCARS) {
+                $inbox = new Notice_inbox();
+                $result = $inbox->query($qry);
+                if (PEAR::isError($result)) {
+                    common_log_db_error($inbox, $qry);
+                }
+                $qry = $qryhdr;
+                $cnt = 0;
+            }
+        }
+
+        if ($cnt > 0) {
+            $inbox = new Notice_inbox();
+            $result = $inbox->query($qry);
+            if (PEAR::isError($result)) {
+                common_log_db_error($inbox, $qry);
+            }
+        }
+
+        return;
+    }
 }