add block name to block form

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

diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index 14a9f86d3a70cbb252b6a163285199bb1ccf1671..1715b0bc1ba22d13b3461121672f385772b02684 100755 (executable)
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -34,20 +34,32 @@ 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);
        $user->query('BEGIN');
        $inbox = new Notice_inbox();
-       $result = $inbox->query('INSERT LOW_PRIORITY IGNORE INTO notice_inbox (user_id, notice_id, created) ' .
+       $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 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;
@@ -62,4 +74,7 @@ while ($user->fetch()) {
        $user->query('COMMIT');
        $inbox->free();
        unset($inbox);
+       if ($cache) {
+               $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+       }
 }