Replace dba::select(limit => 1) by dba::selectOne

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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 1190c77f5fc3e5a4db7fdeaed134accba2fc7896..f53c392c5a461d5352f70d10270a7a46eebceec6 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -7,12 +7,12 @@ namespace Friendica\Worker;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
 use dba;
 
-require_once 'include/follow.php';
+require_once 'include/dba.php';
 
 Class OnePoll
 {
@@ -42,7 +42,7 @@ Class OnePoll
 
                $d = datetime_convert();
 
-               $contact = dba::select('contact', [], ['id' => $contact_id], ['limit' => 1]);
+               $contact = dba::selectOne('contact', [], ['id' => $contact_id]);
                if (!DBM::is_result($contact)) {
                        logger('Contact not found or cannot be used.');
                        return;
@@ -65,7 +65,7 @@ Class OnePoll
 
                // Diaspora users, archived users and followers are only checked if they still exist.
                if ($contact['archive'] || ($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
-                       $last_updated = PortableContact::lastUpdated($contact["url"]);
+                       $last_updated = PortableContact::lastUpdated($contact["url"], true);
                        $updated = datetime_convert();
                        if ($last_updated) {
                                logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG);
@@ -117,7 +117,7 @@ Class OnePoll
                                return;
                        }
 
-                       if (!update_contact($contact["id"])) {
+                       if (!Contact::updateFromProbe($contact["id"])) {
                                Contact::markForArchival($contact);
                                logger('Contact is marked dead');
 
@@ -339,14 +339,14 @@ Class OnePoll
                        logger("Mail: Enabled", LOGGER_DEBUG);
 
                        $mbox = null;
-                       $x = dba::select('user', array('prvkey'), array('uid' => $importer_uid), array('limit' => 1));
+                       $user = dba::selectOne('user', ['prvkey'], ['uid' => $importer_uid]);
 
-                       $condition = array("`server` != '' AND `uid` = ?", $importer_uid);
-                       $mailconf = dba::select('mailacct', array(), $condition, array('limit' => 1));
-                       if (DBM::is_result($x) && DBM::is_result($mailconf)) {
+                       $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
+                       $mailconf = dba::selectOne('mailacct', [], $condition);
+                       if (DBM::is_result($user) && DBM::is_result($mailconf)) {
                                $mailbox = Email::constructMailboxName($mailconf);
                                $password = '';
-                               openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $x['prvkey']);
+                               openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
                                $mbox = Email::connect($mailbox, $mailconf['user'], $password);
                                unset($password);
                                logger("Mail: Connect to " . $mailconf['user']);
@@ -382,9 +382,9 @@ Class OnePoll
                                                        $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
 
                                                        // Have we seen it before?
-                                                       $fields = array('deleted', 'id');
-                                                       $condition = array('uid' => $importer_uid, 'uri' => $datarray['uri']);
-                                                       $r = dba::select('item', $fields, $condition, array('limit' => 1));
+                                                       $fields = ['deleted', 'id'];
+                                                       $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
+                                                       $r = dba::selectOne('item', $fields, $condition);
 
                                                        if (DBM::is_result($r)) {
                                                                logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
@@ -630,6 +630,7 @@ Class OnePoll
                        dba::update('gcontact', array('last_failure' => $updated), array('nurl' => $contact['nurl']));
                        Contact::markForArchival($contact);
                } else {
+                       $updated = datetime_convert();
                        dba::update('contact', array('last-update' => $updated), array('id' => $contact['id']));
                }