Fix processing of featured collections

[friendica.git] / src / Worker / ExpireAndRemoveUsers.php

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index dd4119efd9da5b67558c2337aedddf59f2057fe5..47c3e9a60f757707a182721f58b684b03c401b4d 100644 (file)
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -24,6 +24,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
@@ -35,13 +36,13 @@ class ExpireAndRemoveUsers
 {
        public static function execute()
        {
-               // expire any expired regular accounts. Don't expire forums.
+               // expire any expired regular accounts. Don't expire groups.
                $condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < ? AND `page-flags` = ? AND `uid` != ?",
                        DBA::NULL_DATETIME, DateTimeFormat::utcNow(), User::PAGE_FLAGS_NORMAL, 0];
                DBA::update('user', ['account_expired' => true], $condition);
 
                // Ensure to never remove the user with uid=0
-               DBA::update('user', ['account_expired' => false, 'account_removed' => false,
+               DBA::update('user', ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false,
                        'account_expires_on' => DBA::NULL_DATETIME], ['uid' => 0]);
 
                // Remove any freshly expired account
@@ -56,7 +57,9 @@ class ExpireAndRemoveUsers
                // delete user records for recently removed accounts
                $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < ? AND `uid` != ?", DateTimeFormat::utcNow(), 0]);
                while ($user = DBA::fetch($users)) {
-                       Logger::info('Removing user - start', ['uid' => $user['uid']]);
+                       $pcid = Contact::getPublicIdByUserId($user['uid']);
+
+                       Logger::info('Removing user - start', ['uid' => $user['uid'], 'pcid' => $pcid]);
                        // We have to delete photo entries by hand because otherwise the photo data won't be deleted
                        $result = Photo::delete(['uid' => $user['uid']]);
                        if ($result) {
@@ -65,6 +68,33 @@ class ExpireAndRemoveUsers
                                Logger::warning('Error deleting user photos', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
                        }
 
+                       if (!empty($pcid)) {
+                               $result = DBA::delete('post-tag', ['cid' => $pcid]);
+                               if ($result) {
+                                       Logger::debug('Deleted post-tag entries', ['result' => $result, 'rows' => DBA::affectedRows()]);
+                               } else {
+                                       Logger::warning('Error deleting post-tag entries', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
+                               }
+
+                               $tables = ['post', 'post-user', 'post-thread', 'post-thread-user'];
+
+                               if (DBStructure::existsTable('item')) {
+                                       $tables[] = 'item';
+                               }
+
+                               // Delete all entries with the public contact in post related tables
+                               foreach ($tables as $table) {
+                                       foreach (['owner-id', 'author-id', 'causer-id'] as $field) {
+                                               $result = DBA::delete($table, [$field => $pcid]);
+                                               if ($result) {
+                                                       Logger::debug('Deleted entries', ['table' => $table, 'field' => $field, 'result' => $result, 'rows' => DBA::affectedRows()]);
+                                               } else {
+                                                       Logger::warning('Error deleting entries', ['table' => $table, 'field' => $field, 'errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
+                                               }
+                                       }
+                               }
+                       }
+
                        // Delete the contacts of this user
                        $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
                        if (DBA::isResult($self)) {