Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 07884f453088b045b8e15bbf6a1921dcad5d6a3d..6545ab458bc87936067436adae5c2ffceb9f0658 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -22,24 +22,24 @@ function ping_init(&$a) {
 
                $firehose = intval(get_pconfig(local_user(),'system','notify_full'));
 
-               $t = q("select count(*) as total from notify where uid = %d and seen = 0",
+               $t = q("select count(*) as `total` from `notify` where `uid` = %d and `seen` = 0 AND `msg` != '' GROUP BY `parent`",
                        intval(local_user())
                );
                if($t && intval($t[0]['total']) > 49) {
-                       $z = q("select * from notify where uid = %d
-                               and seen = 0 order by date desc limit 0, 50",
+                       $z = q("select * from notify where uid = %d AND `msg` != ''
+                               and seen = 0 GROUP BY `parent` order by date desc limit 0, 50",
                                intval(local_user())
                        );
                        $sysnotify = $t[0]['total'];
                }
                else {
-                       $z1 = q("select * from notify where uid = %d
-                               and seen = 0 order by date desc limit 0, 50",
+                       $z1 = q("select * from notify where uid = %d AND `msg` != ''
+                               and seen = 0 GROUP BY `parent` order by date desc limit 0, 50",
                                intval(local_user())
                        );
 
-                       $z2 = q("select * from notify where uid = %d
-                               and seen = 1 order by date desc limit 0, %d",
+                       $z2 = q("select * from notify where uid = %d AND `msg` != ''
+                               and seen = 1 GROUP BY `parent` order by date desc limit 0, %d",
                                intval(local_user()),
                                intval(50 - intval($t[0]['total']))
                        );
@@ -59,11 +59,11 @@ function ping_init(&$a) {
                $home = 0;
                $network = 0;
 
-               $r = q("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` 
+               $r = q("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`
-                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND 
+                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
                                 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
                                ORDER BY `item`.`created` DESC",
                        intval(local_user())
@@ -109,14 +109,14 @@ function ping_init(&$a) {
                        }
                }
 
-               $intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`, 
-                       `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` 
+               $intros1 = q("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`, 
-                       `contact`.`name`, `contact`.`url`, `contact`.`photo` 
+               $intros2 = q("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",
                        intval(local_user())
@@ -188,6 +188,8 @@ function ping_init(&$a) {
 
 
                function xmlize($href, $name, $url, $photo, $date, $seen, $message){
+                       require_once("mod/proxy.php");
+                       $photo = proxy_url($photo);
                        $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
                        call_hooks('ping_xmlize', $data);
                        $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';