old behaviour restored

[friendica.git] / src / Worker / OnePoll.php

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index b95f43c382833401b9b95d8ba98a8140b0c90efe..e42612cd31ffa10604fc7462aaaeb1b154170974 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -4,18 +4,17 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Content\Text\BBCode;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use Friendica\Util\Temporal;
-use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -25,7 +24,6 @@ class OnePoll
        public static function execute($contact_id = 0, $command = '') {
                global $a;
 
-               require_once 'include/datetime.php';
                require_once 'include/items.php';
 
                logger('start');
@@ -80,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 {
@@ -155,6 +153,7 @@ class OnePoll
                }
 
                $importer = $r[0];
+               $url = '';
 
                logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
@@ -310,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;
@@ -382,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, '<>'));
@@ -397,7 +397,7 @@ class OnePoll
                                                                if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
                                                                        if ($meta->deleted && ! $item['deleted']) {
                                                                                $fields = ['deleted' => true, 'changed' => DateTimeFormat::utcNow()];
-                                                                               dba::update('item', $fields, ['id' => $item['id']]);
+                                                                               Item::update($fields, ['id' => $item['id']]);
                                                                        }
 
                                                                switch ($mailconf['action']) {
@@ -582,14 +582,15 @@ class OnePoll
 
                        logger("Consume feed of contact ".$contact['id']);
 
-                       consume_feed($xml, $importer, $contact, $hub, 1, 1);
-
-                       // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+                       consume_feed($xml, $importer, $contact, $hub);
 
-                       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';
                        }