Fixes:

[friendica.git] / mod / nodeinfo.php

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 5cadc41c4975c1a19debb1a3564b3016a04ac732..84a0bae09f34f5ef052d7e131b7fb061a674aa97 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -7,9 +7,11 @@
 
 use Friendica\App;
 use Friendica\Core\Addon;
-use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 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',
@@ -60,9 +62,9 @@ function nodeinfo_init(App $a) {
 
        $nodeinfo['usage'] = [];
 
-       $nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
+       $nodeinfo['openRegistrations'] = intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED;
 
-       $nodeinfo['metadata'] = ['nodeName' => $a->config['sitename']];
+       $nodeinfo['metadata'] = ['nodeName' => Config::get('config', 'sitename')];
 
        if (Config::get('system', 'nodeinfo')) {
 
@@ -140,6 +142,8 @@ function nodeinfo_init(App $a) {
                if (Addon::isEnabled('twitter')) {
                        $nodeinfo['metadata']['services']['inbound'][] = 'twitter';
                }
+
+               $nodeinfo['metadata']['explicitContent'] = Config::get('system', 'explicit_content', false) == true;
        }
 
        header('Content-type: application/json; charset=utf-8');
@@ -153,7 +157,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 +180,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 +191,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;
-
-                       $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;
-                               }
-                       }
-                       Config::set('nodeinfo', 'total_users', $total_users);
-                       logger('total_users: '.$total_users, LOGGER_DEBUG);
+               $total_users = count($users);
+               $active_users_halfyear = 0;
+               $active_users_monthly = 0;
 
-                       Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear);
-                       Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly);
-       }
+               $halfyear = time() - (180 * 24 * 60 * 60);
+               $month = time() - (30 * 24 * 60 * 60);
 
-       $posts = q("SELECT COUNT(*) AS `local_posts` FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
+               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;
+                       }
+               }
+               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);
 
-       if (!is_array($posts)) {
-               $local_posts = -1;
-       } else {
-               $local_posts = $posts[0]['local_posts'];
+               logger('total_users: ' . $total_users . '/' . $active_users_halfyear. '/' . $active_users_monthly, LOGGER_DEBUG);
        }
-       Config::set('nodeinfo', 'local_posts', $local_posts);
 
-        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));
+       $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);
 
-       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');
 }