Merge remote-tracking branch 'upstream/develop' into delivery-statistics
This commit is contained in:
commit
9bf065c9d8
|
|
@ -144,7 +144,7 @@ if (!$foreground) {
|
|||
file_put_contents($pidfile, $pid);
|
||||
|
||||
// We lose the database connection upon forking
|
||||
Factory\DBFactory::init($a->getConfigCache(), $a->getProfiler(), $_SERVER);
|
||||
$a->getDatabase()->reconnect();
|
||||
}
|
||||
|
||||
Config::set('system', 'worker_daemon_mode', true);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ function q($sql) {
|
|||
$args = func_get_args();
|
||||
unset($args[0]);
|
||||
|
||||
if (!DBA::$connected) {
|
||||
if (!DBA::connected()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -140,16 +140,12 @@ function redir_private_images($a, &$item)
|
|||
* @brief Given a text string, convert from bbcode to html and add smilie icons.
|
||||
*
|
||||
* @param string $text String with bbcode.
|
||||
* @return string Formattet HTML.
|
||||
* @return string Formatted HTML
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
function prepare_text($text) {
|
||||
if (stristr($text, '[nosmile]')) {
|
||||
function prepare_text($text)
|
||||
{
|
||||
$s = BBCode::convert($text);
|
||||
} else {
|
||||
$s = Smilies::replace(BBCode::convert($text));
|
||||
}
|
||||
|
||||
return trim($s);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ function message_content(App $a)
|
|||
|
||||
$from_name_e = $message['from-name'];
|
||||
$subject_e = $message['title'];
|
||||
$body_e = Smilies::replace(BBCode::convert($message['body']));
|
||||
$body_e = BBCode::convert($message['body']);
|
||||
$to_name_e = $message['name'];
|
||||
|
||||
$contact = Contact::getDetailsByURL($message['from-url']);
|
||||
|
|
|
|||
18
src/App.php
18
src/App.php
|
|
@ -12,6 +12,7 @@ use Friendica\Core\Config\Cache\IConfigCache;
|
|||
use Friendica\Core\Config\Configuration;
|
||||
use Friendica\Core\Hook;
|
||||
use Friendica\Core\Theme;
|
||||
use Friendica\Database\Database;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Profile;
|
||||
use Friendica\Network\HTTPException;
|
||||
|
|
@ -122,6 +123,11 @@ class App
|
|||
*/
|
||||
private $profiler;
|
||||
|
||||
/**
|
||||
* @var Database The Friendica database connection
|
||||
*/
|
||||
private $database;
|
||||
|
||||
/**
|
||||
* Returns the current config cache of this node
|
||||
*
|
||||
|
|
@ -193,6 +199,14 @@ class App
|
|||
return $this->router;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Database
|
||||
*/
|
||||
public function getDatabase()
|
||||
{
|
||||
return $this->database;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register a stylesheet file path to be included in the <head> tag of every page.
|
||||
* Inclusion is done in App->initHead().
|
||||
|
|
@ -232,6 +246,7 @@ class App
|
|||
/**
|
||||
* @brief App constructor.
|
||||
*
|
||||
* @param Database $database The Friendica Database
|
||||
* @param Configuration $config The Configuration
|
||||
* @param App\Mode $mode The mode of this Friendica app
|
||||
* @param App\Router $router The router of this Friendica app
|
||||
|
|
@ -242,10 +257,11 @@ class App
|
|||
*
|
||||
* @throws Exception if the Basepath is not usable
|
||||
*/
|
||||
public function __construct(Configuration $config, App\Mode $mode, App\Router $router, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
|
||||
public function __construct(Database $database, Configuration $config, App\Mode $mode, App\Router $router, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
|
||||
{
|
||||
BaseObject::setApp($this);
|
||||
|
||||
$this->database = $database;
|
||||
$this->config = $config;
|
||||
$this->mode = $mode;
|
||||
$this->router = $router;
|
||||
|
|
|
|||
|
|
@ -267,17 +267,18 @@ class Smilies
|
|||
* @return string HTML Output
|
||||
*
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @todo : Rework because it doesn't work correctly
|
||||
*/
|
||||
private static function pregHeart($x)
|
||||
{
|
||||
if (strlen($x[1]) == 1) {
|
||||
return $x[0];
|
||||
}
|
||||
|
||||
$t = '';
|
||||
for ($cnt = 0; $cnt < strlen($x[1]); $cnt ++) {
|
||||
$t .= '<img class="smiley" src="' . System::baseUrl() . '/images/smiley-heart.gif" alt="<3" />';
|
||||
$t .= '❤';
|
||||
}
|
||||
|
||||
$r = str_replace($x[0], $t, $x[0]);
|
||||
return $r;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1395,6 +1395,7 @@ class BBCode extends BaseObject
|
|||
|
||||
// This is actually executed in Item::prepareBody()
|
||||
|
||||
$nosmile = strpos($text, '[nosmile]') !== false;
|
||||
$text = str_replace('[nosmile]', '', $text);
|
||||
|
||||
// Check for font change text
|
||||
|
|
@ -1572,7 +1573,7 @@ class BBCode extends BaseObject
|
|||
}
|
||||
|
||||
// Replace non graphical smilies for external posts
|
||||
if ($simple_html) {
|
||||
if (!$nosmile && !$for_plaintext) {
|
||||
$text = Smilies::replace($text);
|
||||
}
|
||||
|
||||
|
|
|
|||
1283
src/Database/DBA.php
1283
src/Database/DBA.php
File diff suppressed because it is too large
Load diff
1644
src/Database/Database.php
Normal file
1644
src/Database/Database.php
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -17,14 +17,11 @@ class DBFactory
|
|||
* @param Profiler $profiler The profiler
|
||||
* @param array $server The $_SERVER variables
|
||||
*
|
||||
* @return Database\Database
|
||||
* @throws \Exception if connection went bad
|
||||
*/
|
||||
public static function init(Cache\IConfigCache $configCache, Profiler $profiler, array $server)
|
||||
{
|
||||
if (Database\DBA::connected()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$db_host = $configCache->get('database', 'hostname');
|
||||
$db_user = $configCache->get('database', 'username');
|
||||
$db_pass = $configCache->get('database', 'password');
|
||||
|
|
@ -50,11 +47,15 @@ class DBFactory
|
|||
$db_data = $server['MYSQL_DATABASE'];
|
||||
}
|
||||
|
||||
if (Database\DBA::connect($configCache, $profiler, new VoidLogger(), $db_host, $db_user, $db_pass, $db_data, $charset)) {
|
||||
$database = new Database\Database($configCache, $profiler, new VoidLogger(), $db_host, $db_user, $db_pass, $db_data, $charset);
|
||||
|
||||
if ($database->connected()) {
|
||||
// Loads DB_UPDATE_VERSION constant
|
||||
Database\DBStructure::definition($configCache->get('system', 'basepath'), false);
|
||||
}
|
||||
|
||||
unset($db_host, $db_user, $db_pass, $db_data, $charset);
|
||||
|
||||
return $database;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace Friendica\Factory;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Factory;
|
||||
use Friendica\Util\BasePath;
|
||||
use Friendica\Util\BaseURL;
|
||||
|
|
@ -30,15 +29,14 @@ class DependencyFactory
|
|||
$configLoader = new Config\ConfigFileLoader($basePath, $mode);
|
||||
$configCache = Factory\ConfigFactory::createCache($configLoader);
|
||||
$profiler = Factory\ProfilerFactory::create($configCache);
|
||||
Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$database = Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$config = Factory\ConfigFactory::createConfig($configCache);
|
||||
// needed to call PConfig::init()
|
||||
Factory\ConfigFactory::createPConfig($configCache);
|
||||
$logger = Factory\LoggerFactory::create($channel, $config, $profiler);
|
||||
DBA::setLogger($logger);
|
||||
$logger = Factory\LoggerFactory::create($channel, $database, $config, $profiler);
|
||||
Factory\LoggerFactory::createDev($channel, $config, $profiler);
|
||||
$baseURL = new BaseURL($config, $_SERVER);
|
||||
|
||||
return new App($config, $mode, $router, $baseURL, $logger, $profiler, $isBackend);
|
||||
return new App($database, $config, $mode, $router, $baseURL, $logger, $profiler, $isBackend);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ namespace Friendica\Factory;
|
|||
|
||||
use Friendica\Core\Config\Configuration;
|
||||
use Friendica\Core\Logger;
|
||||
use Friendica\Database\Database;
|
||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||
use Friendica\Util\Introspection;
|
||||
use Friendica\Util\Logger\Monolog\DevelopHandler;
|
||||
|
|
@ -47,10 +48,11 @@ class LoggerFactory
|
|||
* @throws \Exception
|
||||
* @throws InternalServerErrorException
|
||||
*/
|
||||
public static function create($channel, Configuration $config, Profiler $profiler)
|
||||
public static function create($channel, Database $database, Configuration $config, Profiler $profiler)
|
||||
{
|
||||
if (empty($config->get('system', 'debugging', false))) {
|
||||
$logger = new VoidLogger();
|
||||
$database->setLogger($logger);
|
||||
Logger::init($logger);
|
||||
return $logger;
|
||||
}
|
||||
|
|
@ -101,6 +103,7 @@ class LoggerFactory
|
|||
$logger = new ProfilerLogger($logger, $profiler);
|
||||
}
|
||||
|
||||
$database->setLogger($logger);
|
||||
Logger::init($logger);
|
||||
|
||||
return $logger;
|
||||
|
|
|
|||
|
|
@ -1328,7 +1328,7 @@ class Contact extends BaseObject
|
|||
|
||||
// Update the contact in the background if needed but it is called by the frontend
|
||||
if ($update_contact && $no_update && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
|
||||
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
|
||||
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
|
||||
}
|
||||
|
||||
if (!$update_contact || $no_update) {
|
||||
|
|
@ -1425,7 +1425,7 @@ class Contact extends BaseObject
|
|||
|
||||
// Update in the background when we fetched the data solely from the database
|
||||
if ($background_update) {
|
||||
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
|
||||
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
|
||||
}
|
||||
|
||||
// Update the newly created contact from data in the gcontact table
|
||||
|
|
@ -1452,7 +1452,7 @@ class Contact extends BaseObject
|
|||
}
|
||||
}
|
||||
|
||||
if (!empty($data['photo'])) {
|
||||
if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
|
||||
self::updateAvatar($data['photo'], $uid, $contact_id);
|
||||
}
|
||||
|
||||
|
|
@ -1755,6 +1755,51 @@ class Contact extends BaseObject
|
|||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Helper function for "updateFromProbe". Updates personal and public contact
|
||||
*
|
||||
* @param array $contact The personal contact entry
|
||||
* @param array $fields The fields that are updated
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function updateContact($id, $uid, $url, array $fields)
|
||||
{
|
||||
DBA::update('contact', $fields, ['id' => $id]);
|
||||
|
||||
if ($uid != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Archive or unarchive the contact. We only need to do this for the public contact.
|
||||
// The archive/unarchive function will update the personal contacts by themselves.
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $id]);
|
||||
if (!empty($fields['success_update'])) {
|
||||
self::unmarkForArchival($contact);
|
||||
} elseif (!empty($fields['failure_update'])) {
|
||||
self::markForArchival($contact);
|
||||
}
|
||||
|
||||
$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url),
|
||||
'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
|
||||
|
||||
// These contacts are sharing with us, we don't poll them.
|
||||
// This means that we don't set the update fields in "OnePoll.php".
|
||||
$condition['rel'] = self::SHARING;
|
||||
DBA::update('contact', $fields, $condition);
|
||||
|
||||
unset($fields['last-update']);
|
||||
unset($fields['success_update']);
|
||||
unset($fields['failure_update']);
|
||||
|
||||
if (empty($fields)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// We are polling these contacts, so we mustn't set the update fields here.
|
||||
$condition['rel'] = [self::FOLLOWER, self::FRIEND];
|
||||
DBA::update('contact', $fields, $condition);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param integer $id contact id
|
||||
* @param string $network Optional network we are probing for
|
||||
|
|
@ -1767,7 +1812,7 @@ class Contact extends BaseObject
|
|||
{
|
||||
/*
|
||||
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
|
||||
This will reliably kill your communication with Friendica contacts.
|
||||
This will reliably kill your communication with old Friendica contacts.
|
||||
*/
|
||||
|
||||
$fields = ['avatar', 'uid', 'name', 'nick', 'url', 'addr', 'batch', 'notify',
|
||||
|
|
@ -1785,12 +1830,14 @@ class Contact extends BaseObject
|
|||
|
||||
$ret = Probe::uri($contact['url'], $network, $uid, !$force);
|
||||
|
||||
// If Probe::uri fails the network code will be different (mostly "feed" or "unkn")
|
||||
if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
|
||||
return false;
|
||||
}
|
||||
$updated = DateTimeFormat::utcNow();
|
||||
|
||||
if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT)) {
|
||||
// If Probe::uri fails the network code will be different (mostly "feed" or "unkn")
|
||||
if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT) ||
|
||||
(in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network']))) {
|
||||
if ($force && ($uid == 0)) {
|
||||
self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'failure_update' => $updated]);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1807,17 +1854,28 @@ class Contact extends BaseObject
|
|||
}
|
||||
}
|
||||
|
||||
if ($ret['network'] != Protocol::FEED) {
|
||||
self::updateAvatar($ret['photo'], $uid, $id, $update || $force);
|
||||
}
|
||||
|
||||
if (!$update) {
|
||||
if ($force && ($uid == 0)) {
|
||||
self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
$ret['nurl'] = Strings::normaliseLink($ret['url']);
|
||||
$ret['updated'] = DateTimeFormat::utcNow();
|
||||
$ret['updated'] = $updated;
|
||||
|
||||
self::updateAvatar($ret['photo'], $uid, $id, true);
|
||||
if ($force && ($uid == 0)) {
|
||||
$ret['last-update'] = $updated;
|
||||
$ret['success_update'] = $updated;
|
||||
}
|
||||
|
||||
unset($ret['photo']);
|
||||
DBA::update('contact', $ret, ['id' => $id]);
|
||||
|
||||
self::updateContact($id, $uid, $ret['url'], $ret);
|
||||
|
||||
// Update the corresponding gcontact entry
|
||||
PortableContact::lastUpdated($ret["url"]);
|
||||
|
|
|
|||
|
|
@ -130,18 +130,21 @@ class Photo extends BaseObject
|
|||
*/
|
||||
public static function getPhoto($resourceid, $scale = 0)
|
||||
{
|
||||
$r = self::selectFirst(["uid"], ["resource-id" => $resourceid]);
|
||||
$r = self::selectFirst(["uid", "allow_cid", "allow_gid", "deny_cid", "deny_gid"], ["resource-id" => $resourceid]);
|
||||
if ($r === false) {
|
||||
return false;
|
||||
}
|
||||
$uid = $r["uid"];
|
||||
|
||||
// This is the first place, when retrieving just a photo, that we know who owns the photo.
|
||||
// Make sure that the requester's session is appropriately authenticated to that user
|
||||
// Check if the photo is public (empty allow and deny means public), if so, skip auth attempt, if not
|
||||
// make sure that the requester's session is appropriately authenticated to that user
|
||||
// otherwise permissions checks done by getPermissionsSQLByUserId() won't work correctly
|
||||
if (!empty($r["allow_cid"]) || !empty($r["allow_gid"]) || !empty($r["deny_cid"]) || !empty($r["deny_gid"])) {
|
||||
$r = DBA::selectFirst("user", ["nickname"], ["uid" => $uid], []);
|
||||
// this will either just return (if auth all ok) or will redirect and exit (starting over)
|
||||
DFRN::autoRedir(self::getApp(), $r["nickname"]);
|
||||
}
|
||||
|
||||
$sql_acl = Security::getPermissionsSQLByUserId($uid);
|
||||
|
||||
|
|
|
|||
|
|
@ -17,16 +17,10 @@ use Friendica\Util\DateTimeFormat;
|
|||
|
||||
class Cron
|
||||
{
|
||||
public static function execute($parameter = '', $generation = 0)
|
||||
public static function execute()
|
||||
{
|
||||
$a = BaseObject::getApp();
|
||||
|
||||
// Poll contacts with specific parameters
|
||||
if (!empty($parameter)) {
|
||||
self::pollContacts($parameter, $generation);
|
||||
return;
|
||||
}
|
||||
|
||||
$last = Config::get('system', 'last_cron');
|
||||
|
||||
$poll_interval = intval(Config::get('system', 'cron_interval'));
|
||||
|
|
@ -115,7 +109,10 @@ class Cron
|
|||
}
|
||||
|
||||
// Poll contacts
|
||||
self::pollContacts($parameter, $generation);
|
||||
self::pollContacts();
|
||||
|
||||
// Update contact information
|
||||
self::updatePublicContacts();
|
||||
|
||||
Logger::log('cron: end');
|
||||
|
||||
|
|
@ -125,98 +122,76 @@ class Cron
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief Poll contacts for unreceived messages
|
||||
*
|
||||
* @todo Currently it seems as if the following parameter aren't used at all ...
|
||||
*
|
||||
* @param string $parameter Parameter (force, restart, ...) for the contact polling
|
||||
* @param integer $generation
|
||||
* @brief Update public contacts
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
private static function pollContacts($parameter, $generation) {
|
||||
$manual_id = 0;
|
||||
$generation = 0;
|
||||
$force = false;
|
||||
private static function updatePublicContacts() {
|
||||
$count = 0;
|
||||
$last_updated = DateTimeFormat::utc('now - 1 week');
|
||||
$condition = ["`network` IN (?, ?, ?, ?) AND `uid` = ? AND NOT `self` AND `last-update` < ?",
|
||||
Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, 0, $last_updated];
|
||||
|
||||
if ($parameter == 'force') {
|
||||
$force = true;
|
||||
$total = DBA::count('contact', $condition);
|
||||
$oldest_date = '';
|
||||
$oldest_id = '';
|
||||
$contacts = DBA::select('contact', ['id', 'last-update'], $condition, ['limit' => 100, 'order' => ['last-update']]);
|
||||
while ($contact = DBA::fetch($contacts)) {
|
||||
if (empty($oldest_id)) {
|
||||
$oldest_id = $contact['id'];
|
||||
$oldest_date = $contact['last-update'];
|
||||
}
|
||||
if ($parameter == 'restart') {
|
||||
$generation = intval($generation);
|
||||
if (!$generation) {
|
||||
exit();
|
||||
Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], 'force');
|
||||
++$count;
|
||||
}
|
||||
Logger::info('Initiated update for public contacts', ['interval' => $count, 'total' => $total, 'id' => $oldest_id, 'oldest' => $oldest_date]);
|
||||
DBA::close($contacts);
|
||||
}
|
||||
|
||||
if (intval($parameter)) {
|
||||
$manual_id = intval($parameter);
|
||||
$force = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Poll contacts for unreceived messages
|
||||
*
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
private static function pollContacts() {
|
||||
$min_poll_interval = Config::get('system', 'min_poll_interval', 1);
|
||||
|
||||
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
|
||||
|
||||
Addon::reload();
|
||||
|
||||
// Only poll from those with suitable relationships,
|
||||
// and which have a polling address and ignore Diaspora since
|
||||
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
|
||||
|
||||
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
|
||||
if ($abandon_days < 1) {
|
||||
$abandon_days = 0;
|
||||
}
|
||||
$abandon_sql = (($abandon_days)
|
||||
? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
|
||||
: ''
|
||||
);
|
||||
|
||||
$contacts = q("SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`, `contact`.`archive`,
|
||||
$sql = "SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`, `contact`.`archive`,
|
||||
`contact`.`last-update`, `contact`.`priority`, `contact`.`rel`, `contact`.`subhub`
|
||||
FROM `user`
|
||||
STRAIGHT_JOIN `contact`
|
||||
ON `contact`.`uid` = `user`.`uid` AND `contact`.`poll` != ''
|
||||
AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra
|
||||
AND `contact`.`network` IN (?, ?, ?, ?)
|
||||
AND NOT `contact`.`self` AND NOT `contact`.`blocked`
|
||||
WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
|
||||
DBA::escape(Protocol::ACTIVITYPUB),
|
||||
DBA::escape(Protocol::DFRN),
|
||||
DBA::escape(Protocol::OSTATUS),
|
||||
DBA::escape(Protocol::DIASPORA),
|
||||
DBA::escape(Protocol::FEED),
|
||||
DBA::escape(Protocol::MAIL)
|
||||
);
|
||||
AND `contact`.`rel` != ?
|
||||
WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed`";
|
||||
|
||||
$parameters = [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Contact::FOLLOWER];
|
||||
|
||||
// Only poll from those with suitable relationships,
|
||||
// and which have a polling address and ignore Diaspora since
|
||||
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
|
||||
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
|
||||
if ($abandon_days < 1) {
|
||||
$abandon_days = 0;
|
||||
}
|
||||
|
||||
if (!empty($abandon_days)) {
|
||||
$sql .= " AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL ? DAY";
|
||||
$parameters[] = $abandon_days;
|
||||
}
|
||||
|
||||
$contacts = DBA::p($sql, $parameters);
|
||||
|
||||
if (!DBA::isResult($contacts)) {
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($contacts as $contact) {
|
||||
|
||||
if ($manual_id) {
|
||||
$contact['last-update'] = DBA::NULL_DATETIME;
|
||||
}
|
||||
|
||||
while ($contact = DBA::fetch($contacts)) {
|
||||
// Friendica and OStatus are checked once a day
|
||||
if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
|
||||
$contact['priority'] = 2;
|
||||
}
|
||||
|
||||
if ($contact['subhub'] && in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
|
||||
/*
|
||||
* We should be getting everything via a hub. But just to be sure, let's check once a day.
|
||||
* (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
|
||||
* This also lets us update our subscription to the hub, and add or replace hubs in case it
|
||||
* changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
|
||||
*/
|
||||
$poll_interval = Config::get('system', 'pushpoll_frequency');
|
||||
$contact['priority'] = (!is_null($poll_interval) ? intval($poll_interval) : 3);
|
||||
}
|
||||
|
||||
// Check ActivityPub and Diaspora contacts or followers once a week
|
||||
if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DIASPORA]) || ($contact["rel"] == Contact::FOLLOWER)) {
|
||||
$contact['priority'] = 4;
|
||||
$contact['priority'] = 3;
|
||||
}
|
||||
|
||||
// Check archived contacts once a month
|
||||
|
|
@ -224,7 +199,7 @@ class Cron
|
|||
$contact['priority'] = 5;
|
||||
}
|
||||
|
||||
if (($contact['priority'] >= 0) && !$force) {
|
||||
if ($contact['priority'] >= 0) {
|
||||
$update = false;
|
||||
|
||||
$t = $contact['last-update'];
|
||||
|
|
@ -282,5 +257,6 @@ class Cron
|
|||
|
||||
Worker::add(['priority' => $priority, 'dont_fork' => true, 'force_priority' => true], 'OnePoll', (int)$contact['id']);
|
||||
}
|
||||
DBA::close($contacts);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ use Friendica\Core\Logger;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\APContact;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
use Friendica\Protocol\Email;
|
||||
use Friendica\Protocol\PortableContact;
|
||||
|
|
@ -41,6 +41,9 @@ class OnePoll
|
|||
return;
|
||||
}
|
||||
|
||||
if ($force) {
|
||||
Contact::updateFromProbe($contact_id, true);
|
||||
}
|
||||
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
|
||||
if (!DBA::isResult($contact)) {
|
||||
|
|
@ -56,98 +59,28 @@ class OnePoll
|
|||
|
||||
$importer_uid = $contact['uid'];
|
||||
|
||||
$updated = DateTimeFormat::utcNow();
|
||||
|
||||
if ($importer_uid == 0) {
|
||||
Logger::log('Ignore public contacts');
|
||||
|
||||
// set the last-update so we don't keep polling
|
||||
DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
|
||||
return;
|
||||
}
|
||||
|
||||
// Possibly switch the remote contact to AP
|
||||
if ($protocol === Protocol::OSTATUS) {
|
||||
ActivityPub\Receiver::switchContact($contact['id'], $importer_uid, $contact['url']);
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
|
||||
}
|
||||
|
||||
$updated = DateTimeFormat::utcNow();
|
||||
|
||||
// These three networks can be able to speak AP, so we are trying to fetch AP profile data here
|
||||
if (in_array($protocol, [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN])) {
|
||||
$apcontact = APContact::getByURL($contact['url'], true);
|
||||
|
||||
if (($protocol === Protocol::ACTIVITYPUB) && empty($apcontact)) {
|
||||
self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
|
||||
Contact::markForArchival($contact);
|
||||
Logger::log('Contact archived');
|
||||
return;
|
||||
} elseif (!empty($apcontact)) {
|
||||
$fields = ['last-update' => $updated, 'success_update' => $updated];
|
||||
self::updateContact($contact, $fields);
|
||||
Contact::unmarkForArchival($contact);
|
||||
}
|
||||
}
|
||||
|
||||
// Diaspora users, archived users and followers are only checked if they still exist.
|
||||
if (($protocol != Protocol::ACTIVITYPUB) && ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER))) {
|
||||
$last_updated = PortableContact::lastUpdated($contact["url"], true);
|
||||
|
||||
if ($last_updated) {
|
||||
Logger::log('Contact '.$contact['id'].' had last update on '.$last_updated, Logger::DEBUG);
|
||||
|
||||
// The last public item can be older than the last item we got
|
||||
if ($last_updated < $contact['last-item']) {
|
||||
$last_updated = $contact['last-item'];
|
||||
}
|
||||
|
||||
$fields = ['last-item' => DateTimeFormat::utc($last_updated), 'last-update' => $updated, 'success_update' => $updated];
|
||||
self::updateContact($contact, $fields);
|
||||
Contact::unmarkForArchival($contact);
|
||||
} else {
|
||||
self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
|
||||
Contact::markForArchival($contact);
|
||||
Logger::log('Contact archived');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Update the contact entry
|
||||
if (in_array($protocol, [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
|
||||
// Currently we can't check every AP implementation, so we don't do it at all
|
||||
if (($protocol != Protocol::ACTIVITYPUB) && !PortableContact::reachable($contact['url'])) {
|
||||
Logger::log("Skipping probably dead contact ".$contact['url']);
|
||||
|
||||
// set the last-update so we don't keep polling
|
||||
self::updateContact($contact, ['last-update' => $updated]);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Contact::updateFromProbe($contact["id"])) {
|
||||
// set the last-update so we don't keep polling
|
||||
self::updateContact($contact, ['last-update' => $updated]);
|
||||
Contact::markForArchival($contact);
|
||||
Logger::log('Contact archived');
|
||||
return;
|
||||
} else {
|
||||
$fields = ['last-update' => $updated, 'success_update' => $updated];
|
||||
self::updateContact($contact, $fields);
|
||||
Contact::unmarkForArchival($contact);
|
||||
}
|
||||
}
|
||||
|
||||
// load current friends if possible.
|
||||
if (!empty($contact['poco']) && ($contact['success_update'] > $contact['failure_update'])) {
|
||||
$r = q("SELECT count(*) AS total FROM glink
|
||||
WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
|
||||
intval($contact['id'])
|
||||
);
|
||||
if (DBA::isResult($r)) {
|
||||
if (!$r[0]['total']) {
|
||||
if (!DBA::exists('glink', ["`cid` = ? AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", $contact['id']])) {
|
||||
PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// We don't poll our followers
|
||||
if ($contact["rel"] == Contact::FOLLOWER) {
|
||||
Logger::log("Don't poll follower");
|
||||
|
||||
// set the last-update so we don't keep polling
|
||||
DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
|
||||
return;
|
||||
}
|
||||
|
||||
// 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')) {
|
||||
|
|
@ -167,19 +100,9 @@ class OnePoll
|
|||
return;
|
||||
}
|
||||
|
||||
if ($importer_uid == 0) {
|
||||
Logger::log('Ignore public contacts');
|
||||
$importer = User::getOwnerDataById($importer_uid);
|
||||
|
||||
// set the last-update so we don't keep polling
|
||||
DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
|
||||
return;
|
||||
}
|
||||
|
||||
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||
intval($importer_uid)
|
||||
);
|
||||
|
||||
if (!DBA::isResult($r)) {
|
||||
if (empty($importer)) {
|
||||
Logger::log('No self contact for user '.$importer_uid);
|
||||
|
||||
// set the last-update so we don't keep polling
|
||||
|
|
@ -187,7 +110,6 @@ class OnePoll
|
|||
return;
|
||||
}
|
||||
|
||||
$importer = $r[0];
|
||||
$url = '';
|
||||
$xml = false;
|
||||
|
||||
|
|
@ -203,14 +125,120 @@ class OnePoll
|
|||
$hub_update = false;
|
||||
}
|
||||
|
||||
$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
|
||||
? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
|
||||
: DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
|
||||
);
|
||||
|
||||
Logger::log("poll: ({$protocol}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
|
||||
|
||||
$xml = '';
|
||||
|
||||
if ($protocol === Protocol::DFRN) {
|
||||
$xml = self::pollDFRN($contact, $updated);
|
||||
} elseif (($protocol === Protocol::OSTATUS)
|
||||
|| ($protocol === Protocol::DIASPORA)
|
||||
|| ($protocol === Protocol::FEED)) {
|
||||
$xml = self::pollFeed($contact, $protocol, $updated);
|
||||
} elseif ($protocol === Protocol::MAIL) {
|
||||
self::pollMail($contact, $importer_uid, $updated);
|
||||
}
|
||||
|
||||
if (!empty($xml)) {
|
||||
Logger::log('received xml : ' . $xml, Logger::DATA);
|
||||
if (!strstr($xml, '<')) {
|
||||
Logger::log('post_handshake: response from ' . $url . ' did not contain XML.');
|
||||
|
||||
$fields = ['last-update' => $updated, 'failure_update' => $updated];
|
||||
self::updateContact($contact, $fields);
|
||||
Contact::markForArchival($contact);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Logger::log("Consume feed of contact ".$contact['id']);
|
||||
|
||||
consume_feed($xml, $importer, $contact, $hub);
|
||||
|
||||
// do it a second time for DFRN so that any children find their parents.
|
||||
if ($protocol === Protocol::DFRN) {
|
||||
consume_feed($xml, $importer, $contact, $hub);
|
||||
}
|
||||
|
||||
$hubmode = 'subscribe';
|
||||
if ($protocol === Protocol::DFRN || $contact['blocked']) {
|
||||
$hubmode = 'unsubscribe';
|
||||
}
|
||||
|
||||
if (($protocol === Protocol::OSTATUS || $protocol == Protocol::FEED) && (! $contact['hub-verify'])) {
|
||||
$hub_update = true;
|
||||
}
|
||||
|
||||
if ($force) {
|
||||
$hub_update = true;
|
||||
}
|
||||
|
||||
Logger::log("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$protocol." Relation: ".$contact['rel']." Update: ".$hub_update);
|
||||
|
||||
if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $protocol == Protocol::FEED)) {
|
||||
Logger::log('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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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]);
|
||||
}
|
||||
|
||||
Logger::log('End');
|
||||
return;
|
||||
}
|
||||
|
||||
private static function RemoveReply($subject)
|
||||
{
|
||||
while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
|
||||
$subject = trim(substr($subject, 4));
|
||||
}
|
||||
|
||||
return $subject;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief 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
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function updateContact(array $contact, array $fields)
|
||||
{
|
||||
DBA::update('contact', $fields, ['id' => $contact['id']]);
|
||||
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Poll DFRN contacts
|
||||
*
|
||||
* @param array $contact The personal contact entry
|
||||
* @param string $updated The updated date
|
||||
* @return string polled XML
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function pollDFRN(array $contact, $updated)
|
||||
{
|
||||
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
||||
if (intval($contact['duplex']) && $contact['dfrn-id']) {
|
||||
$idtosend = '0:' . $orig_id;
|
||||
|
|
@ -223,12 +251,16 @@ class OnePoll
|
|||
$perm = 'rw';
|
||||
|
||||
// But this may be our first communication, so set the writable flag if it isn't set already.
|
||||
|
||||
if (!intval($contact['writable'])) {
|
||||
$fields = ['writable' => true];
|
||||
DBA::update('contact', $fields, ['id' => $contact['id']]);
|
||||
}
|
||||
|
||||
$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
|
||||
? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
|
||||
: DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
|
||||
);
|
||||
|
||||
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
|
||||
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
|
||||
. '&type=data&last_update=' . $last_update
|
||||
|
|
@ -241,7 +273,7 @@ class OnePoll
|
|||
self::updateContact($contact, ['last-update' => $updated]);
|
||||
Contact::markForArchival($contact);
|
||||
Logger::log('Contact archived');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
$handshake_xml = $curlResult->getBody();
|
||||
|
|
@ -259,7 +291,7 @@ class OnePoll
|
|||
$fields = ['last-update' => $updated, 'failure_update' => $updated];
|
||||
self::updateContact($contact, $fields);
|
||||
Contact::markForArchival($contact);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!strstr($handshake_xml, '<')) {
|
||||
|
|
@ -268,10 +300,9 @@ class OnePoll
|
|||
$fields = ['last-update' => $updated, 'failure_update' => $updated];
|
||||
self::updateContact($contact, $fields);
|
||||
Contact::markForArchival($contact);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$res = XML::parseString($handshake_xml);
|
||||
|
||||
if (intval($res->status) == 1) {
|
||||
|
|
@ -290,7 +321,7 @@ class OnePoll
|
|||
// set the last-update so we don't keep polling
|
||||
DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
|
||||
Logger::log('Contact status is ' . $res->status);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
|
||||
|
|
@ -323,7 +354,7 @@ class OnePoll
|
|||
// Since we mostly don't use it anyway, we won't dig into it deeper, but simply ignore it.
|
||||
if (empty($final_dfrn_id) || empty($orig_id)) {
|
||||
Logger::log('Contact has got no ID - quitting');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($final_dfrn_id != $orig_id) {
|
||||
|
|
@ -333,19 +364,27 @@ class OnePoll
|
|||
// set the last-update so we don't keep polling
|
||||
DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
|
||||
Contact::markForArchival($contact);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
$postvars['dfrn_id'] = $idtosend;
|
||||
$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
|
||||
$postvars['perm'] = 'rw';
|
||||
|
||||
$xml = Network::post($contact['poll'], $postvars)->getBody();
|
||||
|
||||
} elseif (($protocol === Protocol::OSTATUS)
|
||||
|| ($protocol === Protocol::DIASPORA)
|
||||
|| ($protocol === Protocol::FEED)) {
|
||||
return Network::post($contact['poll'], $postvars)->getBody();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Poll Feed/OStatus contacts
|
||||
*
|
||||
* @param array $contact The personal contact entry
|
||||
* @param string $protocol The used protocol of the contact
|
||||
* @param string $updated The updated date
|
||||
* @return string polled XML
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function pollFeed(array $contact, $protocol, $updated)
|
||||
{
|
||||
// Upgrading DB fields from an older Friendica version
|
||||
// Will only do this once per notify-enabled OStatus contact
|
||||
// or if relationship changes
|
||||
|
|
@ -367,7 +406,7 @@ class OnePoll
|
|||
// set the last-update so we don't keep polling
|
||||
DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
|
||||
Logger::log('Contact is blocked or only a follower');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
|
||||
|
|
@ -379,12 +418,22 @@ class OnePoll
|
|||
self::updateContact($contact, ['last-update' => $updated]);
|
||||
Contact::markForArchival($contact);
|
||||
Logger::log('Contact archived');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
$xml = $curlResult->getBody();
|
||||
return $curlResult->getBody();
|
||||
}
|
||||
|
||||
} elseif ($protocol === Protocol::MAIL) {
|
||||
/**
|
||||
* @brief Poll Mail contacts
|
||||
*
|
||||
* @param array $contact The personal contact entry
|
||||
* @param integer $importer_uid The UID of the importer
|
||||
* @param string $updated The updated date
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function pollMail(array $contact, $importer_uid, $updated)
|
||||
{
|
||||
Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG);
|
||||
|
||||
$mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
|
||||
|
|
@ -419,7 +468,10 @@ class OnePoll
|
|||
}
|
||||
}
|
||||
|
||||
if ($mbox) {
|
||||
if (!$mbox) {
|
||||
return;
|
||||
}
|
||||
|
||||
$msgs = Email::poll($mbox, $contact['addr']);
|
||||
|
||||
if (count($msgs)) {
|
||||
|
|
@ -480,7 +532,6 @@ class OnePoll
|
|||
continue;
|
||||
}
|
||||
|
||||
|
||||
// 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) : '');
|
||||
if (!trim($raw_refs)) {
|
||||
|
|
@ -584,7 +635,7 @@ class OnePoll
|
|||
if ($datarray['parent-uri'] === $datarray['uri']) {
|
||||
$datarray['private'] = 1;
|
||||
}
|
||||
if (($protocol === Protocol::MAIL) && !PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
|
||||
if (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
|
||||
$datarray['private'] = 1;
|
||||
$datarray['allow_cid'] = '<' . $contact['id'] . '>';
|
||||
}
|
||||
|
|
@ -621,94 +672,3 @@ class OnePoll
|
|||
imap_close($mbox);
|
||||
}
|
||||
}
|
||||
|
||||
if ($xml) {
|
||||
Logger::log('received xml : ' . $xml, Logger::DATA);
|
||||
if (!strstr($xml, '<')) {
|
||||
Logger::log('post_handshake: response from ' . $url . ' did not contain XML.');
|
||||
|
||||
$fields = ['last-update' => $updated, 'failure_update' => $updated];
|
||||
self::updateContact($contact, $fields);
|
||||
Contact::markForArchival($contact);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Logger::log("Consume feed of contact ".$contact['id']);
|
||||
|
||||
consume_feed($xml, $importer, $contact, $hub);
|
||||
|
||||
// do it a second time for DFRN so that any children find their parents.
|
||||
if ($protocol === Protocol::DFRN) {
|
||||
consume_feed($xml, $importer, $contact, $hub);
|
||||
}
|
||||
|
||||
$hubmode = 'subscribe';
|
||||
if ($protocol === Protocol::DFRN || $contact['blocked']) {
|
||||
$hubmode = 'unsubscribe';
|
||||
}
|
||||
|
||||
if (($protocol === Protocol::OSTATUS || $protocol == Protocol::FEED) && (! $contact['hub-verify'])) {
|
||||
$hub_update = true;
|
||||
}
|
||||
|
||||
if ($force) {
|
||||
$hub_update = true;
|
||||
}
|
||||
|
||||
Logger::log("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$protocol." Relation: ".$contact['rel']." Update: ".$hub_update);
|
||||
|
||||
if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $protocol == Protocol::FEED)) {
|
||||
Logger::log('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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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]);
|
||||
}
|
||||
|
||||
Logger::log('End');
|
||||
return;
|
||||
}
|
||||
|
||||
private static function RemoveReply($subject)
|
||||
{
|
||||
while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
|
||||
$subject = trim(substr($subject, 4));
|
||||
}
|
||||
|
||||
return $subject;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief 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
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function updateContact(array $contact, array $fields)
|
||||
{
|
||||
DBA::update('contact', $fields, ['id' => $contact['id']]);
|
||||
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,16 +13,12 @@ use Friendica\Database\DBA;
|
|||
|
||||
class UpdateContact
|
||||
{
|
||||
public static function execute($contact_id)
|
||||
public static function execute($contact_id, $command = '')
|
||||
{
|
||||
$success = Contact::updateFromProbe($contact_id);
|
||||
// Update the "updated" field if the contact could be probed.
|
||||
// We don't do this in the function above, since we don't want to
|
||||
// update the contact whenever that function is called from anywhere.
|
||||
if ($success) {
|
||||
DBA::update('contact', ['updated' => DateTimeFormat::utcNow()], ['id' => $contact_id]);
|
||||
}
|
||||
$force = ($command == "force");
|
||||
|
||||
Logger::info('Updated from probe', ['id' => $contact_id, 'success' => $success]);
|
||||
$success = Contact::updateFromProbe($contact_id, '', $force);
|
||||
|
||||
Logger::info('Updated from probe', ['id' => $contact_id, 'force' => $force, 'success' => $success]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,12 +55,12 @@ class ApiTest extends DatabaseTest
|
|||
$configLoader = new ConfigFileLoader($basePath, $mode);
|
||||
$configCache = Factory\ConfigFactory::createCache($configLoader);
|
||||
$profiler = Factory\ProfilerFactory::create($configCache);
|
||||
Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$database = Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$config = Factory\ConfigFactory::createConfig($configCache);
|
||||
Factory\ConfigFactory::createPConfig($configCache);
|
||||
$logger = Factory\LoggerFactory::create('test', $config, $profiler);
|
||||
$logger = Factory\LoggerFactory::create('test', $database, $config, $profiler);
|
||||
$baseUrl = new BaseURL($config, $_SERVER);
|
||||
$this->app = new App($config, $mode, $router, $baseUrl, $logger, $profiler, false);
|
||||
$this->app = new App($database, $config, $mode, $router, $baseUrl, $logger, $profiler, false);
|
||||
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ class BBCodeTest extends MockedTest
|
|||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'url')
|
||||
->andReturn('friendica.local');
|
||||
$this->configMock->shouldReceive('get')
|
||||
->with('system', 'no_smilies')
|
||||
->andReturn(false);
|
||||
$this->mockL10nT();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@ class DBATest extends DatabaseTest
|
|||
$configLoader = new ConfigFileLoader($basePath, $mode);
|
||||
$configCache = Factory\ConfigFactory::createCache($configLoader);
|
||||
$profiler = Factory\ProfilerFactory::create($configCache);
|
||||
Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$database = Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$config = Factory\ConfigFactory::createConfig($configCache);
|
||||
Factory\ConfigFactory::createPConfig($configCache);
|
||||
$logger = Factory\LoggerFactory::create('test', $config, $profiler);
|
||||
$logger = Factory\LoggerFactory::create('test', $database, $config, $profiler);
|
||||
$baseUrl = new BaseURL($config, $_SERVER);
|
||||
$this->app = new App($config, $mode, $router, $baseUrl, $logger, $profiler, false);
|
||||
$this->app = new App($database, $config, $mode, $router, $baseUrl, $logger, $profiler, false);
|
||||
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@ class DBStructureTest extends DatabaseTest
|
|||
$configLoader = new ConfigFileLoader($basePath, $mode);
|
||||
$configCache = Factory\ConfigFactory::createCache($configLoader);
|
||||
$profiler = Factory\ProfilerFactory::create($configCache);
|
||||
Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$database = Factory\DBFactory::init($configCache, $profiler, $_SERVER);
|
||||
$config = Factory\ConfigFactory::createConfig($configCache);
|
||||
Factory\ConfigFactory::createPConfig($configCache);
|
||||
$logger = Factory\LoggerFactory::create('test', $config, $profiler);
|
||||
$logger = Factory\LoggerFactory::create('test', $database, $config, $profiler);
|
||||
$baseUrl = new BaseURL($config, $_SERVER);
|
||||
$this->app = new App($config, $mode, $router, $baseUrl, $logger, $profiler, false);
|
||||
$this->app = new App($database, $config, $mode, $router, $baseUrl, $logger, $profiler, false);
|
||||
|
||||
parent::setUp();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue