diff options
| -rwxr-xr-x | scripts/fixup_inboxes.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php index 79cca5c7c..7bee347a4 100755 --- a/scripts/fixup_inboxes.php +++ b/scripts/fixup_inboxes.php @@ -50,18 +50,15 @@ $cache = common_memcache(); while ($user->fetch()) { common_log(LOG_INFO, 'Updating inbox for user ' . $user->id); $user->query('BEGIN'); - $inbox = new Notice_inbox(); - $inbox->user_id = $user->id; - $result = $inbox->delete(); - if (is_null($result) || $result === false) { - common_log_db_error($inbox, 'DELETE', __FILE__); - continue; - } $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; |