aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-12-02 07:35:08 -0800
committerfabrixxm <fabrix.xm@gmail.com>2011-12-02 07:35:08 -0800
commite36bdd5c8901803996e8c24b05efebe03e5175c2 (patch)
tree07e49f0c8b3de1cc7e46cb9c598563fd1d0a44b7
parent7faa6c3e938b78dc2c7931f1bbe8d858db488720 (diff)
parentccc8486544facdb2c83dd5d273b14b24a74a6f5d (diff)
downloadvolse-hubzilla-e36bdd5c8901803996e8c24b05efebe03e5175c2.tar.gz
volse-hubzilla-e36bdd5c8901803996e8c24b05efebe03e5175c2.tar.bz2
volse-hubzilla-e36bdd5c8901803996e8c24b05efebe03e5175c2.zip
Merge pull request #11 from fabrixxm/master
mention notification in ping
-rw-r--r--mod/ping.php23
1 files changed, 19 insertions, 4 deletions
diff --git a/mod/ping.php b/mod/ping.php
index df07cb768..e74ef8314 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -7,6 +7,7 @@ function ping_init(&$a) {
header("Content-type: text/xml");
echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
<result>";
+
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
if(local_user()){
@@ -17,10 +18,11 @@ function ping_init(&$a) {
$dislikes = array();
$friends = array();
$posts = array();
+ $cit = array();
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, `item`.`body`,
`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
@@ -29,6 +31,8 @@ function ping_init(&$a) {
intval(local_user())
);
+
+
$network = count($r);
foreach ($r as $it) {
switch($it['verb']){
@@ -49,8 +53,11 @@ function ping_init(&$a) {
$friends[] = $it;
break;
default:
+ $reg = "|@\[url=".$a->get_baseurl()."/profile/".$a->user['nickname']."|";
if ($it['parent']!=$it['id']) {
$comments[] = $it;
+ } else if(preg_match( $reg, $it['body'])){
+ $cit[] = $it;
} else {
$posts[] = $it;
}
@@ -86,6 +93,9 @@ function ping_init(&$a) {
break;
default:
if ($it['parent']!=$it['id']) $comments[] = $it;
+ if(preg_match("/@\[[^]]*\]".$a->user['username']."/", $it['body'])){
+ $cit[] = $it;
+ }
}
}
@@ -140,12 +150,12 @@ function ping_init(&$a) {
<home>$home</home>";
if ($register!=0) echo "<register>$register</register>";
- $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
+ $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags)+count($cit);
echo ' <notif count="'.$tot.'">';
if ($intro>0){
foreach ($intros as $i) {
- echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
+ echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
};
}
if ($mail>0){
@@ -181,7 +191,7 @@ function ping_init(&$a) {
}
if (count($posts)){
foreach ($posts as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} posted") ) );
+ echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), t("{0} posted") );
};
}
if (count($tags)){
@@ -189,6 +199,11 @@ function ping_init(&$a) {
echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) );
};
}
+ if (count($cit)){
+ foreach ($cit as $i) {
+ echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), t("{0} mentioned you in a post") );
+ };
+ }
echo " </notif>";
}