Merge pull request #10784 from tobiasd/20211001-adminpanel_messages

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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 73971a8b1b59f8b81bdf7f47accc265106cf59f5..e1f0f61080d34db537e5599ade444b37287c470f 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,9 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -56,7 +58,7 @@ class OnePoll
 
                // We never probe mail contacts since their probing demands a mail from the contact in the inbox.
                // We don't probe feed accounts by default since they are polled in a higher frequency, but forced probes are okay.
-               if (!in_array($contact['network'], [Protocol::MAIL, Protocol::FEED]) || ($force && ($contact['network'] == Protocol::FEED))) {
+               if ($force && ($contact['network'] == Protocol::FEED)) {
                        $success = Contact::updateFromProbe($contact_id);
                } else {
                        $success = true;
@@ -151,7 +153,7 @@ class OnePoll
                }
 
                $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-               $curlResult = DI::httpRequest()->get($contact['poll'], ['cookiejar' => $cookiejar]);
+               $curlResult = DI::httpClient()->get($contact['poll'], [HTTPClientOptions::COOKIEJAR => $cookiejar]);
                unlink($cookiejar);
 
                if ($curlResult->isTimeout()) {
@@ -244,12 +246,12 @@ class OnePoll
                                        $datarray['network'] = Protocol::MAIL;
                                        // $meta = Email::messageMeta($mbox, $msg_uid);
 
-                                       $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
+                                       $datarray['thr-parent'] = $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
 
                                        // Have we seen it before?
                                        $fields = ['deleted', 'id'];
                                        $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
-                                       $item = Item::selectFirst($fields, $condition);
+                                       $item = Post::selectFirst($fields, $condition);
                                        if (DBA::isResult($item)) {
                                                Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],Logger::DEBUG);
 
@@ -298,7 +300,7 @@ class OnePoll
                                                        }
                                                }
                                                $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
-                                               $parent = Item::selectFirst(['uri'], $condition);
+                                               $parent = Post::selectFirst(['uri'], $condition);
                                                if (DBA::isResult($parent)) {
                                                        $datarray['thr-parent'] = $parent['uri'];
                                                }
@@ -331,7 +333,7 @@ class OnePoll
                                        if (empty($datarray['thr-parent']) && $reply) {
                                                $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
                                                $params = ['order' => ['created' => true]];
-                                               $parent = Item::selectFirst(['uri'], $condition, $params);
+                                               $parent = Post::selectFirst(['uri'], $condition, $params);
                                                if (DBA::isResult($parent)) {
                                                        $datarray['thr-parent'] = $parent['uri'];
                                                }
@@ -457,7 +459,7 @@ class OnePoll
                        DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
                }
 
-               $postResult = DI::httpRequest()->post($url, $params);
+               $postResult = DI::httpClient()->post($url, $params);
 
                Logger::info('Hub subscription done', ['result' => $postResult->getReturnCode()]);