Merge pull request #3343 from annando/1704-mastodon

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 1e1e7d8489e7fc63d635dc0587e2b57a2ba81fce..ba496a70bd87bdbbe7d00f6431077c8be192eabe 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -5,6 +5,7 @@ require_once('include/ForumManager.php');
 require_once('include/group.php');
 require_once('mod/proxy.php');
 require_once('include/xml.php');
+require_once('include/cache.php');
 
 /**
  * @brief Outputs the counts and the lists of various notifications
@@ -112,7 +113,7 @@ function ping_init(App $a)
 
                $notifs = ping_get_notifications(local_user());
 
-               $items_unseen = q("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
+               $items_unseen = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
                                `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
                                `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
                                FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id` = `item`.`parent`
@@ -161,13 +162,13 @@ function ping_init(App $a)
                        }
                }
 
-               $intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
+               $intros1 = qu("SELECT  `intro`.`id`, `intro`.`datetime`,
                        `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
                        FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
                        WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
                        intval(local_user())
                );
-               $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`,
+               $intros2 = qu("SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
                        FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
                        WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
@@ -175,10 +176,10 @@ function ping_init(App $a)
                );
 
                $intro_count = count($intros1) + count($intros2);
-               $intros = $intros1+$intros2;
+               $intros = $intros1 + $intros2;
 
-               $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
-               $mails = q("SELECT * FROM `mail`
+               $myurl = App::get_baseurl() . '/profile/' . $a->user['nickname'] ;
+               $mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
                        WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
                        intval(local_user()),
                        dbesc($myurl)
@@ -186,24 +187,32 @@ function ping_init(App $a)
                $mail_count = count($mails);
 
                if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-                       $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
+                       $regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
                                FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
                                WHERE `contact`.`self` = 1");
-                       if ($regs) {
+
+                       if (dbm::is_result($regs)) {
                                $register_count = $regs[0]['total'];
                        }
                }
 
-               $ev = q("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
-                       WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
-                       ORDER BY `start` ASC ",
-                       intval(local_user()),
-                       dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
-                       dbesc(datetime_convert('UTC', 'UTC', 'now'))
-               );
+               $cachekey = "ping_init:".local_user();
+               $ev = Cache::get($cachekey);
+               if (is_null($ev)) {
+                       $ev = qu("SELECT type, start, adjust FROM `event`
+                               WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
+                               ORDER BY `start` ASC ",
+                               intval(local_user()),
+                               dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
+                               dbesc(datetime_convert('UTC', 'UTC', 'now'))
+                       );
+                       if (dbm::is_result($ev)) {
+                               Cache::set($cachekey, $ev, CACHE_HOUR);
+                       }
+               }
 
                if (dbm::is_result($ev)) {
-                       $all_events = intval($ev[0]['total']);
+                       $all_events = count($ev);
 
                        if ($all_events) {
                                $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
@@ -252,7 +261,7 @@ function ping_init(App $a)
                if (dbm::is_result($intros)) {
                        foreach ($intros as $intro) {
                                $notif = array(
-                                       'href'    => $a->get_baseurl() . '/notifications/intros/' . $intro['id'],
+                                       'href'    => App::get_baseurl() . '/notifications/intros/' . $intro['id'],
                                        'name'    => $intro['name'],
                                        'url'     => $intro['url'],
                                        'photo'   => $intro['photo'],
@@ -267,7 +276,7 @@ function ping_init(App $a)
                if (dbm::is_result($mails)) {
                        foreach ($mails as $mail) {
                                $notif = array(
-                                       'href'    => $a->get_baseurl() . '/message/' . $mail['id'],
+                                       'href'    => App::get_baseurl() . '/message/' . $mail['id'],
                                        'name'    => $mail['from-name'],
                                        'url'     => $mail['from-url'],
                                        'photo'   => $mail['from-photo'],
@@ -282,7 +291,7 @@ function ping_init(App $a)
                if (dbm::is_result($regs)) {
                        foreach ($regs as $reg) {
                                $notif = array(
-                                       'href'    => $a->get_baseurl() . '/admin/users/',
+                                       'href'    => App::get_baseurl() . '/admin/users/',
                                        'name'    => $reg['name'],
                                        'url'     => $reg['url'],
                                        'photo'   => $reg['micro'],
@@ -400,7 +409,7 @@ function ping_get_notifications($uid)
        $a = get_app();
 
        do {
-               $r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
+               $r = qu("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
                        FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
                        WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
                        AND NOT (`notify`.`type` IN (%d, %d))
@@ -449,7 +458,7 @@ function ping_get_notifications($uid)
                                );
                        }
 
-                       $notification["href"] = $a->get_baseurl() . "/notify/view/" . $notification["id"];
+                       $notification["href"] = App::get_baseurl() . "/notify/view/" . $notification["id"];
 
                        if ($notification["visible"] AND !$notification["spam"] AND
                                !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {