Merge remote-tracking branch 'upstream/develop' into 1607-performance

[friendica.git] / mod / nodeinfo.php

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index b90e05174e402a6b1e2ae52a1702d3f8a748333e..334dcb055d6c3868c43016e6c864d60ef3ce2222 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -185,20 +185,13 @@ function nodeinfo_cron() {
        }
 */        logger("cron_start");
 
-       $users = q("SELECT profile.*, `user`.`login_date`, `lastitem`.`lastitem_date`
-                       FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
-                               FROM `item`
-                                       WHERE `item`.`type` = 'wall'
-                                               GROUP BY `item`.`uid`) AS `lastitem`
-                                               RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`, `contact`, `profile`
-                                WHERE
-                                       `user`.`uid` = `contact`.`uid` AND `profile`.`uid` = `user`.`uid`
-                                       AND `profile`.`is-default` AND (`profile`.`publish` OR `profile`.`net-publish`)
-                                       AND `user`.`verified` AND `contact`.`self`
-                                       AND NOT `user`.`blocked`
-                                       AND NOT `user`.`account_removed`
-                                       AND NOT `user`.`account_expired`");
-
+       $users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
+                       FROM `user`
+                       INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid` AND `profile`.`is-default`
+                       INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
+                       WHERE (`profile`.`publish` OR `profile`.`net-publish`) AND `user`.`verified`
+                               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;
@@ -209,11 +202,11 @@ function nodeinfo_cron() {
 
                        foreach ($users AS $user) {
                                if ((strtotime($user['login_date']) > $halfyear) OR
-                                       (strtotime($user['lastitem_date']) > $halfyear))
+                                       (strtotime($user['last-item']) > $halfyear))
                                        ++$active_users_halfyear;
 
                                if ((strtotime($user['login_date']) > $month) OR
-                                       (strtotime($user['lastitem_date']) > $month))
+                                       (strtotime($user['last-item']) > $month))
                                        ++$active_users_monthly;
 
                        }
@@ -224,20 +217,9 @@ function nodeinfo_cron() {
                        set_config('nodeinfo','active_users_monthly', $active_users_monthly);
        }
 
-//     $posts = q("SELECT COUNT(*) AS `local_posts` FROM `thread`
-//                     INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND `contact`.`uid` = `thread`.`uid`
-//                     WHERE `contact`.`self`");
-       $posts = q("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall`");
-/*
-       $posts = q("SELECT COUNT(*) AS local_posts FROM `thread`
-                       INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                       WHERE `thread`.`wall` AND NOT `thread`.`private` AND
-                       `thread`.`uid` != 0 AND LEFT(`item`.`body`, 6) != '[share' AND
-                       `thread`.`network` IN ('%s', '%s', '%s')",
-                       dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
-*/
+       $posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall`");
 /*
-       $posts = q("SELECT COUNT(*) AS `local_posts` FROM `item`
+       $posts = qu("SELECT COUNT(*) AS `local_posts` FROM `item`
                        INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        WHERE `contact`.`self` and `item`.`id` = `item`.`parent` AND left(body, 6) != '[share' AND `item`.`network` IN ('%s', '%s', '%s')",
                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
@@ -251,7 +233,7 @@ function nodeinfo_cron() {
 
         logger("local_posts: ".$local_posts, LOGGER_DEBUG);
 
-       $posts = q("SELECT COUNT(*) AS `local_comments` FROM `item`
+       $posts = qu("SELECT COUNT(*) AS `local_comments` FROM `item`
                        INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        WHERE `contact`.`self` and `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')",
                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));