Remove references to item.parent-uri in Worker\OnePoll

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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index ed6bfacb35d7a0414d9129ea26c2198c69bce336..c5dfb70ab78eafd54c704f5d98cb4f2a6abdf1ed 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -32,7 +32,6 @@ use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
-use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -61,13 +60,13 @@ class OnePoll
                        return;
                }
 
-               if (($contact['network'] != Protocol::MAIL) || $force) {
-                       Contact::updateFromProbe($contact_id, '', $force);
+               if (($contact['network'] != Protocol::MAIL) && $force) {
+                       Contact::updateFromProbe($contact_id);
                }
 
                // Special treatment for wrongly detected local contacts
                if (!$force && ($contact['network'] != Protocol::DFRN) && Contact::isLocalById($contact_id)) {
-                       Contact::updateFromProbe($contact_id, Protocol::DFRN, true);
+                       Contact::updateFromProbe($contact_id, Protocol::DFRN);
                        $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
                }
 
@@ -95,13 +94,6 @@ class OnePoll
                        $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
                }
 
-               // load current friends if possible.
-               if (!empty($contact['poco']) && !$contact['failed']) {
-                       if (!DBA::exists('glink', ["`cid` = ? AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", $contact['id']])) {
-                               PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
-                       }
-               }
-
                // Don't poll if polling is deactivated (But we poll feeds and mails anyway)
                if (!in_array($protocol, [Protocol::FEED, Protocol::MAIL]) && DI::config()->get('system', 'disable_polling')) {
                        Logger::log('Polling is disabled');
@@ -111,6 +103,15 @@ class OnePoll
                        return;
                }
 
+               // Don't poll local contacts
+               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");
@@ -290,7 +291,7 @@ class OnePoll
                        . '&type=data&last_update=' . $last_update
                        . '&perm=' . $perm;
 
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
 
                if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
                        // set the last-update so we don't keep polling
@@ -443,7 +444,7 @@ class OnePoll
                }
 
                $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-               $curlResult = DI::httpRequest()->curl($contact['poll'], false, ['cookiejar' => $cookiejar]);
+               $curlResult = DI::httpRequest()->get($contact['poll'], ['cookiejar' => $cookiejar]);
                unlink($cookiejar);
 
                if ($curlResult->isTimeout()) {
@@ -582,9 +583,9 @@ class OnePoll
                                                        }
                                                }
                                                $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
-                                               $parent = Item::selectFirst(['parent-uri'], $condition);
+                                               $parent = Item::selectFirst(['uri'], $condition);
                                                if (DBA::isResult($parent)) {
-                                                       $datarray['parent-uri'] = $parent['parent-uri'];  // Set the parent as the top-level item
+                                                       $datarray['thr-parent'] = $parent['uri'];
                                                }
                                        }
 
@@ -612,19 +613,15 @@ class OnePoll
                                        $datarray['title'] = self::RemoveReply($datarray['title']);
 
                                        // If it seems to be a reply but a header couldn't be found take the last message with matching subject
-                                       if (empty($datarray['parent-uri']) && $reply) {
+                                       if (empty($datarray['thr-parent']) && $reply) {
                                                $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
                                                $params = ['order' => ['created' => true]];
-                                               $parent = Item::selectFirst(['parent-uri'], $condition, $params);
+                                               $parent = Item::selectFirst(['uri'], $condition, $params);
                                                if (DBA::isResult($parent)) {
-                                                       $datarray['parent-uri'] = $parent['parent-uri'];
+                                                       $datarray['thr-parent'] = $parent['uri'];
                                                }
                                        }
 
-                                       if (empty($datarray['parent-uri'])) {
-                                               $datarray['parent-uri'] = $datarray['uri'];
-                                       }
-
                                        $headers = imap_headerinfo($mbox, $meta->msgno);
 
                                        $object = [];
@@ -662,7 +659,7 @@ class OnePoll
                                        $datarray['owner-link'] = "mailto:".$contact['addr'];
                                        $datarray['owner-avatar'] = $contact['photo'];
 
-                                       if ($datarray['parent-uri'] === $datarray['uri']) {
+                                       if ($datarray['thr-parent'] === $datarray['uri']) {
                                                $datarray['private'] = Item::PRIVATE;
                                        }
 
@@ -707,6 +704,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);
        }