X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FOnePoll.php;h=83a7a5f15c228c0bd6fc016cc5fd553c77192094;hb=38cf0666bd7a6537a5a6af19b5bd6073ef12e82f;hp=839ab6ce13a85bb21515ab96a41b36599ef7ed5b;hpb=1fae0123ec0f20d085b87b468a8a0bee32754ecf;p=friendica.git

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 839ab6ce13..83a7a5f15c 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -27,10 +27,11 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClient\Client\HttpClient;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
@@ -41,11 +42,11 @@ use Friendica\Util\Strings;
 
 class OnePoll
 {
-	public static function execute($contact_id = 0, $command = '')
+	public static function execute(int $contact_id = 0, string $command = '')
 	{
 		Logger::notice('Start polling/probing contact', ['id' => $contact_id]);
 
-		$force = ($command == "force");
+		$force = ($command == 'force');
 
 		if (empty($contact_id)) {
 			Logger::notice('no contact provided');
@@ -118,6 +119,7 @@ class OnePoll
 	 *
 	 * @param array $contact The personal contact entry
 	 * @param array $fields  The fields that are updated
+	 * @return void
 	 * @throws \Exception
 	 */
 	private static function updateContact(array $contact, array $fields)
@@ -155,7 +157,7 @@ class OnePoll
 		}
 
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-onepoll-');
-		$curlResult = DI::httpClient()->get($contact['poll'], [HttpClientOptions::COOKIEJAR => $cookiejar, HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_FEED_XML]);
+		$curlResult = DI::httpClient()->get($contact['poll'], HttpClientAccept::FEED_XML, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 		unlink($cookiejar);
 
 		if ($curlResult->isTimeout()) {
@@ -246,6 +248,9 @@ class OnePoll
 					$datarray['verb'] = Activity::POST;
 					$datarray['object-type'] = Activity\ObjectType::NOTE;
 					$datarray['network'] = Protocol::MAIL;
+					$datarray['protocol'] = Conversation::PARCEL_IMAP;
+					$datarray['direction'] = Conversation::PULL;
+				
 					// $meta = Email::messageMeta($mbox, $msg_uid);
 
 					$datarray['thr-parent'] = $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
@@ -389,7 +394,7 @@ class OnePoll
 
 					$datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
 					if (empty($datarray['body'])) {
-						Logger::notice("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
+						Logger::warning('Cannot fetch mail', ['msg-id' => $msg_uid, 'uid' => $mailconf['user']]);
 						continue;
 					}