Merge pull request #11895 from annando/smarty-sub-dir

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

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 777d541969cc50a756bae67ab53919d2bd4019ee..9216d800da42f643860b872c17b24df27aa099c8 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -111,6 +111,9 @@ class PostUpdate
                if (!self::update1452()) {
                        return false;
                }
+               if (!self::update1483()) {
+                       return false;
+               }
                return true;
        }
 
@@ -133,7 +136,7 @@ class PostUpdate
                }
 
                $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'];
+               $max_iid = $max_item_delivery_data['iid'] ?? 0;
 
                Logger::info('Start update1297 with max iid: ' . $max_iid);
 
@@ -538,7 +541,7 @@ class PostUpdate
        private static function update1347()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1347) {
+               if (DI::config()->get('system', 'post_update_version') >= 1347) {
                        return true;
                }
 
@@ -547,7 +550,7 @@ class PostUpdate
                        return true;
                }
 
-               $id = DI::config()->get("system", "post_update_version_1347_id", 0);
+               $id = DI::config()->get('system', 'post_update_version_1347_id', 0);
 
                Logger::info('Start', ['item' => $id]);
 
@@ -582,12 +585,12 @@ class PostUpdate
                }
                DBA::close($items);
 
-               DI::config()->set("system", "post_update_version_1347_id", $id);
+               DI::config()->set('system', 'post_update_version_1347_id', $id);
 
                Logger::info('Processed', ['rows' => $rows, 'last' => $id]);
 
                if ($start_id == $id) {
-                       DI::config()->set("system", "post_update_version", 1347);
+                       DI::config()->set('system', 'post_update_version', 1347);
                        Logger::info('Done');
                        return true;
                }
@@ -605,11 +608,11 @@ class PostUpdate
        private static function update1348()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1348) {
+               if (DI::config()->get('system', 'post_update_version') >= 1348) {
                        return true;
                }
 
-               $id = DI::config()->get("system", "post_update_version_1348_id", 0);
+               $id = DI::config()->get('system', 'post_update_version_1348_id', 0);
 
                Logger::info('Start', ['contact' => $id]);
 
@@ -635,12 +638,12 @@ class PostUpdate
                }
                DBA::close($contacts);
 
-               DI::config()->set("system", "post_update_version_1348_id", $id);
+               DI::config()->set('system', 'post_update_version_1348_id', $id);
 
                Logger::info('Processed', ['rows' => $rows, 'last' => $id]);
 
                if ($start_id == $id) {
-                       DI::config()->set("system", "post_update_version", 1348);
+                       DI::config()->set('system', 'post_update_version', 1348);
                        Logger::info('Done');
                        return true;
                }
@@ -658,11 +661,11 @@ class PostUpdate
        private static function update1349()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1349) {
+               if (DI::config()->get('system', 'post_update_version') >= 1349) {
                        return true;
                }
 
-               $id = DI::config()->get("system", "post_update_version_1349_id", '');
+               $id = DI::config()->get('system', 'post_update_version_1349_id', '');
 
                Logger::info('Start', ['apcontact' => $id]);
 
@@ -688,12 +691,12 @@ class PostUpdate
                }
                DBA::close($apcontacts);
 
-               DI::config()->set("system", "post_update_version_1349_id", $id);
+               DI::config()->set('system', 'post_update_version_1349_id', $id);
 
                Logger::info('Processed', ['rows' => $rows, 'last' => $id]);
 
                if ($start_id == $id) {
-                       DI::config()->set("system", "post_update_version", 1349);
+                       DI::config()->set('system', 'post_update_version', 1349);
                        Logger::info('Done');
                        return true;
                }
@@ -711,7 +714,7 @@ class PostUpdate
        private static function update1383()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1383) {
+               if (DI::config()->get('system', 'post_update_version') >= 1383) {
                        return true;
                }
 
@@ -737,7 +740,7 @@ class PostUpdate
                }
                DBA::close($photos);
 
-               DI::config()->set("system", "post_update_version", 1383);
+               DI::config()->set('system', 'post_update_version', 1383);
                Logger::info('Done', ['deleted' => $deleted]);
                return true;
        }
@@ -752,7 +755,7 @@ class PostUpdate
        private static function update1384()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1384) {
+               if (DI::config()->get('system', 'post_update_version') >= 1384) {
                        return true;
                }
 
@@ -782,7 +785,7 @@ class PostUpdate
                Logger::info('Processed', ['rows' => $rows]);
 
                if ($rows <= 100) {
-                       DI::config()->set("system", "post_update_version", 1384);
+                       DI::config()->set('system', 'post_update_version', 1384);
                        Logger::info('Done');
                        return true;
                }
@@ -800,12 +803,12 @@ class PostUpdate
        private static function update1400()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1400) {
+               if (DI::config()->get('system', 'post_update_version') >= 1400) {
                        return true;
                }
 
                if (!DBStructure::existsTable('item')) {
-                       DI::config()->set("system", "post_update_version", 1400);
+                       DI::config()->set('system', 'post_update_version', 1400);
                        return true;
                }
 
@@ -829,7 +832,7 @@ class PostUpdate
                Logger::info('Processed', ['rows' => $rows]);
 
                if ($rows <= 100) {
-                       DI::config()->set("system", "post_update_version", 1400);
+                       DI::config()->set('system', 'post_update_version', 1400);
                        Logger::info('Done');
                        return true;
                }
@@ -847,7 +850,7 @@ class PostUpdate
        private static function update1424()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1424) {
+               if (DI::config()->get('system', 'post_update_version') >= 1424) {
                        return true;
                }
 
@@ -871,7 +874,7 @@ class PostUpdate
                Logger::info('Processed', ['rows' => $rows]);
 
                if ($rows <= 100) {
-                       DI::config()->set("system", "post_update_version", 1424);
+                       DI::config()->set('system', 'post_update_version', 1424);
                        Logger::info('Done');
                        return true;
                }
@@ -889,7 +892,7 @@ class PostUpdate
        private static function update1425()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1425) {
+               if (DI::config()->get('system', 'post_update_version') >= 1425) {
                        return true;
                }
 
@@ -918,7 +921,7 @@ class PostUpdate
                Logger::info('Processed', ['rows' => $rows]);
 
                if ($rows <= 100) {
-                       DI::config()->set("system", "post_update_version", 1425);
+                       DI::config()->set('system', 'post_update_version', 1425);
                        Logger::info('Done');
                        return true;
                }
@@ -936,7 +939,7 @@ class PostUpdate
        private static function update1426()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1426) {
+               if (DI::config()->get('system', 'post_update_version') >= 1426) {
                        return true;
                }
 
@@ -965,7 +968,7 @@ class PostUpdate
                Logger::info('Processed', ['rows' => $rows]);
 
                if ($rows <= 100) {
-                       DI::config()->set("system", "post_update_version", 1426);
+                       DI::config()->set('system', 'post_update_version', 1426);
                        Logger::info('Done');
                        return true;
                }
@@ -983,7 +986,7 @@ class PostUpdate
        private static function update1427()
        {
                // Was the script completed?
-               if (DI::config()->get("system", "post_update_version") >= 1427) {
+               if (DI::config()->get('system', 'post_update_version') >= 1427) {
                        return true;
                }
 
@@ -1012,7 +1015,7 @@ class PostUpdate
                Logger::info('Processed', ['rows' => $rows]);
 
                if ($rows <= 100) {
-                       DI::config()->set("system", "post_update_version", 1427);
+                       DI::config()->set('system', 'post_update_version', 1427);
                        Logger::info('Done');
                        return true;
                }
@@ -1038,8 +1041,8 @@ class PostUpdate
 
                Logger::info('Start', ['uri-id' => $id]);
 
-               $start_id = $id;
-               $rows = 0;
+               $rows     = 0;
+               $received = '';
 
                $conversations = DBA::p("SELECT `post-view`.`uri-id`, `conversation`.`source`, `conversation`.`received` FROM `conversation`
                        INNER JOIN `post-view` ON `post-view`.`uri` = `conversation`.`item-uri`
@@ -1077,7 +1080,7 @@ class PostUpdate
 
                Logger::info('Processed', ['rows' => $rows, 'last' => $id, 'last-received' => $received]);
 
-               if ($start_id == $id) {
+               if ($rows <= 100) {
                        DI::config()->set('system', 'post_update_version', 1452);
                        Logger::info('Done');
                        return true;
@@ -1085,4 +1088,36 @@ class PostUpdate
 
                return false;
        }
+
+       /**
+        * Correct the parent.
+        * This fixes a bug that was introduced in the development of version 2022.09
+        *
+        * @return bool "true" when the job is done
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       private static function update1483()
+       {
+               // Was the script completed?
+               if (DI::config()->get('system', 'post_update_version') >= 1483) {
+                       return true;
+               }
+
+               Logger::info('Start');
+
+               $posts = DBA::select('post-view', ['uri-id'], ['conversation' => './']);
+               while ($post = DBA::fetch($posts)) {
+                       $parent = Item::getParent($post['uri-id']);
+                       if ($parent != 0) {
+                               DBA::update('post', ['parent-uri-id' => $parent], ['uri-id' => $post['uri-id']]);
+                               DBA::update('post-user', ['parent-uri-id' => $parent], ['uri-id' => $post['uri-id']]);
+                       }
+               }
+               DBA::close($posts);
+
+               DI::config()->set('system', 'post_update_version', 1483);
+               Logger::info('Done');
+               return true;
+       }
 }