Merge pull request #10969 from MrPetovan/task/remove-private-contacts

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 25e64d659a2f0504fa8639f2d18209232e716689..81e5be8d649875be0c76d4810003ba5cc909e72f 100644 (file)
--- a/update.php
+++ b/update.php
@@ -41,6 +41,7 @@
  */
 
 use Friendica\Core\Logger;
+use Friendica\Core\Storage\Capability\ICanReadFromStorage;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\Database;
@@ -54,8 +55,7 @@ use Friendica\Model\Notification;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
-use Friendica\Model\Storage;
-use Friendica\Security\PermissionSet\Depository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Worker\Delivery;
 
 // Post-update script of PR 5751
@@ -183,7 +183,7 @@ function update_1330()
 
        // set the name of the storage instead of the classpath as config
        if (!empty($currStorage)) {
-               /** @var Storage\IStorage $currStorage */
+               /** @var ICanReadFromStorage $currStorage */
                if (!DI::config()->set('storage', 'name', $currStorage::getName())) {
                        return Update::FAILED;
                }
@@ -989,7 +989,7 @@ function update_1434()
 
        // in case of an empty config, set "Database" as default storage backend
        if (empty($name)) {
-               DI::config()->set('storage', 'name', Storage\Database::getName());
+               DI::config()->set('storage', 'name', \Friendica\Core\Storage\Type\Database::getName());
        }
 
        // In case of a Using deprecated storage class value, set the right name for it
@@ -1000,14 +1000,6 @@ function update_1434()
        return Update::SUCCESS;
 }
 
-function update_1435()
-{
-       $contacts = DBA::select('contact', [], ["`uid` != ?", 0]);
-       while ($contact = DBA::fetch($contacts)) {
-               Contact\User::insertForContactArray($contact);
-       }
-}
-
 function update_1438()
 {
        DBA::update('photo', ['photo-type' => Photo::USER_AVATAR], ['profile' => true]);
@@ -1039,7 +1031,7 @@ function update_1440()
        return Update::SUCCESS;
 }
 
-function update__1441()
+function update_1441()
 {
        $languages = DI::l10n()->getAvailableLanguages();
 
@@ -1053,3 +1045,28 @@ function update__1441()
 
        return Update::SUCCESS;
 }
+
+function update_1442()
+{
+       // transform blocked intros into ignored intros
+       DBA::update('intro', ['ignore' => 1, 'blocked' => 0], ['blocked' => 1]);
+
+       return Update::SUCCESS;
+}
+
+/**
+ * A bug in Contact\User::updateByContactUpdate prevented any update to the user-contact table since the rows have been
+ * created in version 1435. This version fixes this bug but the user-contact rows are outdated, we need to regenerate
+ * them.
+ */
+function update_1444()
+{
+       DBA::e('TRUNCATE TABLE `user-contact`');
+
+       $contacts = DBA::select('contact', [], ["`uid` != ?", 0]);
+       while ($contact = DBA::fetch($contacts)) {
+               Contact\User::insertForContactArray($contact);
+       }
+
+       return Update::SUCCESS;
+}