Merge pull request #8926 from annando/avatar-cache

[friendica.git] / update.php

diff --git a/update.php b/update.php
index acbb458f7fb62f436077ecc1417a865678f3c898..a4d71bc4fde2b30f11e3e0a0fe71f7a53439fa44 100644 (file)
--- a/update.php
+++ b/update.php
@@ -45,6 +45,7 @@ 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;
@@ -202,7 +203,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 +219,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;
                }
@@ -508,3 +509,69 @@ 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;
+       }
+
+       if (!DBA::e("UPDATE `gcontact` SET `failed` = true WHERE `last_contact` < `last_failure` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       if (!DBA::e("UPDATE `gcontact` SET `failed` = false WHERE `last_contact` > `last_failure` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+
+       if (!DBA::e("UPDATE `gcontact` SET `failed` = false WHERE `updated` > `last_failure` AND `failed` IS NULL")) {
+               return Update::FAILED;
+       }
+       return Update::SUCCESS;
+}