Partly revert coding for compatibility issues

[friendica.git] / update.php

diff --git a/update.php b/update.php
index acbb458f7fb62f436077ecc1417a865678f3c898..2d25ac83d2267e22fbe669d561e392bc30b9565a 100644 (file)
--- a/update.php
+++ b/update.php
@@ -45,9 +45,9 @@ use Friendica\Core\Logger;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Model\Storage;
@@ -202,7 +202,7 @@ function update_1260()
        while ($item = DBA::fetch($items)) {
                $contact = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
                        'photo' => $item['owner-avatar'], 'network' => $item['network']];
-               $cid = Contact::getIdForURL($item['owner-link'], 0, false, $contact);
+               $cid = Contact::getIdForURL($item['owner-link'], 0, null, $contact);
                if (empty($cid)) {
                        continue;
                }
@@ -218,7 +218,7 @@ function update_1260()
        while ($item = DBA::fetch($items)) {
                $contact = ['url' => $item['author-link'], 'name' => $item['author-name'],
                        'photo' => $item['author-avatar'], 'network' => $item['network']];
-               $cid = Contact::getIdForURL($item['author-link'], 0, false, $contact);
+               $cid = Contact::getIdForURL($item['author-link'], 0, null, $contact);
                if (empty($cid)) {
                        continue;
                }
@@ -314,7 +314,6 @@ function update_1298()
                                                'was' => $data[$translateKey]]);
                                        Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);
                                        Contact::updateSelfFromUserID($data['id']);
-                                       GContact::updateForUser($data['id']);
                                        $success++;
                                }
                        }
@@ -377,8 +376,8 @@ function update_1327()
 {
        $contacts = DBA::select('contact', ['uid', 'id', 'blocked', 'readonly'], ["`uid` != ? AND (`blocked` OR `readonly`) AND NOT `pending`", 0]);
        while ($contact = DBA::fetch($contacts)) {
-               Contact::setBlockedForUser($contact['id'], $contact['uid'], $contact['blocked']);
-               Contact::setIgnoredForUser($contact['id'], $contact['uid'], $contact['readonly']);
+               Contact\User::setBlocked($contact['id'], $contact['uid'], $contact['blocked']);
+               Contact\User::setIgnored($contact['id'], $contact['uid'], $contact['readonly']);
        }
        DBA::close($contacts);
 
@@ -508,3 +507,58 @@ function update_1351()
 
        return Update::SUCCESS;
 }
+
+function pre_update_1354()
+{
+       if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist'])
+               && !DBStructure::existsColumn('contact', ['ffi_keyword_denylist'])
+               && !DBA::e("ALTER TABLE `contact` CHANGE `ffi_keyword_blacklist` `ffi_keyword_denylist` text null")) {
+               return Update::FAILED;
+       }
+       return Update::SUCCESS;
+}
+
+function update_1354()
+{
+       if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist'])
+               && DBStructure::existsColumn('contact', ['ffi_keyword_denylist'])) {
+               if (!DBA::e("UPDATE `contact` SET `ffi_keyword_denylist` = `ffi_keyword_blacklist`")) {
+                       return Update::FAILED;
+               }
+
+               // When the data had been copied then the main task is done.
+               // Having the old field removed is only beauty but not crucial.
+               // So we don't care if this was successful or not.
+               DBA::e("ALTER TABLE `contact` DROP `ffi_keyword_blacklist`");
+       }
+       return Update::SUCCESS;
+}
+
+function update_1357()
+{
+       if (!DBA::e("UPDATE `contact` SET `failed` = true WHERE `success_update` < `failure_update` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       if (!DBA::e("UPDATE `contact` SET `failed` = false WHERE `success_update` > `failure_update` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       if (!DBA::e("UPDATE `contact` SET `failed` = false WHERE `updated` > `failure_update` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       if (!DBA::e("UPDATE `contact` SET `failed` = false WHERE `last-item` > `failure_update` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       if (!DBA::e("UPDATE `gserver` SET `failed` = true WHERE `last_contact` < `last_failure` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       if (!DBA::e("UPDATE `gserver` SET `failed` = false WHERE `last_contact` > `last_failure` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       return Update::SUCCESS;
+}