X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FOnePoll.php;h=e42612cd31ffa10604fc7462aaaeb1b154170974;hb=d2d6200669ddce44ead1813d06c855d75aa6706b;hp=2594f4ec1dadf01a214e01bc370c5bf0598d59a2;hpb=bcd896c60431e43a78b29e82d42122e5fe31720e;p=friendica.git

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 2594f4ec1d..e42612cd31 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -78,7 +78,7 @@ class OnePoll
 					$last_updated = $contact['last-item'];
 				}
 
-				$fields = ['last-item' => $last_updated, 'last-update' => $updated, 'success_update' => $updated];
+				$fields = ['last-item' => DateTimeFormat::utc($last_updated), 'last-update' => $updated, 'success_update' => $updated];
 				self::updateContact($contact, $fields);
 				Contact::unmarkForArchival($contact);
 			} else {
@@ -309,7 +309,7 @@ class OnePoll
 
 			// Are we allowed to import from this person?
 
-			if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) {
+			if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked']) {
 				// set the last-update so we don't keep polling
 				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				return;
@@ -381,6 +381,7 @@ class OnePoll
 							$datarray = [];
 							$datarray['verb'] = ACTIVITY_POST;
 							$datarray['object-type'] = ACTIVITY_OBJ_NOTE;
+							$datarray['network'] = NETWORK_MAIL;
 							// $meta = Email::messageMeta($mbox, $msg_uid);
 
 							$datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
@@ -581,14 +582,15 @@ class OnePoll
 
 			logger("Consume feed of contact ".$contact['id']);
 
-			consume_feed($xml, $importer, $contact, $hub, 1, 1);
+			consume_feed($xml, $importer, $contact, $hub);
 
-			// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
-
-			consume_feed($xml, $importer, $contact, $hub, 1, 2);
+			// do it a second time for DFRN so that any children find their parents.
+			if ($contact['network'] === NETWORK_DFRN) {
+				consume_feed($xml, $importer, $contact, $hub);
+			}
 
 			$hubmode = 'subscribe';
-			if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) {
+			if ($contact['network'] === NETWORK_DFRN || $contact['blocked']) {
 				$hubmode = 'unsubscribe';
 			}