$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 {
// 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;
$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, '<>'));
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';
}