*/
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';
public static function execute($contact_id = 0, $command = '') {
global $a;
- require_once 'include/datetime.php';
require_once 'include/items.php';
logger('start');
}
$importer = $r[0];
+ $url = '';
logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
$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, '<>'));
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']) {
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']) {