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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index eea5b19560..83a7a5f15c 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,12 +23,16 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+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\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -38,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');
@@ -81,7 +85,7 @@ class OnePoll
 				Logger::warning('No self contact for user', ['uid' => $importer_uid]);
 
 				// set the last-update so we don't keep polling
-				DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
+				Contact::update(['last-update' => $updated], ['id' => $contact['id']]);
 				return;
 			}
 
@@ -100,7 +104,7 @@ class OnePoll
 
 		if ($success) {
 			self::updateContact($contact, ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
-			Contact::unmarkForArchival($contact);	
+			Contact::unmarkForArchival($contact);
 		} else {
 			self::updateContact($contact, ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
 			Contact::markForArchival($contact);
@@ -115,22 +119,23 @@ 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)
 	{
 		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL, Protocol::OSTATUS])) {
 			// Update the user's contact
-			DBA::update('contact', $fields, ['id' => $contact['id']]);
+			Contact::update($fields, ['id' => $contact['id']]);
 
 			// Update the public contact
-			DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
+			Contact::update($fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
 
 			// Update the rest of the contacts that aren't polled
-			DBA::update('contact', $fields, ['rel' => Contact::FOLLOWER, 'nurl' => $contact['nurl']]);
+			Contact::update($fields, ['rel' => Contact::FOLLOWER, 'nurl' => $contact['nurl']]);
 		} else {
 			// Update all contacts
-			DBA::update('contact', $fields, ['nurl' => $contact['nurl']]);
+			Contact::update($fields, ['nurl' => $contact['nurl']]);
 		}
 	}
 
@@ -151,8 +156,8 @@ class OnePoll
 			return false;
 		}
 
-		$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-		$curlResult = DI::httpRequest()->get($contact['poll'], ['cookiejar' => $cookiejar]);
+		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-onepoll-');
+		$curlResult = DI::httpClient()->get($contact['poll'], HttpClientAccept::FEED_XML, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 		unlink($cookiejar);
 
 		if ($curlResult->isTimeout()) {
@@ -171,7 +176,7 @@ class OnePoll
 			return false;
 		}
 
-		Logger::notice('Consume feed of contact', ['id' => $contact['id'], 'url' => $contact['poll']]);
+		Logger::notice('Consume feed of contact', ['id' => $contact['id'], 'url' => $contact['poll'], 'Content-Type' => $curlResult->getHeader('Content-Type')]);
 
 		return !empty(Feed::import($xml, $importer, $contact));
 	}
@@ -230,7 +235,7 @@ class OnePoll
 			$metas = Email::messageMeta($mbox, implode(',', $msgs));
 
 			if (count($metas) != count($msgs)) {
-				Logger::log("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", Logger::DEBUG);
+				Logger::info("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas");
 			} else {
 				$msgs = array_combine($msgs, $metas);
 
@@ -243,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, '<>'));
@@ -252,7 +260,7 @@ class OnePoll
 					$condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
 					$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);
+						Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri']);
 
 						// Only delete when mails aren't automatically moved or deleted
 						if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
@@ -263,18 +271,18 @@ class OnePoll
 
 						switch ($mailconf['action']) {
 							case 0:
-								Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
+								Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.");
 								break;
 							case 1:
-								Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+								Logger::notice("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
 								imap_delete($mbox, $msg_uid, FT_UID);
 								break;
 							case 2:
-								Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
+								Logger::notice("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
 								imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 								break;
 							case 3:
-								Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
+								Logger::notice("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
 								imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 								if ($mailconf['movetofolder'] != "") {
 									imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
@@ -315,7 +323,7 @@ class OnePoll
 							$datarray['title'] .= $subpart->text;
 						}
 					}
-					$datarray['title'] = Strings::escapeTags(trim($datarray['title']));
+					$datarray['title'] = trim($datarray['title']);
 
 					//$datarray['title'] = Strings::escapeTags(trim($meta->subject));
 					$datarray['created'] = DateTimeFormat::utc($meta->date);
@@ -386,28 +394,28 @@ class OnePoll
 
 					$datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
 					if (empty($datarray['body'])) {
-						Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
+						Logger::warning('Cannot fetch mail', ['msg-id' => $msg_uid, 'uid' => $mailconf['user']]);
 						continue;
 					}
 
-					Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
+					Logger::notice("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
 
 					Item::insert($datarray);
 
 					switch ($mailconf['action']) {
 						case 0:
-							Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
+							Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.");
 							break;
 						case 1:
-							Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+							Logger::notice("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
 							imap_delete($mbox, $msg_uid, FT_UID);
 							break;
 						case 2:
-							Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
+							Logger::notice("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
 							imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 							break;
 						case 3:
-							Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
+							Logger::notice("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
 							imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
 							if ($mailconf['movetofolder'] != "") {
 								imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
@@ -455,10 +463,10 @@ class OnePoll
 		Logger::info('Hub subscription start', ['mode' => $hubmode, 'name' => $contact['name'], 'hub' => $url, 'endpoint' => $push_url, 'verifier' => $verify_token]);
 
 		if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) {
-			DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
+			Contact::update(['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()]);