namespace Friendica\Worker;
use Friendica\App;
-use Friendica\BaseObject;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
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;
class CronJobs
{
public static function execute($command = '')
{
- $a = BaseObject::getApp();
+ $a = DI::app();
// No parameter set? So return
if ($command == '') {
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]);
return;
}
- if (!PortableContact::reachable($contact["url"])) {
+ if (!GServer::reachable($contact["url"])) {
continue;
}
/// - remove sign entries without item
/// - remove children when parent got lost
/// - 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 `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']]);
+ }
+ DBA::close($pending_contacts);
}
/**
*/
private static function moveStorage()
{
- $current = StorageManager::getBackend();
- $moved = StorageManager::move($current);
+ $current = DI::storage();
+ $moved = DI::storageManager()->move($current);
if ($moved) {
Worker::add(PRIORITY_LOW, "CronJobs", "move_storage");