Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

[quix0rs-gnu-social.git] / scripts / inbox_users.php

diff --git a/scripts/inbox_users.php b/scripts/inbox_users.php
index f907e158416099b87df2da8d0b66d9fcd26927ff..7d14f0efe6258fd85e8fd5ac591148ebd0b6a7d3 100755 (executable)
--- a/scripts/inbox_users.php
+++ b/scripts/inbox_users.php
@@ -42,68 +42,70 @@ common_log(LOG_INFO, 'Updating user inboxes.');
 $ids = file($id_file);
 
 foreach ($ids as $id) {
-    
-    $user = User::staticGet('id', $id);
+       
+       $user = User::staticGet('id', $id);
 
-    if (!$user) {
-        common_log(LOG_WARNING, 'No such user: ' . $id);
-        continue;
-    }
-    
-    if ($user->inboxed) {
-        common_log(LOG_WARNING, 'Already inboxed: ' . $id);
-        continue;
-    }
-    
+       if (!$user) {
+               common_log(LOG_WARNING, 'No such user: ' . $id);
+               continue;
+       }
+       
+       if ($user->inboxed) {
+               common_log(LOG_WARNING, 'Already inboxed: ' . $id);
+               continue;
+       }
+       
     common_log(LOG_INFO, 'Updating inbox for user ' . $user->id);
-    
-    $user->query('BEGIN');
-    
-    $old_inbox = new Notice_inbox();
-    $old_inbox->user_id = $user->id;
-    
-    $result = $old_inbox->delete();
-    
-    if (is_null($result) || $result === false) {
-        common_log_db_error($old_inbox, 'DELETE', __FILE__);
-        continue;
-    }
+       
+       $user->query('BEGIN');
+       
+       $old_inbox = new Notice_inbox();
+       $old_inbox->user_id = $user->id;
+       
+       $result = $old_inbox->delete();
+       
+       if (is_null($result) || $result === false) {
+               common_log_db_error($old_inbox, 'DELETE', __FILE__);
+               continue;
+       }
 
-    $old_inbox->free();
-    
-    $inbox = new Notice_inbox();
-    
-    $result = $inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
-                            'SELECT ' . $user->id . ', notice.id, notice.created ' .
-                            'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
-                            'WHERE subscription.subscriber = ' . $user->id . ' ' .
-                            'AND notice.created >= subscription.created ' .
-                            'AND now() - notice.created < ' . (7 * 24 * 3600) . ' ' .
-                            'AND NOT EXISTS (SELECT user_id, notice_id ' .
-                            'FROM notice_inbox ' .
-                            'WHERE user_id = ' . $user->id . ' ' . 
-                            'AND notice_id = notice.id)');
-    
-    if (is_null($result) || $result === false) {
-        common_log_db_error($inbox, 'INSERT', __FILE__);
-        continue;
-    }
-    
-    $orig = clone($user);
-    $user->inboxed = 1;
-    $result = $user->update($orig);
-    
-    if (!$result) {
-        common_log_db_error($user, 'UPDATE', __FILE__);
-        continue;
-    }
-    
-    $user->query('COMMIT');
-    
-    $inbox->free();
-    unset($inbox);
-    
-    if ($cache) {
-        $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
-    }
+       $old_inbox->free();
+       
+       $inbox = new Notice_inbox();
+       
+       $result = $inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
+                                                       'SELECT ' . $user->id . ', notice.id, notice.created ' .
+                                                       'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
+                                                       'WHERE subscription.subscriber = ' . $user->id . ' ' .
+                                                       'AND notice.created >= subscription.created ' .
+                                                       'AND NOT EXISTS (SELECT user_id, notice_id ' .
+                                                       'FROM notice_inbox ' .
+                                                       'WHERE user_id = ' . $user->id . ' ' . 
+                                                       'AND notice_id = notice.id) ' .
+                                                       'ORDER BY notice.created DESC ' .
+                                                       'LIMIT 0, 1000');
+       
+       if (is_null($result) || $result === false) {
+               common_log_db_error($inbox, 'INSERT', __FILE__);
+               continue;
+       }
+       
+       $orig = clone($user);
+       $user->inboxed = 1;
+       $result = $user->update($orig);
+       
+       if (!$result) {
+               common_log_db_error($user, 'UPDATE', __FILE__);
+               continue;
+       }
+       
+       $user->query('COMMIT');
+       
+       $inbox->free();
+       unset($inbox);
+       
+       if ($cache) {
+               $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+               $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
+       }
 }