<?php
/**
- * @file src/Worker/OnePoll.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
+
namespace Friendica\Worker;
-use Friendica\BaseObject;
-use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\User;
+use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Email;
use Friendica\Protocol\PortableContact;
return;
}
- if ($force) {
- Contact::updateFromProbe($contact_id, true);
- }
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
if (!DBA::isResult($contact)) {
return;
}
+ if (($contact['network'] != Protocol::MAIL) || $force) {
+ Contact::updateFromProbe($contact_id, '', $force);
+ }
+
+ // Special treatment for wrongly detected local contacts
+ if (!$force && ($contact['network'] != Protocol::DFRN) && Contact::isLocalById($contact_id)) {
+ Contact::updateFromProbe($contact_id, Protocol::DFRN, true);
+ $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
+ }
+
if (($contact['network'] == Protocol::DFRN) && !Contact::isLegacyDFRNContact($contact)) {
$protocol = Protocol::ACTIVITYPUB;
} else {
}
// Don't poll if polling is deactivated (But we poll feeds and mails anyway)
- if (!in_array($protocol, [Protocol::FEED, Protocol::MAIL]) && Config::get('system', 'disable_polling')) {
+ if (!in_array($protocol, [Protocol::FEED, Protocol::MAIL]) && DI::config()->get('system', 'disable_polling')) {
Logger::log('Polling is disabled');
// set the last-update so we don't keep polling
$xml = false;
if ($contact['subhub']) {
- $poll_interval = Config::get('system', 'pushpoll_frequency', 3);
+ $poll_interval = DI::config()->get('system', 'pushpoll_frequency', 3);
$contact['priority'] = intval($poll_interval);
$hub_update = false;
}
self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
- DBA::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
Contact::unmarkForArchival($contact);
} elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) {
self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
- DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
Contact::markForArchival($contact);
} else {
self::updateContact($contact, ['last-update' => $updated]);
}
/**
- * @brief Updates a personal contact entry and the public contact entry
+ * Updates a personal contact entry and the public contact entry
*
* @param array $contact The personal contact entry
* @param array $fields The fields that are updated
}
/**
- * @brief Poll DFRN contacts
+ * Poll DFRN contacts
*
* @param array $contact The personal contact entry
* @param string $updated The updated date
$res = XML::parseString($handshake_xml);
+ if (!is_object($res)) {
+ Logger::info('Unparseable response', ['url' => $url]);
+
+ $fields = ['last-update' => $updated, 'failure_update' => $updated];
+ self::updateContact($contact, $fields);
+ Contact::markForArchival($contact);
+ return false;
+ }
+
if (intval($res->status) == 1) {
// we may not be friends anymore. Will keep trying for one month.
Logger::log("$url replied status 1 - marking for death ");
}
/**
- * @brief Poll Feed/OStatus contacts
+ * Poll Feed/OStatus contacts
*
* @param array $contact The personal contact entry
* @param string $protocol The used protocol of the contact
}
/**
- * @brief Poll Mail contacts
+ * Poll Mail contacts
*
* @param array $contact The personal contact entry
* @param integer $importer_uid The UID of the importer
{
Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG);
- $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
+ $mail_disabled = ((function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) ? 0 : 1);
if ($mail_disabled) {
// set the last-update so we don't keep polling
self::updateContact($contact, ['last-update' => $updated]);
Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA);
$datarray = [];
- $datarray['verb'] = ACTIVITY_POST;
- $datarray['object-type'] = ACTIVITY_OBJ_NOTE;
+ $datarray['uid'] = $importer_uid;
+ $datarray['contact-id'] = $contact['id'];
+ $datarray['verb'] = Activity::POST;
+ $datarray['object-type'] = Activity\ObjectType::NOTE;
$datarray['network'] = Protocol::MAIL;
// $meta = Email::messageMeta($mbox, $msg_uid);
}
// look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
- $raw_refs = ((property_exists($meta, 'references')) ? str_replace("\t", '', $meta->references) : '');
+ $raw_refs = (property_exists($meta, 'references') ? str_replace("\t", '', $meta->references) : '');
if (!trim($raw_refs)) {
- $raw_refs = ((property_exists($meta, 'in_reply_to')) ? str_replace("\t", '', $meta->in_reply_to) : '');
+ $raw_refs = (property_exists($meta, 'in_reply_to') ? str_replace("\t", '', $meta->in_reply_to) : '');
}
$raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr
}
// Decoding the header
- $subject = imap_mime_header_decode($meta->subject);
+ $subject = imap_mime_header_decode($meta->subject ?? '');
$datarray['title'] = "";
foreach ($subject as $subpart) {
if ($subpart->charset != "default") {
$datarray['parent-uri'] = $datarray['uri'];
}
- $r = Email::getMessage($mbox, $msg_uid, $reply);
- if (!$r) {
- Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
- continue;
- }
- $datarray['body'] = Strings::escapeHtml($r['body']);
- $datarray['body'] = BBCode::limitBodySize($datarray['body']);
+ $headers = imap_headerinfo($mbox, $meta->msgno);
- Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
+ $object = [];
- /// @TODO Adding a gravatar for the original author would be cool
+ if (!empty($headers->from)) {
+ $object['from'] = $headers->from;
+ }
- $from = imap_mime_header_decode($meta->from);
- $fromdecoded = "";
- foreach ($from as $frompart) {
- if ($frompart->charset != "default") {
- $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
- } else {
- $fromdecoded .= $frompart->text;
- }
+ if (!empty($headers->to)) {
+ $object['to'] = $headers->to;
}
- $fromarr = imap_rfc822_parse_adrlist($fromdecoded, BaseObject::getApp()->getHostName());
+ if (!empty($headers->reply_to)) {
+ $object['reply_to'] = $headers->reply_to;
+ }
+
+ if (!empty($headers->sender)) {
+ $object['sender'] = $headers->sender;
+ }
- $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
+ if (!empty($object)) {
+ $datarray['object'] = json_encode($object);
+ }
- if (isset($fromarr[0]->personal)) {
- $fromname = $fromarr[0]->personal;
- } else {
- $fromname = $frommail;
+ $fromname = $frommail = $headers->from[0]->mailbox . '@' . $headers->from[0]->host;
+ if (!empty($headers->from[0]->personal)) {
+ $fromname = $headers->from[0]->personal;
}
$datarray['author-name'] = $fromname;
$datarray['owner-link'] = "mailto:".$contact['addr'];
$datarray['owner-avatar'] = $contact['photo'];
- $datarray['uid'] = $importer_uid;
- $datarray['contact-id'] = $contact['id'];
if ($datarray['parent-uri'] === $datarray['uri']) {
- $datarray['private'] = 1;
+ $datarray['private'] = Item::PRIVATE;
}
- if (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
- $datarray['private'] = 1;
+
+ if (!DI::pConfig()->get($importer_uid, 'system', 'allow_public_email_replies')) {
+ $datarray['private'] = Item::PRIVATE;
$datarray['allow_cid'] = '<' . $contact['id'] . '>';
}
+ $datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
+ if (empty($datarray['body'])) {
+ Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
+ continue;
+ }
+
+ Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
+
Item::insert($datarray);
switch ($mailconf['action']) {
projects / friendica.git / blobdiff