From 89a20ddbd7b268ef374ad3fe6705e3ac04a68364 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 22 May 2018 20:10:18 +0000 Subject: [PATCH] Nodeinfo: The number of comments is now calculated more reliable --- mod/nodeinfo.php | 81 ++++++++++++++--------------------------- src/Worker/Cron.php | 14 +++---- src/Worker/CronJobs.php | 2 - 3 files changed, 35 insertions(+), 62 deletions(-) diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php index 5cadc41c49..134c690ce1 100644 --- a/mod/nodeinfo.php +++ b/mod/nodeinfo.php @@ -10,6 +10,7 @@ use Friendica\Core\Addon; use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Util\Network; +require_once 'include/dba.php'; function nodeinfo_wellknown(App $a) { $nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0', @@ -153,7 +154,7 @@ function nodeinfo_cron() { $a = get_app(); - // If the addon 'statistics_json' is enabled then disable it and actrivate nodeinfo. + // If the addon 'statistics_json' is enabled then disable it and activate nodeinfo. if (Addon::isEnabled('statistics_json')) { Config::set('system', 'nodeinfo', true); @@ -176,17 +177,8 @@ function nodeinfo_cron() { if (!Config::get('system', 'nodeinfo')) { return; } - $last = Config::get('nodeinfo', 'last_calucation'); - if ($last) { - // Calculate every 24 hours - $next = $last + (24 * 60 * 60); - if ($next > time()) { - logger('calculation intervall not reached'); - return; - } - } - logger('cron_start'); + logger('cron_start'); $users = q("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item` FROM `user` @@ -196,60 +188,43 @@ function nodeinfo_cron() { AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND NOT `user`.`account_expired`"); if (is_array($users)) { - $total_users = count($users); - $active_users_halfyear = 0; - $active_users_monthly = 0; + $total_users = count($users); + $active_users_halfyear = 0; + $active_users_monthly = 0; - $halfyear = time() - (180 * 24 * 60 * 60); - $month = time() - (30 * 24 * 60 * 60); + $halfyear = time() - (180 * 24 * 60 * 60); + $month = time() - (30 * 24 * 60 * 60); - foreach ($users AS $user) { - if ((strtotime($user['login_date']) > $halfyear) || - (strtotime($user['last-item']) > $halfyear)) { - ++$active_users_halfyear; - } - if ((strtotime($user['login_date']) > $month) || - (strtotime($user['last-item']) > $month)) { - ++$active_users_monthly; - } + foreach ($users AS $user) { + if ((strtotime($user['login_date']) > $halfyear) || + (strtotime($user['last-item']) > $halfyear)) { + ++$active_users_halfyear; } - Config::set('nodeinfo', 'total_users', $total_users); - logger('total_users: '.$total_users, LOGGER_DEBUG); + if ((strtotime($user['login_date']) > $month) || + (strtotime($user['last-item']) > $month)) { + ++$active_users_monthly; + } + } + Config::set('nodeinfo', 'total_users', $total_users); + Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear); + Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly); - Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear); - Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly); + logger('total_users: ' . $total_users . '/' . $active_users_halfyear. '/' . $active_users_monthly, LOGGER_DEBUG); } - $posts = q("SELECT COUNT(*) AS `local_posts` FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0"); - - if (!is_array($posts)) { - $local_posts = -1; - } else { - $local_posts = $posts[0]['local_posts']; - } + $local_posts = dba::count('thread', ["`wall` AND NOT `deleted` AND `uid` != 0"]); Config::set('nodeinfo', 'local_posts', $local_posts); + logger('local_posts: ' . $local_posts, LOGGER_DEBUG); - logger('local_posts: '.$local_posts, LOGGER_DEBUG); - - $posts = q("SELECT COUNT(*) AS `local_comments` FROM `contact` - INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `item`.`uid` = `contact`.`uid` AND - `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s') - WHERE `contact`.`self`", - dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN)); - - if (!is_array($posts)) { - $local_comments = -1; - } else { - $local_comments = $posts[0]['local_comments']; - } + $local_comments = dba::count('item', ["`origin` AND `id` != `parent` AND NOT `deleted` AND `uid` != 0"]); Config::set('nodeinfo', 'local_comments', $local_comments); + logger('local_comments: ' . $local_comments, LOGGER_DEBUG); // Now trying to register $url = 'http://the-federation.info/register/'.$a->get_hostname(); - logger('registering url: '.$url, LOGGER_DEBUG); + logger('registering url: '.$url, LOGGER_DEBUG); $ret = Network::fetchUrl($url); - logger('registering answer: '.$ret, LOGGER_DEBUG); + logger('registering answer: '.$ret, LOGGER_DEBUG); - logger('cron_end'); - Config::set('nodeinfo', 'last_calucation', time()); + logger('cron_end'); } diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index 867a981748..b0337e7db5 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -58,9 +58,6 @@ Class Cron { // Call possible post update functions Worker::add(PRIORITY_LOW, "CronJobs", "post_update"); - // update nodeinfo data - Worker::add(PRIORITY_LOW, "CronJobs", "nodeinfo"); - // Clear cache entries Worker::add(PRIORITY_LOW, "CronJobs", "clear_cache"); @@ -79,20 +76,23 @@ Class Cron { Worker::add(PRIORITY_LOW, "CronJobs", "update_contact_birthdays"); + Worker::add(PRIORITY_LOW, "CronJobs", "update_photo_albums"); + + // update nodeinfo data + Worker::add(PRIORITY_LOW, "CronJobs", "nodeinfo"); + Worker::add(PRIORITY_LOW, "DiscoverPoCo", "update_server"); Worker::add(PRIORITY_LOW, "DiscoverPoCo", "suggestions"); - Config::set('system', 'last_expire_day', $d2); - Worker::add(PRIORITY_LOW, 'Expire'); Worker::add(PRIORITY_MEDIUM, 'DBClean'); - Worker::add(PRIORITY_LOW, "CronJobs", "update_photo_albums"); - // check upstream version? Worker::add(PRIORITY_LOW, 'CheckVersion'); + + Config::set('system', 'last_expire_day', $d2); } // Hourly cron calls diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php index ab4c4c6211..e843b5920e 100644 --- a/src/Worker/CronJobs.php +++ b/src/Worker/CronJobs.php @@ -26,8 +26,6 @@ class CronJobs { global $a; - require_once 'mod/nodeinfo.php'; - // No parameter set? So return if ($command == '') { return;