Move Cache::clear() to DI::cache()->clear()

[friendica.git] / src / Worker / CronJobs.php

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index ba489717478ada36c7452fc3ad12913e3381a0ab..e88949e657032b35ea97f8ac5c2df3848f4802bd 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -5,7 +5,6 @@
 namespace Friendica\Worker;
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
@@ -14,13 +13,14 @@ use Friendica\Core\StorageManager;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Database\PostUpdate;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\GServer;
 use Friendica\Model\Nodeinfo;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
-use Friendica\Protocol\PortableContact;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
@@ -29,7 +29,7 @@ class CronJobs
 {
        public static function execute($command = '')
        {
-               $a = BaseObject::getApp();
+               $a = DI::app();
 
                // No parameter set? So return
                if ($command == '') {
@@ -47,7 +47,7 @@ class CronJobs
                                Logger::info('cron_start');
                                Nodeinfo::update();
                                // Now trying to register
-                               $url = 'http://the-federation.info/register/' . $a->getHostName();
+                               $url = 'http://the-federation.info/register/' . DI::baseUrl()->getHostname();
                                Logger::debug('Check registering url', ['url' => $url]);
                                $ret = Network::fetchUrl($url);
                                Logger::debug('Check registering answer', ['answer' => $ret]);
@@ -154,7 +154,7 @@ class CronJobs
                }
 
                // clear old cache
-               Cache::clear();
+               DI::cache()->clear();
 
                // clear old item cache files
                clear_cache();
@@ -254,7 +254,7 @@ class CronJobs
                                return;
                        }
 
-                       if (!PortableContact::reachable($contact["url"])) {
+                       if (!GServer::reachable($contact["url"])) {
                                continue;
                        }
 
@@ -304,8 +304,11 @@ class CronJobs
                /// - set contact-id in item when not present
 
                // Add intro entries for pending contacts
+               // We don't do this for DFRN entries since such revived contact requests seem to mostly fail.
                $pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact`
-                       WHERE `pending` AND `rel` IN (?, ?) AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", 0, Contact::FOLLOWER);
+                       WHERE `pending` AND `rel` IN (?, ?) AND `network` != ?
+                               AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)",
+                       0, Contact::FOLLOWER, Protocol::DFRN);
                while ($contact = DBA::fetch($pending_contacts)) {
                        DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false,
                                'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]);