New function to fetch the database driver

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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 867b11fd3018550b8e1bcd0c8f83663810fb237f..93dff93ae5a8d1fe4aa1109349e48226809cdde8 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -104,14 +104,14 @@ class OnePoll
                }
 
                // Don't poll local contacts
-               if (Contact::isLocalById($contact['id'])) {
+               if (User::getIdForURL($contact['url'])) {
                        Logger::info('Local contacts are not polled', ['id' => $contact['id']]);
 
                        // set the last-update so we don't keep polling
                        DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
                        return;
                }               
-               
+
                // We don't poll AP contacts by now
                if ($protocol === Protocol::ACTIVITYPUB) {
                        Logger::log("Don't poll AP contact");
@@ -444,7 +444,7 @@ class OnePoll
                }
 
                $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-               $curlResult = DI::httpRequest()->get($contact['poll'], false, ['cookiejar' => $cookiejar]);
+               $curlResult = DI::httpRequest()->get($contact['poll'], ['cookiejar' => $cookiejar]);
                unlink($cookiejar);
 
                if ($curlResult->isTimeout()) {
@@ -708,6 +708,9 @@ class OnePoll
                        Logger::log("Mail: no mails for ".$mailconf['user']);
                }
 
+               self::updateContact($contact, ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+               Contact::unmarkForArchival($contact);
+
                Logger::log("Mail: closing connection for ".$mailconf['user']);
                imap_close($mbox);
        }