]> git.mxchange.org Git - friendica.git/blobdiff - src/Worker/OnePoll.php
Only attach images
[friendica.git] / src / Worker / OnePoll.php
index 5e2dbb8fa219d902e466ecd4d303e711b6c72baf..83a7a5f15c228c0bd6fc016cc5fd553c77192094 100644 (file)
 <?php
 /**
- * @file src/Worker/OnePoll.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Worker;
 
-use Friendica\BaseObject;
-use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\APContact;
+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;
-use Friendica\Protocol\PortableContact;
+use Friendica\Protocol\Feed;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
-use Friendica\Util\XML;
 
 class OnePoll
 {
-       public static function execute($contact_id = 0, $command = '')
+       public static function execute(int $contact_id = 0, string $command = '')
        {
-               $a = BaseObject::getApp();
-
-               Logger::log('Start for contact ' . $contact_id);
+               Logger::notice('Start polling/probing contact', ['id' => $contact_id]);
 
-               $force = false;
-
-               if ($command == "force") {
-                       $force = true;
-               }
+               $force = ($command == 'force');
 
-               if (!$contact_id) {
-                       Logger::log('no contact');
+               if (empty($contact_id)) {
+                       Logger::notice('no contact provided');
                        return;
                }
 
-               if ($force) {
-                       Contact::updateFromProbe($contact_id, true);
-               }
-
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
                if (!DBA::isResult($contact)) {
-                       Logger::log('Contact not found or cannot be used.');
+                       Logger::warning('Contact not found', ['id' => $contact_id]);
                        return;
                }
 
-               if (($contact['network'] == Protocol::DFRN) && !Contact::isLegacyDFRNContact($contact)) {
-                       $protocol = Protocol::ACTIVITYPUB;
+               // 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 ($force && ($contact['network'] == Protocol::FEED)) {
+                       $success = Contact::updateFromProbe($contact_id);
                } else {
-                       $protocol = $contact['network'];
+                       $success = true;
                }
 
                $importer_uid = $contact['uid'];
 
                $updated = DateTimeFormat::utcNow();
 
-               if ($importer_uid == 0) {
-                       Logger::log('Ignore public contacts');
-
-                       // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
-                       return;
-               }
-
                // Possibly switch the remote contact to AP
-               if ($protocol === Protocol::OSTATUS) {
+               if ($success && ($contact['network'] === Protocol::OSTATUS)) {
                        ActivityPub\Receiver::switchContact($contact['id'], $importer_uid, $contact['url']);
-                       $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
-               }
-
-               // load current friends if possible.
-               if (!empty($contact['poco']) && ($contact['success_update'] > $contact['failure_update'])) {
-                       $r = q("SELECT count(*) AS total FROM glink
-                               WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
-                               intval($contact['id'])
-                       );
-                       if (DBA::isResult($r)) {
-                               if (!$r[0]['total']) {
-                                       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]) && Config::get('system', 'disable_polling')) {
-                       Logger::log('Polling is disabled');
-
-                       // 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");
-
-                       // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
-                       return;
-               }
-
-               $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
-                       intval($importer_uid)
-               );
-
-               if (!DBA::isResult($r)) {
-                       Logger::log('No self contact for user '.$importer_uid);
-
-                       // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
-                       return;
                }
 
-               $importer = $r[0];
-               $url = '';
-               $xml = false;
-
-               if ($contact['subhub']) {
-                       $poll_interval = Config::get('system', 'pushpoll_frequency', 3);
-                       $contact['priority'] = intval($poll_interval);
-                       $hub_update = false;
-
-                       if (DateTimeFormat::utcNow() > DateTimeFormat::utc($contact['last-update'] . " + 1 day")) {
-                               $hub_update = true;
-                       }
-               } else {
-                       $hub_update = false;
-               }
-
-               $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
-                       ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
-                       : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
-               );
-
-               Logger::log("poll: ({$protocol}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
-
-               if ($protocol === Protocol::DFRN) {
-                       $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
-                       if (intval($contact['duplex']) && $contact['dfrn-id']) {
-                               $idtosend = '0:' . $orig_id;
-                       }
-                       if (intval($contact['duplex']) && $contact['issued-id']) {
-                               $idtosend = '1:' . $orig_id;
-                       }
-
-                       // they have permission to write to us. We already filtered this in the contact query.
-                       $perm = 'rw';
-
-                       // But this may be our first communication, so set the writable flag if it isn't set already.
-
-                       if (!intval($contact['writable'])) {
-                               $fields = ['writable' => true];
-                               DBA::update('contact', $fields, ['id' => $contact['id']]);
-                       }
-
-                       $url = $contact['poll'] . '?dfrn_id=' . $idtosend
-                               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
-                               . '&type=data&last_update=' . $last_update
-                               . '&perm=' . $perm;
-
-                       $curlResult = Network::curl($url);
-
-                       if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => $updated]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       }
-
-                       $handshake_xml = $curlResult->getBody();
-                       $html_code = $curlResult->getReturnCode();
-
-                       Logger::log('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, Logger::DATA);
-
-                       if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) {
-                               // dead connection - might be a transient event, or this might
-                               // mean the software was uninstalled or the domain expired.
-                               // Will keep trying for one month.
-                               Logger::log("$url appears to be dead - marking for death ");
-
-                               // set the last-update so we don't keep polling
-                               $fields = ['last-update' => $updated, 'failure_update' => $updated];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                               return;
-                       }
-
-                       if (!strstr($handshake_xml, '<')) {
-                               Logger::log('response from ' . $url . ' did not contain XML.');
-
-                               $fields = ['last-update' => $updated, 'failure_update' => $updated];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                               return;
-                       }
-
-
-                       $res = XML::parseString($handshake_xml);
+               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
 
-                       if (intval($res->status) == 1) {
-                               // we may not be friends anymore. Will keep trying for one month.
-                               Logger::log("$url replied status 1 - marking for death ");
+               if ($success && ($importer_uid != 0) && in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND])
+                       && in_array($contact['network'], [Protocol::FEED, Protocol::MAIL, Protocol::OSTATUS])) {
+                       $importer = User::getOwnerDataById($importer_uid);
+                       if (empty($importer)) {
+                               Logger::warning('No self contact for user', ['uid' => $importer_uid]);
 
                                // set the last-update so we don't keep polling
-                               $fields = ['last-update' => $updated, 'failure_update' => $updated];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                       } elseif ($contact['term-date'] > DBA::NULL_DATETIME) {
-                               Contact::unmarkForArchival($contact);
-                       }
-
-                       if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
-                               // set the last-update so we don't keep polling
-                               DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
-                               Logger::log('Contact status is ' . $res->status);
+                               Contact::update(['last-update' => $updated], ['id' => $contact['id']]);
                                return;
                        }
 
-                       if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
-                               $fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])];
-                               DBA::update('contact', $fields, ['id' => $contact['id']]);
-                       }
-
-                       $postvars = [];
-
-                       $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
-                       $challenge    = hex2bin((string) $res->challenge);
-
-                       $final_dfrn_id = '';
-
-                       if ($contact['duplex'] && strlen($contact['prvkey'])) {
-                               openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
-                               openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']);
+                       Logger::info('Start polling/subscribing', ['protocol' => $contact['network'], 'id' => $contact['id']]);
+                       if ($contact['network'] === Protocol::FEED) {
+                               $success = self::pollFeed($contact, $importer);
+                       } elseif ($contact['network'] === Protocol::MAIL) {
+                               $success = self::pollMail($contact, $importer_uid, $updated);
                        } else {
-                               openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
-                               openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
+                               $success = self::subscribeToHub($contact['url'], $importer, $contact, $contact['blocked'] ? 'unsubscribe' : 'subscribe');
                        }
-
-                       $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-
-                       if (strpos($final_dfrn_id, ':') == 1) {
-                               $final_dfrn_id = substr($final_dfrn_id, 2);
-                       }
-
-                       // There are issues with the legacy DFRN transport layer.
-                       // Since we mostly don't use it anyway, we won't dig into it deeper, but simply ignore it.
-                       if (empty($final_dfrn_id) || empty($orig_id)) {
-                               Logger::log('Contact has got no ID - quitting');
-                               return;
+                       if (!$success) {
+                               Logger::notice('Probing had been successful, polling/subscribing failed', ['protocol' => $contact['network'], 'id' => $contact['id'], 'url' => $contact['url']]);
                        }
+               }
 
-                       if ($final_dfrn_id != $orig_id) {
-                               // did not decode properly - cannot trust this site
-                               Logger::log('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
+               if ($success) {
+                       self::updateContact($contact, ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+                       Contact::unmarkForArchival($contact);
+               } else {
+                       self::updateContact($contact, ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
+                       Contact::markForArchival($contact);
+               }
 
-                               // set the last-update so we don't keep polling
-                               DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
-                               Contact::markForArchival($contact);
-                               return;
-                       }
+               Logger::notice('End');
+               return;
+       }
 
-                       $postvars['dfrn_id'] = $idtosend;
-                       $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
-                       $postvars['perm'] = 'rw';
+       /**
+        * Updates a personal contact entry and the public contact entry
+        *
+        * @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
+                       Contact::update($fields, ['id' => $contact['id']]);
 
-                       $xml = Network::post($contact['poll'], $postvars)->getBody();
+                       // Update the public contact
+                       Contact::update($fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
 
-               } elseif (($protocol === Protocol::OSTATUS)
-                       || ($protocol === Protocol::DIASPORA)
-                       || ($protocol === Protocol::FEED)) {
+                       // Update the rest of the contacts that aren't polled
+                       Contact::update($fields, ['rel' => Contact::FOLLOWER, 'nurl' => $contact['nurl']]);
+               } else {
+                       // Update all contacts
+                       Contact::update($fields, ['nurl' => $contact['nurl']]);
+               }
+       }
 
-                       // Upgrading DB fields from an older Friendica version
-                       // Will only do this once per notify-enabled OStatus contact
-                       // or if relationship changes
+       /**
+        * Poll Feed contacts
+        *
+        * @param  array $contact The personal contact entry
+        * @param  array $importer
+        *
+        * @return bool   Success
+        * @throws \Exception
+        */
+       private static function pollFeed(array $contact, $importer)
+       {
+               // Are we allowed to import from this person?
+               if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) {
+                       Logger::notice('Contact is blocked or only a follower');
+                       return false;
+               }
 
-                       $stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0);
+               $cookiejar = tempnam(System::getTempPath(), 'cookiejar-onepoll-');
+               $curlResult = DI::httpClient()->get($contact['poll'], HttpClientAccept::FEED_XML, [HttpClientOptions::COOKIEJAR => $cookiejar]);
+               unlink($cookiejar);
 
-                       // Contacts from OStatus are always writable
-                       if ($protocol === Protocol::OSTATUS) {
-                               $stat_writeable = 1;
-                       }
+               if ($curlResult->isTimeout()) {
+                       Logger::notice('Polling timed out', ['id' => $contact['id'], 'url' => $contact['poll']]);
+                       return false;
+               }
 
-                       if ($stat_writeable != $contact['writable']) {
-                               $fields = ['writable' => $stat_writeable];
-                               DBA::update('contact', $fields, ['id' => $contact['id']]);
-                       }
+               $xml = $curlResult->getBody();
+               if (empty($xml)) {
+                       Logger::notice('Empty content', ['id' => $contact['id'], 'url' => $contact['poll']]);
+                       return false;
+               }
 
-                       // Are we allowed to import from this person?
-                       if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) {
-                               // set the last-update so we don't keep polling
-                               DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
-                               Logger::log('Contact is blocked or only a follower');
-                               return;
-                       }
+               if (!strstr($xml, '<')) {
+                       Logger::notice('response did not contain XML.', ['id' => $contact['id'], 'url' => $contact['poll']]);
+                       return false;
+               }
 
-                       $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-                       $curlResult = Network::curl($contact['poll'], false, ['cookiejar' => $cookiejar]);
-                       unlink($cookiejar);
+               Logger::notice('Consume feed of contact', ['id' => $contact['id'], 'url' => $contact['poll'], 'Content-Type' => $curlResult->getHeader('Content-Type')]);
 
-                       if ($curlResult->isTimeout()) {
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => $updated]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       }
+               return !empty(Feed::import($xml, $importer, $contact));
+       }
 
-                       $xml = $curlResult->getBody();
+       /**
+        * Poll Mail contacts
+        *
+        * @param  array   $contact      The personal contact entry
+        * @param  integer $importer_uid The UID of the importer
+        * @param  string  $updated      The updated date
+        * @throws \Exception
+        */
+       private static function pollMail(array $contact, $importer_uid, $updated)
+       {
+               Logger::info('Fetching mails', ['addr' => $contact['addr']]);
 
-               } elseif ($protocol === Protocol::MAIL) {
-                       Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG);
+               $mail_disabled = ((function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) ? 0 : 1);
+               if ($mail_disabled) {
+                       Logger::notice('Mail is disabled');
+                       return false;
+               }
 
-                       $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
-                       if ($mail_disabled) {
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => $updated]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       }
+               Logger::info('Mail is enabled');
 
-                       Logger::log("Mail: Enabled", Logger::DEBUG);
-
-                       $mbox = null;
-                       $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
-
-                       $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
-                       $mailconf = DBA::selectFirst('mailacct', [], $condition);
-                       if (DBA::isResult($user) && DBA::isResult($mailconf)) {
-                               $mailbox = Email::constructMailboxName($mailconf);
-                               $password = '';
-                               openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
-                               $mbox = Email::connect($mailbox, $mailconf['user'], $password);
-                               unset($password);
-                               Logger::log("Mail: Connect to " . $mailconf['user']);
-                               if ($mbox) {
-                                       $fields = ['last_check' => $updated];
-                                       DBA::update('mailacct', $fields, ['id' => $mailconf['id']]);
-                                       Logger::log("Mail: Connected to " . $mailconf['user']);
-                               } else {
-                                       Logger::log("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true));
-                               }
-                       }
+               $mbox = null;
+               $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
 
+               $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
+               $mailconf = DBA::selectFirst('mailacct', [], $condition);
+               if (DBA::isResult($user) && DBA::isResult($mailconf)) {
+                       $mailbox = Email::constructMailboxName($mailconf);
+                       $password = '';
+                       openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
+                       $mbox = Email::connect($mailbox, $mailconf['user'], $password);
+                       unset($password);
+                       Logger::notice('Connect', ['user' => $mailconf['user']]);
                        if ($mbox) {
-                               $msgs = Email::poll($mbox, $contact['addr']);
-
-                               if (count($msgs)) {
-                                       Logger::log("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], Logger::DEBUG);
-
-                                       $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);
-                                       } else {
-                                               $msgs = array_combine($msgs, $metas);
-
-                                               foreach ($msgs as $msg_uid => $meta) {
-                                                       Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA);
-
-                                                       $datarray = [];
-                                                       $datarray['verb'] = ACTIVITY_POST;
-                                                       $datarray['object-type'] = ACTIVITY_OBJ_NOTE;
-                                                       $datarray['network'] = Protocol::MAIL;
-                                                       // $meta = Email::messageMeta($mbox, $msg_uid);
-
-                                                       $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);
-                                                       if (DBA::isResult($item)) {
-                                                               Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],Logger::DEBUG);
-
-                                                               // Only delete when mails aren't automatically moved or deleted
-                                                               if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
-                                                                       if ($meta->deleted && ! $item['deleted']) {
-                                                                               $fields = ['deleted' => true, 'changed' => $updated];
-                                                                               Item::update($fields, ['id' => $item['id']]);
-                                                                       }
-
-                                                               switch ($mailconf['action']) {
-                                                                       case 0:
-                                                                               Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
-                                                                               break;
-                                                                       case 1:
-                                                                               Logger::log("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']);
-                                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                               break;
-                                                                       case 3:
-                                                                               Logger::log("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);
-                                                                               }
-                                                                               break;
-                                                               }
-                                                               continue;
-                                                       }
+                               $fields = ['last_check' => $updated];
+                               DBA::update('mailacct', $fields, ['id' => $mailconf['id']]);
+                               Logger::notice('Connected', ['user' => $mailconf['user']]);
+                       } else {
+                               Logger::notice('Connection error', ['user' => $mailconf['user'], 'error' => imap_errors()]);
+                               return false;
+                       }
+               }
 
+               if (empty($mbox)) {
+                       return false;
+               }
 
-                                                       // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
-                                                       $raw_refs = ((property_exists($meta, 'references')) ? str_replace("\t", '', $meta->references) : '');
-                                                       if (!trim($raw_refs)) {
-                                                               $raw_refs = ((property_exists($meta, 'in_reply_to')) ? str_replace("\t", '', $meta->in_reply_to) : '');
-                                                       }
-                                                       $raw_refs = trim($raw_refs);  // Don't allow a blank reference in $refs_arr
-
-                                                       if ($raw_refs) {
-                                                               $refs_arr = explode(' ', $raw_refs);
-                                                               if (count($refs_arr)) {
-                                                                       for ($x = 0; $x < count($refs_arr); $x ++) {
-                                                                               $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
-                                                                       }
-                                                               }
-                                                               $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
-                                                               $parent = Item::selectFirst(['parent-uri'], $condition);
-                                                               if (DBA::isResult($parent)) {
-                                                                       $datarray['parent-uri'] = $parent['parent-uri'];  // Set the parent as the top-level item
-                                                               }
-                                                       }
+               $msgs = Email::poll($mbox, $contact['addr']);
 
-                                                       // Decoding the header
-                                                       $subject = imap_mime_header_decode($meta->subject);
-                                                       $datarray['title'] = "";
-                                                       foreach ($subject as $subpart) {
-                                                               if ($subpart->charset != "default") {
-                                                                       $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
-                                                               } else {
-                                                                       $datarray['title'] .= $subpart->text;
-                                                               }
-                                                       }
-                                                       $datarray['title'] = Strings::escapeTags(trim($datarray['title']));
-
-                                                       //$datarray['title'] = Strings::escapeTags(trim($meta->subject));
-                                                       $datarray['created'] = DateTimeFormat::utc($meta->date);
-
-                                                       // Is it a reply?
-                                                       $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
-                                                               (substr(strtolower($datarray['title']), 0, 3) == "re-") ||
-                                                               ($raw_refs != ""));
-
-                                                       // Remove Reply-signs in the subject
-                                                       $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) {
-                                                               $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
-                                                               $params = ['order' => ['created' => true]];
-                                                               $parent = Item::selectFirst(['parent-uri'], $condition, $params);
-                                                               if (DBA::isResult($parent)) {
-                                                                       $datarray['parent-uri'] = $parent['parent-uri'];
-                                                               }
-                                                       }
+               if (count($msgs)) {
+                       Logger::info('Parsing mails', ['count' => count($msgs), 'addr' => $contact['addr'], 'user' => $mailconf['user']]);
 
-                                                       if (empty($datarray['parent-uri'])) {
-                                                               $datarray['parent-uri'] = $datarray['uri'];
-                                                       }
+                       $metas = Email::messageMeta($mbox, implode(',', $msgs));
 
-                                                       $r = Email::getMessage($mbox, $msg_uid, $reply);
-                                                       if (!$r) {
-                                                               Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
-                                                               continue;
+                       if (count($metas) != count($msgs)) {
+                               Logger::info("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas");
+                       } else {
+                               $msgs = array_combine($msgs, $metas);
+
+                               foreach ($msgs as $msg_uid => $meta) {
+                                       Logger::info('Parsing mail', ['message-uid' => $msg_uid]);
+
+                                       $datarray = [];
+                                       $datarray['uid'] = $importer_uid;
+                                       $datarray['contact-id'] = $contact['id'];
+                                       $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, '<>'));
+
+                                       // Have we seen it before?
+                                       $fields = ['deleted', 'id'];
+                                       $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
+                                       $item = Post::selectFirst($fields, $condition);
+                                       if (DBA::isResult($item)) {
+                                               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))
+                                                       if ($meta->deleted && ! $item['deleted']) {
+                                                               $fields = ['deleted' => true, 'changed' => $updated];
+                                                               Item::update($fields, ['id' => $item['id']]);
                                                        }
-                                                       $datarray['body'] = Strings::escapeHtml($r['body']);
-                                                       $datarray['body'] = BBCode::limitBodySize($datarray['body']);
 
-                                                       Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
-
-                                                       /// @TODO Adding a gravatar for the original author would be cool
-
-                                                       $from = imap_mime_header_decode($meta->from);
-                                                       $fromdecoded = "";
-                                                       foreach ($from as $frompart) {
-                                                               if ($frompart->charset != "default") {
-                                                                       $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
-                                                               } else {
-                                                                       $fromdecoded .= $frompart->text;
+                                               switch ($mailconf['action']) {
+                                                       case 0:
+                                                               Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.");
+                                                               break;
+                                                       case 1:
+                                                               Logger::notice("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+                                                               imap_delete($mbox, $msg_uid, FT_UID);
+                                                               break;
+                                                       case 2:
+                                                               Logger::notice("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
+                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                               break;
+                                                       case 3:
+                                                               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);
                                                                }
-                                                       }
-
-                                                       $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->getHostName());
-
-                                                       $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
-
-                                                       if (isset($fromarr[0]->personal)) {
-                                                               $fromname = $fromarr[0]->personal;
-                                                       } else {
-                                                               $fromname = $frommail;
-                                                       }
-
-                                                       $datarray['author-name'] = $fromname;
-                                                       $datarray['author-link'] = "mailto:".$frommail;
-                                                       $datarray['author-avatar'] = $contact['photo'];
-
-                                                       $datarray['owner-name'] = $contact['name'];
-                                                       $datarray['owner-link'] = "mailto:".$contact['addr'];
-                                                       $datarray['owner-avatar'] = $contact['photo'];
+                                                               break;
+                                               }
+                                               continue;
+                                       }
 
-                                                       $datarray['uid'] = $importer_uid;
-                                                       $datarray['contact-id'] = $contact['id'];
-                                                       if ($datarray['parent-uri'] === $datarray['uri']) {
-                                                               $datarray['private'] = 1;
-                                                       }
-                                                       if (($protocol === Protocol::MAIL) && !PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
-                                                               $datarray['private'] = 1;
-                                                               $datarray['allow_cid'] = '<' . $contact['id'] . '>';
-                                                       }
+                                       // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
+                                       $raw_refs = (property_exists($meta, 'references') ? str_replace("\t", '', $meta->references) : '');
+                                       if (!trim($raw_refs)) {
+                                               $raw_refs = (property_exists($meta, 'in_reply_to') ? str_replace("\t", '', $meta->in_reply_to) : '');
+                                       }
+                                       $raw_refs = trim($raw_refs);  // Don't allow a blank reference in $refs_arr
 
-                                                       Item::insert($datarray);
-
-                                                       switch ($mailconf['action']) {
-                                                               case 0:
-                                                                       Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
-                                                                       break;
-                                                               case 1:
-                                                                       Logger::log("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']);
-                                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                       break;
-                                                               case 3:
-                                                                       Logger::log("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);
-                                                                       }
-                                                                       break;
+                                       if ($raw_refs) {
+                                               $refs_arr = explode(' ', $raw_refs);
+                                               if (count($refs_arr)) {
+                                                       for ($x = 0; $x < count($refs_arr); $x ++) {
+                                                               $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
                                                        }
                                                }
+                                               $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
+                                               $parent = Post::selectFirst(['uri'], $condition);
+                                               if (DBA::isResult($parent)) {
+                                                       $datarray['thr-parent'] = $parent['uri'];
+                                               }
                                        }
-                               } else {
-                                       Logger::log("Mail: no mails for ".$mailconf['user']);
-                               }
 
-                               Logger::log("Mail: closing connection for ".$mailconf['user']);
-                               imap_close($mbox);
-                       }
-               }
+                                       // Decoding the header
+                                       $subject = imap_mime_header_decode($meta->subject ?? '');
+                                       $datarray['title'] = "";
+                                       foreach ($subject as $subpart) {
+                                               if ($subpart->charset != "default") {
+                                                       $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
+                                               } else {
+                                                       $datarray['title'] .= $subpart->text;
+                                               }
+                                       }
+                                       $datarray['title'] = trim($datarray['title']);
+
+                                       //$datarray['title'] = Strings::escapeTags(trim($meta->subject));
+                                       $datarray['created'] = DateTimeFormat::utc($meta->date);
+
+                                       // Is it a reply?
+                                       $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
+                                               (substr(strtolower($datarray['title']), 0, 3) == "re-") ||
+                                               ($raw_refs != ""));
+
+                                       // Remove Reply-signs in the subject
+                                       $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['thr-parent']) && $reply) {
+                                               $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
+                                               $params = ['order' => ['created' => true]];
+                                               $parent = Post::selectFirst(['uri'], $condition, $params);
+                                               if (DBA::isResult($parent)) {
+                                                       $datarray['thr-parent'] = $parent['uri'];
+                                               }
+                                       }
 
-               if ($xml) {
-                       Logger::log('received xml : ' . $xml, Logger::DATA);
-                       if (!strstr($xml, '<')) {
-                               Logger::log('post_handshake: response from ' . $url . ' did not contain XML.');
+                                       $headers = imap_headerinfo($mbox, $meta->msgno);
 
-                               $fields = ['last-update' => $updated, 'failure_update' => $updated];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                               return;
-                       }
+                                       $object = [];
 
+                                       if (!empty($headers->from)) {
+                                               $object['from'] = $headers->from;
+                                       }
 
-                       Logger::log("Consume feed of contact ".$contact['id']);
+                                       if (!empty($headers->to)) {
+                                               $object['to'] = $headers->to;
+                                       }
 
-                       consume_feed($xml, $importer, $contact, $hub);
+                                       if (!empty($headers->reply_to)) {
+                                               $object['reply_to'] = $headers->reply_to;
+                                       }
 
-                       // do it a second time for DFRN so that any children find their parents.
-                       if ($protocol === Protocol::DFRN) {
-                               consume_feed($xml, $importer, $contact, $hub);
-                       }
+                                       if (!empty($headers->sender)) {
+                                               $object['sender'] = $headers->sender;
+                                       }
 
-                       $hubmode = 'subscribe';
-                       if ($protocol === Protocol::DFRN || $contact['blocked']) {
-                               $hubmode = 'unsubscribe';
-                       }
+                                       if (!empty($object)) {
+                                               $datarray['object'] = json_encode($object);
+                                       }
 
-                       if (($protocol === Protocol::OSTATUS ||  $protocol == Protocol::FEED) && (! $contact['hub-verify'])) {
-                               $hub_update = true;
-                       }
+                                       $fromname = $frommail = $headers->from[0]->mailbox . '@' . $headers->from[0]->host;
+                                       if (!empty($headers->from[0]->personal)) {
+                                               $fromname = $headers->from[0]->personal;
+                                       }
 
-                       if ($force) {
-                               $hub_update = true;
-                       }
+                                       $datarray['author-name'] = $fromname;
+                                       $datarray['author-link'] = "mailto:".$frommail;
+                                       $datarray['author-avatar'] = $contact['photo'];
 
-                       Logger::log("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$protocol." Relation: ".$contact['rel']." Update: ".$hub_update);
+                                       $datarray['owner-name'] = $contact['name'];
+                                       $datarray['owner-link'] = "mailto:".$contact['addr'];
+                                       $datarray['owner-avatar'] = $contact['photo'];
 
-                       if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $protocol == Protocol::FEED)) {
-                               Logger::log('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
-                               $hubs = explode(',', $hub);
+                                       if (empty($datarray['thr-parent']) || ($datarray['thr-parent'] === $datarray['uri'])) {
+                                               $datarray['private'] = Item::PRIVATE;
+                                       }
 
-                               if (count($hubs)) {
-                                       foreach ($hubs as $h) {
-                                               $h = trim($h);
+                                       if (!DI::pConfig()->get($importer_uid, 'system', 'allow_public_email_replies')) {
+                                               $datarray['private'] = Item::PRIVATE;
+                                               $datarray['allow_cid'] = '<' . $contact['id'] . '>';
+                                       }
 
-                                               if (!strlen($h)) {
-                                                       continue;
-                                               }
+                                       $datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
+                                       if (empty($datarray['body'])) {
+                                               Logger::warning('Cannot fetch mail', ['msg-id' => $msg_uid, 'uid' => $mailconf['user']]);
+                                               continue;
+                                       }
 
-                                               subscribe_to_hub($h, $importer, $contact, $hubmode);
+                                       Logger::notice("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
+
+                                       Item::insert($datarray);
+
+                                       switch ($mailconf['action']) {
+                                               case 0:
+                                                       Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.");
+                                                       break;
+                                               case 1:
+                                                       Logger::notice("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+                                                       imap_delete($mbox, $msg_uid, FT_UID);
+                                                       break;
+                                               case 2:
+                                                       Logger::notice("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
+                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                       break;
+                                               case 3:
+                                                       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);
+                                                       }
+                                                       break;
                                        }
                                }
                        }
-
-                       self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
-                       DBA::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
-                       Contact::unmarkForArchival($contact);
-               } elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) {
-                       self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
-                       DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
-                       Contact::markForArchival($contact);
                } else {
-                       self::updateContact($contact, ['last-update' => $updated]);
+                       Logger::notice('No mails', ['user' => $mailconf['user']]);
                }
 
-               Logger::log('End');
-               return;
+
+               Logger::info('Closing connection', ['user' => $mailconf['user']]);
+               imap_close($mbox);
+
+               return true;
        }
 
        private static function RemoveReply($subject)
@@ -631,15 +445,31 @@ class OnePoll
        }
 
        /**
-        * @brief Updates a personal contact entry and the public contact entry
-        *
-        * @param array $contact The personal contact entry
-        * @param array $fields  The fields that are updated
-        * @throws \Exception
+        * @param string $url
+        * @param array  $importer
+        * @param array  $contact
+        * @param string $hubmode
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function updateContact(array $contact, array $fields)
+       private static function subscribeToHub(string $url, array $importer, array $contact, string $hubmode = 'subscribe')
        {
-               DBA::update('contact', $fields, ['id' => $contact['id']]);
-//             DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
+               $push_url = DI::baseUrl() . '/pubsub/' . $importer['nick'] . '/' . $contact['id'];
+
+               // Use a single verify token, even if multiple hubs
+               $verify_token = $contact['hub-verify'] ?: Strings::getRandomHex();
+
+               $params = 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token;
+
+               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)) {
+                       Contact::update(['hub-verify' => $verify_token], ['id' => $contact['id']]);
+               }
+
+               $postResult = DI::httpClient()->post($url, $params);
+
+               Logger::info('Hub subscription done', ['result' => $postResult->getReturnCode()]);
+
+               return $postResult->isSuccess();
        }
 }