Merge pull request #7943 from MrPetovan/bug/7920-api-fix-followers-friends-ids

[friendica.git] / src / Database / PostUpdate.php

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index a5bdcdeadd6c84653c03341d18cdb9533efae9ec..885c9eea013d3b81a66999dc235fcc74ed52fa2c 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -11,7 +11,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\PermissionSet;
-use Friendica\Database\DBA;
 
 /**
  * Post update functions
@@ -35,6 +34,12 @@ class PostUpdate
                if (!self::update1281()) {
                        return false;
                }
+               if (!self::update1297()) {
+                       return false;
+               }
+               if (!self::update1322()) {
+                       return false;
+               }
 
                return true;
        }
@@ -378,4 +383,74 @@ class PostUpdate
 
                return false;
        }
+
+       /**
+        * Set the delivery queue count to a negative value for all items preceding the feature.
+        *
+        * @return bool "true" when the job is done
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       private static function update1297()
+       {
+               // Was the script completed?
+               if (Config::get('system', 'post_update_version') >= 1297) {
+                       return true;
+               }
+
+               $max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]);
+               $max_iid = $max_item_delivery_data['iid'];
+
+               Logger::info('Start update1297 with max iid: ' . $max_iid);
+
+               $condition = ['`queue_count` = 0 AND `iid` < ?', $max_iid];
+
+               DBA::update('item-delivery-data', ['queue_count' => -1], $condition);
+
+               if (DBA::errorNo() != 0) {
+                       Logger::error('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
+                       return false;
+               }
+
+               Logger::info('Processed rows: ' . DBA::affectedRows());
+
+               Config::set('system', 'post_update_version', 1297);
+
+               Logger::info('Done');
+
+               return true;
+       }
+       /**
+        * Remove contact duplicates
+        *
+        * @return bool "true" when the job is done
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       private static function update1322()
+       {
+               // Was the script completed?
+               if (Config::get('system', 'post_update_version') >= 1322) {
+                       return true;
+               }
+
+               Logger::info('Start');
+
+               $contacts = DBA::p("SELECT `nurl`, `uid` FROM `contact`
+                       WHERE EXISTS (SELECT `nurl` FROM `contact` AS `c2`
+                               WHERE `c2`.`nurl` = `contact`.`nurl` AND `c2`.`id` != `contact`.`id` AND `c2`.`uid` = `contact`.`uid` AND `c2`.`network` IN (?, ?, ?) AND NOT `deleted`)
+                       AND (`network` IN (?, ?, ?) OR (`uid` = ?)) AND NOT `deleted` GROUP BY `nurl`, `uid`",
+                       Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB,
+                       Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB, 0);
+
+               while ($contact = DBA::fetch($contacts)) {
+                       Logger::info('Remove duplicates', ['nurl' => $contact['nurl'], 'uid' => $contact['uid']]);
+                       Contact::removeDuplicates($contact['nurl'], $contact['uid']);
+               }
+
+               DBA::close($contact);
+               Config::set('system', 'post_update_version', 1322);
+
+               Logger::info('Done');
+
+               return true;
+       }
 }