X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Ffixup_inboxes.php;h=3e55edef17257fbf4233f858947fbef33643a25c;hb=7721839efdf3a9b42ac94559425578a2285b042e;hp=e78e9c7f5b3aaac3ba2d6eb7bd4c0bc6e92b2ad0;hpb=50caffec3d26fb50c006f59b52446b38cb223292;p=quix0rs-gnu-social.git

diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index e78e9c7f5b..3e55edef17 100755
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -2,7 +2,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, 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
@@ -34,22 +34,47 @@ define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 
+$start_at = ($argc > 1) ? $argv[1] : null;
+
 common_log(LOG_INFO, 'Updating user inboxes.');
 
 $user = new User();
+
+if ($start_at) {
+    $user->whereAdd('id >= ' . $start_at);
+}
+
 $cnt = $user->find();
+$cache = common_memcache();
 
 while ($user->fetch()) {
     common_log(LOG_INFO, 'Updating inbox for user ' . $user->id);
-	$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');
-	if (!$result) {
-		common_log_db_error($inbox, 'INSERT', __FILE__);
-	}
-	$inbox->free();
-	unset($inbox);
+    $user->query('BEGIN');
+    $inbox = new Notice_inbox();
+    $result = $inbox->query('INSERT LOW_PRIORITY 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)');
+    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));
+    }
 }