X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FInbox.php;h=336bba048c983dbb6648b66c5450f96c8e32bf6b;hb=8b0f45d0a715fd25beb0aef9d42de3b91c5cd1ca;hp=de48d7381861e1837e5d6adfbf69c495bbffd3c7;hpb=f2a403589cc8858ec3d3ce70f09709f36277c348;p=quix0rs-gnu-social.git

diff --git a/classes/Inbox.php b/classes/Inbox.php
index de48d73818..336bba048c 100644
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -32,6 +32,7 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 class Inbox extends Memcached_DataObject
 {
     const BOXCAR = 128;
+    const MAX_NOTICES = 1024;
 
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -51,54 +52,125 @@ class Inbox extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    static function insertNotice($user_id, $notice_id)
+    /**
+     * Create a new inbox from existing Notice_inbox stuff
+     */
+    static function initialize($user_id)
     {
-        $inbox = new Inbox();
+        $inbox = Inbox::fromNoticeInbox($user_id);
+
+        unset($inbox->fake);
+
+        $result = $inbox->insert();
 
-        $inbox->query(sprintf('UPDATE inbox '.
-                              'set notice_ids = concat(cast(%08x as binary(4)), '.
-                              'substr(notice_ids, 1, 4092)) '.
-                              'WHERE user_id = %d',
-                              $notice_id, $user_id));
+        if (!$result) {
+            common_log_db_error($inbox, 'INSERT', __FILE__);
+            return null;
+        }
+
+        return $inbox;
     }
 
-    static function bulkInsert($notice_id, $user_ids)
+    static function fromNoticeInbox($user_id)
     {
-        $cnt = count($user_ids);
+        $ids = array();
 
-        for ($off = 0; $off < $cnt; $off += self::BOXCAR) {
+        $ni = new Notice_inbox();
 
-            $boxcar = array_slice($user_ids, $off, self::BOXCAR);
+        $ni->user_id = $user_id;
+        $ni->selectAdd();
+        $ni->selectAdd('notice_id');
+        $ni->orderBy('notice_id DESC');
+        $ni->limit(0, self::MAX_NOTICES);
 
-            if (empty($boxcar)) { // jump in, hobo!
-                break;
+        if ($ni->find()) {
+            while($ni->fetch()) {
+                $ids[] = $ni->notice_id;
             }
+        }
+
+        $ni->free();
+        unset($ni);
 
-            $inbox = new Inbox();
+        $inbox = new Inbox();
 
-            $inbox->query(sprintf('UPDATE inbox '.
-                                  'set notice_ids = concat(cast(%08x as binary(4)), '.
-                                  'substr(notice_ids, 1, 4092)) '.
-                                  'WHERE user_id in (%s)',
-                                  $notice_id, implode(',', $boxcar)));
+        $inbox->user_id = $user_id;
+        $inbox->pack($ids);
+        $inbox->fake = true;
 
-            $inbox->free();
-        }
+        return $inbox;
     }
 
-    function stream($user_id, $offset, $limit, $since_id, $max_id, $since, $own=false)
+    /**
+     * Append the given notice to the given user's inbox.
+     * Caching updates are managed for the inbox itself.
+     *
+     * If the notice is already in this inbox, the second
+     * add will be silently dropped.
+     *
+     * @param int @user_id
+     * @param int $notice_id
+     * @return boolean success
+     */
+    static function insertNotice($user_id, $notice_id)
     {
-        $inbox = Inbox::staticGet('user_id', $user_id);
+        // Going straight to the DB rather than trusting our caching
+        // during an update. Note: not using DB_DataObject::staticGet,
+        // which is unsafe to use directly (in-process caching causes
+        // memory leaks, which accumulate in queue processes).
+        $inbox = new Inbox();
+        if (!$inbox->get('user_id', $user_id)) {
+            $inbox = Inbox::initialize($user_id);
+        }
 
         if (empty($inbox)) {
-            return array();
+            return false;
         }
 
-        $ids = unpack('L*', $inbox->notice_ids);
+        $ids = $inbox->unpack();
+        if (in_array(intval($notice_id), $ids)) {
+            // Already in there, we probably re-ran some inbox adds
+            // due to an error. Skip the dupe silently.
+            return true;
+        }
+
+        $result = $inbox->query(sprintf('UPDATE inbox '.
+                                        'set notice_ids = concat(cast(0x%08x as binary(4)), '.
+                                        'substr(notice_ids, 1, %d)) '.
+                                        'WHERE user_id = %d',
+                                        $notice_id,
+                                        4 * (self::MAX_NOTICES - 1),
+                                        $user_id));
+
+        if ($result) {
+            self::blow('inbox:user_id:%d', $user_id);
+        }
+
+        return $result;
+    }
+
+    static function bulkInsert($notice_id, $user_ids)
+    {
+        foreach ($user_ids as $user_id)
+        {
+            Inbox::insertNotice($user_id, $notice_id);
+        }
+    }
 
-        // XXX: handle since_id
-        // XXX: handle max_id
+    /**
+     * Saves a list of integer notice_ids into a packed blob in this object.
+     * @param array $ids list of integer notice_ids
+     */
+    function pack(array $ids)
+    {
+        $this->notice_ids = call_user_func_array('pack', array_merge(array('N*'), $ids));
+    }
 
-        $ids = array_slice($ids, $offset, $limit);
+    /**
+     * @return array of integer notice_ids
+     */
+    function unpack()
+    {
+        return unpack('N*', $this->notice_ids);
     }
 }