Add log folder to project gitignore

[friendica.git/.git] / update.php

diff --git a/update.php b/update.php
index dfda259..077a56e 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,9 +1,9 @@
 <?php
 
 use Friendica\Core\Addon;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
@@ -13,6 +13,7 @@ use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Worker\Delivery;
 
 /**
  *
@@ -161,9 +162,9 @@ function update_1191()
 function update_1203()
 {
        $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-               DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY),
-               DBA::escape(Contact::PAGE_COMMUNITY),
-               DBA::escape(Contact::PAGE_PRVGROUP)
+               DBA::escape(User::ACCOUNT_TYPE_COMMUNITY),
+               DBA::escape(User::PAGE_FLAGS_COMMUNITY),
+               DBA::escape(User::PAGE_FLAGS_PRVGROUP)
        );
 }
 
@@ -332,11 +333,9 @@ function update_1298()
                                        $fail++;
                                } else {
                                        DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
-                                       BaseObject::getApp()
-                                               ->getLogger()
-                                               ->notice('Updated contact', ['action' => 'update', 'contact' => $data['id'], "$translateKey" => $key,
+                                       Logger::notice('Updated contact', ['action' => 'update', 'contact' => $data['id'], "$translateKey" => $key,
                                                'was' => $data[$translateKey]]);
-                                       Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);                
+                                       Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);
                                        Contact::updateSelfFromUserID($data['id']);
                                        GContact::updateForUser($data['id']);
                                        $success++;
@@ -344,9 +343,29 @@ function update_1298()
                        }
                }
 
-               BaseObject::getApp()
-                       ->getLogger()
-                       ->notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
+               Logger::notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
+       }
+       return Update::SUCCESS;
+}
+
+function update_1309()
+{
+       $queue = DBA::select('queue', ['id', 'cid', 'guid']);
+       while ($entry = DBA::fetch($queue)) {
+               $contact = DBA::selectFirst('contact', ['uid'], ['id' => $entry['cid']]);
+               if (!DBA::isResult($contact)) {
+                       continue;
+               }
+
+               $item = Item::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]);
+               if (!DBA::isResult($item)) {
+                       continue;
+               }
+
+               $deliver_options = ['priority' => PRIORITY_MEDIUM, 'dont_fork' => true];
+               Worker::add($deliver_options, 'Delivery', Delivery::POST, $item['id'], $entry['cid']);
+               Logger::info('Added delivery worker', ['command' => $cmd, 'item' => $item['id'], 'contact' => $entry['cid']]);
+               DBA::delete('queue', ['id' => $entry['id']]);
        }
        return Update::SUCCESS;
 }