X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FOnePoll.php;h=01b63e98e03a494478dca3fb00995562c49aa642;hb=cbfc3d0c28e0b55c3ccf1ddfd321798a8c2532e8;hp=ff08ed09432cd487f88a26fb195196d06583f8af;hpb=b85490515016aad50e0fe73c1174949a1f72d3c3;p=friendica.git diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index ff08ed0943..01b63e98e0 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -4,27 +4,28 @@ */ namespace Friendica\Worker; +use Friendica\BaseObject; +use Friendica\Content\Text\BBCode; use Friendica\Core\Config; use Friendica\Core\PConfig; -use Friendica\Database\DBM; +use Friendica\Core\Protocol; +use Friendica\Database\DBA; 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 dba; require_once 'include/dba.php'; class OnePoll { - public static function execute($contact_id = 0, $command = '') { - global $a; + public static function execute($contact_id = 0, $command = '') + { + $a = BaseObject::getApp(); - require_once 'include/datetime.php'; require_once 'include/items.php'; logger('start'); @@ -44,10 +45,10 @@ class OnePoll return; } - $d = Temporal::convert(); + $d = DateTimeFormat::utcNow(); - $contact = dba::selectFirst('contact', [], ['id' => $contact_id]); - if (!DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); + if (!DBA::isResult($contact)) { logger('Contact not found or cannot be used.'); return; } @@ -60,7 +61,7 @@ class OnePoll WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", intval($contact['id']) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { if (!$r[0]['total']) { PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']); } @@ -68,9 +69,10 @@ class OnePoll } // Diaspora users, archived users and followers are only checked if they still exist. - if ($contact['archive'] || ($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) { + if ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) { $last_updated = PortableContact::lastUpdated($contact["url"], true); - $updated = Temporal::convert(); + $updated = DateTimeFormat::utcNow(); + if ($last_updated) { logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG); @@ -79,7 +81,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 { @@ -87,6 +89,7 @@ class OnePoll Contact::markForArchival($contact); logger('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG); } + return; } @@ -99,7 +102,7 @@ class OnePoll $contact['priority'] = intval($poll_interval); $hub_update = false; - if (Temporal::convert('now') > Temporal::convert($t . " + 1 day")) { + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) { $hub_update = true; } } else { @@ -107,17 +110,17 @@ class OnePoll } $last_update = (($contact['last-update'] <= NULL_DATE) - ? Temporal::convert('now - 7 days', 'UTC', 'UTC', Temporal::ATOM) - : Temporal::convert($contact['last-update'], 'UTC', 'UTC', Temporal::ATOM) + ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM) + : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM) ); // Update the contact entry - if (($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) { + if (($contact['network'] === Protocol::OSTATUS) || ($contact['network'] === Protocol::DIASPORA) || ($contact['network'] === Protocol::DFRN)) { if (!PortableContact::reachable($contact['url'])) { logger("Skipping probably dead contact ".$contact['url']); // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); return; } @@ -126,7 +129,7 @@ class OnePoll logger('Contact is marked dead'); // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); return; } else { Contact::unmarkForArchival($contact); @@ -137,7 +140,7 @@ class OnePoll logger('Ignore public contacts'); // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); return; } @@ -145,19 +148,20 @@ class OnePoll intval($importer_uid) ); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { logger('No self contact for user '.$importer_uid); // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); return; } $importer = $r[0]; + $url = ''; logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}"); - if ($contact['network'] === NETWORK_DFRN) { + if ($contact['network'] === 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; @@ -173,7 +177,7 @@ class OnePoll if (!intval($contact['writable'])) { $fields = ['writable' => true]; - dba::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); } $url = $contact['poll'] . '?dfrn_id=' . $idtosend @@ -183,9 +187,9 @@ class OnePoll $ret = Network::curl($url); - if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); Contact::markForArchival($contact); return; } @@ -196,7 +200,6 @@ class OnePoll logger('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA); - if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) { logger("$url appears to be dead - marking for death "); @@ -207,7 +210,7 @@ class OnePoll Contact::markForArchival($contact); // set the last-update so we don't keep polling - $fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()]; + $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()]; self::updateContact($contact, $fields); return; } @@ -217,7 +220,7 @@ class OnePoll Contact::markForArchival($contact); - $fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()]; + $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()]; self::updateContact($contact, $fields); return; } @@ -230,7 +233,7 @@ class OnePoll // we may not be friends anymore. Will keep trying for one month. // set the last-update so we don't keep polling - $fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()]; + $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()]; self::updateContact($contact, $fields); Contact::markForArchival($contact); @@ -241,13 +244,13 @@ class OnePoll 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' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['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']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); } $postvars = []; @@ -276,7 +279,7 @@ class OnePoll logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id); // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); Contact::markForArchival($contact); return; } @@ -287,31 +290,31 @@ class OnePoll $xml = Network::post($contact['poll'], $postvars); - } elseif (($contact['network'] === NETWORK_OSTATUS) - || ($contact['network'] === NETWORK_DIASPORA) - || ($contact['network'] === NETWORK_FEED)) { + } elseif (($contact['network'] === Protocol::OSTATUS) + || ($contact['network'] === Protocol::DIASPORA) + || ($contact['network'] === Protocol::FEED)) { // Upgrading DB fields from an older Friendica version // Will only do this once per notify-enabled OStatus contact // or if relationship changes - $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0); + $stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0); // Contacts from OStatus are always writable - if ($contact['network'] === NETWORK_OSTATUS) { + if ($contact['network'] === Protocol::OSTATUS) { $stat_writeable = 1; } if ($stat_writeable != $contact['writable']) { $fields = ['writable' => $stat_writeable]; - dba::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); } // Are we allowed to import from this person? - if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) { + if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) { // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); return; } @@ -319,23 +322,22 @@ class OnePoll $ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]); unlink($cookiejar); - if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); Contact::markForArchival($contact); return; } $xml = $ret['body']; - } elseif ($contact['network'] === NETWORK_MAIL) { - + } elseif ($contact['network'] === Protocol::MAIL) { logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG); $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 - dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); Contact::markForArchival($contact); return; } @@ -343,11 +345,11 @@ class OnePoll logger("Mail: Enabled", LOGGER_DEBUG); $mbox = null; - $user = dba::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]); + $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]); $condition = ["`server` != '' AND `uid` = ?", $importer_uid]; - $mailconf = dba::selectFirst('mailacct', [], $condition); - if (DBM::is_result($user) && DBM::is_result($mailconf)) { + $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']); @@ -355,8 +357,8 @@ class OnePoll unset($password); logger("Mail: Connect to " . $mailconf['user']); if ($mbox) { - $fields = ['last_check' => Temporal::convert()]; - dba::update('mailacct', $fields, ['id' => $mailconf['id']]); + $fields = ['last_check' => DateTimeFormat::utcNow()]; + DBA::update('mailacct', $fields, ['id' => $mailconf['id']]); logger("Mail: Connected to " . $mailconf['user']); } else { logger("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true)); @@ -370,6 +372,7 @@ class OnePoll logger("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("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG); } else { @@ -381,6 +384,7 @@ class OnePoll $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, '<>')); @@ -388,15 +392,15 @@ class OnePoll // Have we seen it before? $fields = ['deleted', 'id']; $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']]; - $item = dba::selectFirst('item', $fields, $condition); - if (DBM::is_result($item)) { + $item = Item::selectFirst($fields, $condition); + if (DBA::isResult($item)) { logger("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' => Temporal::convert()]; - dba::update('item', $fields, ['id' => $item['id']]); + $fields = ['deleted' => true, 'changed' => DateTimeFormat::utcNow()]; + Item::update($fields, ['id' => $item['id']]); } switch ($mailconf['action']) { @@ -434,15 +438,13 @@ class OnePoll $refs_arr = explode(' ', $raw_refs); if (count($refs_arr)) { for ($x = 0; $x < count($refs_arr); $x ++) { - $refs_arr[$x] = "'" . Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''],dbesc($refs_arr[$x]))) . "'"; + $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x])); } } - $qstr = implode(',', $refs_arr); - $r = q("SELECT `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1", - intval($importer_uid) - ); - if (DBM::is_result($r)) { - $datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item + $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 } } @@ -459,7 +461,7 @@ class OnePoll $datarray['title'] = notags(trim($datarray['title'])); //$datarray['title'] = notags(trim($meta->subject)); - $datarray['created'] = Temporal::convert($meta->date); + $datarray['created'] = DateTimeFormat::utc($meta->date); // Is it a reply? $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") || @@ -471,12 +473,11 @@ class OnePoll // 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) { - $r = q("SELECT `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1", - dbesc(protect_sprintf($datarray['title'])), - intval($importer_uid), - dbesc(NETWORK_MAIL)); - if (DBM::is_result($r)) { - $datarray['parent-uri'] = $r[0]['parent-uri']; + $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']; } } @@ -529,7 +530,7 @@ class OnePoll if ($datarray['parent-uri'] === $datarray['uri']) { $datarray['private'] = 1; } - if (($contact['network'] === NETWORK_MAIL) && (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies'))) { + if (($contact['network'] === Protocol::MAIL) && (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies'))) { $datarray['private'] = 1; $datarray['allow_cid'] = '<' . $contact['id'] . '>'; } @@ -572,7 +573,7 @@ class OnePoll if (!strstr($xml, '<')) { logger('post_handshake: response from ' . $url . ' did not contain XML.'); - $fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()]; + $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()]; self::updateContact($contact, $fields); Contact::markForArchival($contact); return; @@ -581,18 +582,19 @@ 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'] === Protocol::DFRN) { + consume_feed($xml, $importer, $contact, $hub); + } $hubmode = 'subscribe'; - if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) { + if ($contact['network'] === Protocol::DFRN || $contact['blocked']) { $hubmode = 'unsubscribe'; } - if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) { + if (($contact['network'] === Protocol::OSTATUS || $contact['network'] == Protocol::FEED) && (! $contact['hub-verify'])) { $hub_update = true; } @@ -602,40 +604,44 @@ class OnePoll logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update); - if (strlen($hub) && $hub_update && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED)) { + if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $contact['network'] == Protocol::FEED)) { logger('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']); $hubs = explode(',', $hub); + if (count($hubs)) { foreach ($hubs as $h) { $h = trim($h); + if (!strlen($h)) { continue; } + subscribe_to_hub($h, $importer, $contact, $hubmode); } } } - $updated = Temporal::convert(); + $updated = DateTimeFormat::utcNow(); self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]); - dba::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]); + DBA::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]); Contact::unmarkForArchival($contact); - } elseif (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED])) { - $updated = Temporal::convert(); + } elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) { + $updated = DateTimeFormat::utcNow(); self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]); - dba::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]); + DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]); Contact::markForArchival($contact); } else { - $updated = Temporal::convert(); - dba::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); + $updated = DateTimeFormat::utcNow(); + DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); } return; } - private static function RemoveReply($subject) { + private static function RemoveReply($subject) + { while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) { $subject = trim(substr($subject, 4)); } @@ -649,8 +655,9 @@ class OnePoll * @param array $contact The personal contact entry * @param array $fields The fields that are updated */ - private static function updateContact($contact, $fields) { - dba::update('contact', $fields, ['id' => $contact['id']]); - dba::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); + private static function updateContact(array $contact, array $fields) + { + DBA::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); } }