rework mod/ping and desktop notification logic

`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
This commit is contained in:
Fabrixxm 2015-06-25 10:02:26 +02:00
parent e29d05ce4a
commit 6fc864c947
7 changed files with 112 additions and 153 deletions

View File

@ -262,10 +262,12 @@ function relative_date($posted_date,$format = null) {
return t('less than a second ago'); return t('less than a second ago');
} }
/*
$time_append = ''; $time_append = '';
if ($etime >= 86400) { if ($etime >= 86400) {
$time_append = ' ('.$localtime.')'; $time_append = ' ('.$localtime.')';
} }
*/
$a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')), $a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')),
30 * 24 * 60 * 60 => array( t('month'), t('months')), 30 * 24 * 60 * 60 => array( t('month'), t('months')),
@ -283,7 +285,7 @@ function relative_date($posted_date,$format = null) {
// translators - e.g. 22 hours ago, 1 minute ago // translators - e.g. 22 hours ago, 1 minute ago
if(! $format) if(! $format)
$format = t('%1$d %2$s ago'); $format = t('%1$d %2$s ago');
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])).$time_append; return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
} }
} }
}} }}

View File

@ -186,13 +186,20 @@
var notification_id = 0; var notification_id = 0;
eNotif.children("note").each(function(){ eNotif.children("note").each(function(){
e = $(this); e = $(this);
text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>"); var text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen";
var html = notifications_tpl.format(e.attr('href'),
e.attr('photo'), // {0}
text, // {1}
e.attr('date'), // {2}
seenclass, // {3}
new Date(e.attr('timestamp')*1000) // {4}
);
nnm.append(html); nnm.append(html);
}); });
$(eNotif.children("note").get().reverse()).each(function(){ $(eNotif.children("note").get().reverse()).each(function(){
e = $(this); e = $(this);
notification_id = parseInt(e.attr('href').match(/\d+$/)[0]); notification_id = parseInt(e.attr('timestamp'));
if (notification_lastitem!== null && notification_id > notification_lastitem) { if (notification_lastitem!== null && notification_id > notification_lastitem) {
if (getNotificationPermission()==="granted") { if (getNotificationPermission()==="granted") {
var notification = new Notification(document.title, { var notification = new Notification(document.title, {

View File

@ -21,9 +21,7 @@ function ping_init(&$a) {
killme(); killme();
} }
$firehose = intval(get_pconfig(local_user(),'system','notify_full')); $notifs = ping_get_notifications(local_user());
$z = ping_get_notifications(local_user());
$sysnotify = 0; // we will update this in a moment $sysnotify = 0; // we will update this in a moment
$tags = array(); $tags = array();
@ -162,12 +160,23 @@ function ping_init(&$a) {
} }
/**
* return xml from notification array
*
* @param array $n Notification array:
* 'href' => notification link
* 'name' => subject name
* 'url' => subject url
* 'photo' => subject photo
* 'date' => notification date
* 'seen' => bool true/false
* 'message' => notification message. "{0}" will be replaced by subject name
**/
function xmlize($n){
$n['photo'] = proxy_url($n['photo']);
function xmlize($href, $name, $url, $photo, $date, $seen, $message){ $n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8");
$photo = proxy_url($photo); $n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8");
$message = html_entity_decode($message, ENT_COMPAT | ENT_HTML401, "UTF-8");
$name = html_entity_decode($name, ENT_COMPAT | ENT_HTML401, "UTF-8");
// Are the nofications calles from the regular process or via the friendica app? // Are the nofications calles from the regular process or via the friendica app?
$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_'])); $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
@ -175,13 +184,16 @@ function ping_init(&$a) {
$a = get_app(); $a = get_app();
if ($a->is_friendica_app() OR !$regularnotifications) if ($a->is_friendica_app() OR !$regularnotifications)
$message = str_replace("{0}", $name, $message); $n['message'] = str_replace("{0}", $n['name'], $n['message']);
$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message); $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
call_hooks('ping_xmlize', $data);
$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>'."\n"; call_hooks('ping_xmlize', $n);
$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
return sprintf ( $notsxml, return sprintf ( $notsxml,
xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message) xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
xmlify($n['message'])
); );
} }
@ -198,98 +210,78 @@ function ping_init(&$a) {
<birthdays>$birthdays</birthdays> <birthdays>$birthdays</birthdays>
<birthdays-today>$birthdays_today</birthdays-today>\r\n"; <birthdays-today>$birthdays_today</birthdays-today>\r\n";
$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
if($firehose) { if(count($notifs) && (! $sysnotify)) {
echo ' <notif count="'.$tot.'">'; foreach($notifs as $zz) {
} if($zz['seen'] == 0)
else { $sysnotify ++;
if(count($z) && (! $sysnotify)) {
foreach($z as $zz) {
if($zz['seen'] == 0)
$sysnotify ++;
}
}
echo ' <notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
if ($intro>0){
foreach ($intros as $i) {
echo xmlize($a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen', t("{0} wants to be your friend"));
};
}
if ($mail>0){
foreach ($mails as $i) {
echo xmlize($a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen', t("{0} sent you a message"));
};
}
if ($register>0){
foreach ($regs as $i) {
echo xmlize($a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen', t("{0} requested registration"));
};
}
if(count($z)) {
foreach($z as $zz) {
echo xmlize($a->get_baseurl() . '/notify/view/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), ($zz['seen'] ? 'notify-seen' : 'notify-unseen'), strip_tags(bbcode($zz['msg'])));
}
} }
} }
if($firehose) { echo ' <notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
if ($intro>0){
foreach ($intros as $i) {
echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") );
};
}
if ($mail>0){
foreach ($mails as $i) {
echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") );
};
}
if ($register>0){
foreach ($regs as $i) {
echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") );
};
}
if (count($comments)){ // merge all notification types in one array
foreach ($comments as $i) { if ($intro>0){
echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} commented %s's post"), $i['pname'] ) ); foreach ($intros as $i) {
}; $n = array(
} 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
if (count($likes)){ 'name' => $i['name'],
foreach ($likes as $i) { 'url' => $i['url'],
echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} liked %s's post"), $i['pname'] ) ); 'photo' => $i['photo'],
}; 'date' => $i['datetime'],
} 'seen' => false,
if (count($dislikes)){ 'message' => t("{0} wants to be your friend"),
foreach ($dislikes 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']), 'notify-unseen',sprintf( t("{0} disliked %s's post"), $i['pname'] ) ); $notifs[] = $n;
};
}
if (count($friends)){
foreach ($friends 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']), 'notify-unseen',sprintf( t("{0} is now friends with %s"), $i['fname'] ) );
};
}
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']), 'notify-unseen',sprintf( t("{0} posted") ) );
};
}
if (count($tags)){
foreach ($tags 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']), 'notify-unseen',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']), 'notify-unseen',t("{0} mentioned you in a post") );
};
} }
} }
if ($mail>0){
foreach ($mails as $i) {
$n = array(
'href' => $a->get_baseurl().'/message/'.$i['id'],
'name' => $i['from-name'],
'url' => $i['from-url'],
'photo' => $i['from-photo'],
'date' => $i['created'],
'seen' => false,
'message' => t("{0} sent you a message"),
);
$notifs[] = $n;
}
}
if ($register>0){
foreach ($regs as $i) {
$n = array(
'href' => $a->get_baseurl().'/admin/users/',
'name' => $i['name'],
'url' => $i['url'],
'photo' => $i['micro'],
'date' => $i['created'],
'seen' => false,
'message' => t("{0} requested registration"),
);
$notifs[] = $n;
}
}
// sort notifications by $[]['date']
$sort_function = function($a, $b) {
$adate = date($a['date']);
$bdate = date($b['date']);
if ($adate == $bdate) {
return 0;
}
return ($adate < $bdate) ? 1 : -1;
};
usort($notifs, $sort_function);
if(count($notifs)) {
foreach($notifs as $n) {
echo xmlize($n);
}
}
echo " </notif>"; echo " </notif>";
} }
@ -359,16 +351,18 @@ function ping_get_notifications($uid) {
if (is_null($notification["deleted"])) if (is_null($notification["deleted"]))
$notification["deleted"] = 0; $notification["deleted"] = 0;
$notification["msg"] = strip_tags(bbcode($notification["msg"])); $notification["message"] = strip_tags(bbcode($notification["msg"]));
$notification["name"] = strip_tags(bbcode($notification["name"])); $notification["name"] = strip_tags(bbcode($notification["name"]));
// Replace the name with {0} but ensure to make that only once // Replace the name with {0} but ensure to make that only once
// The {0} is used later and prints the name in bold. // The {0} is used later and prints the name in bold.
$pos = strpos($notification["msg"],$notification['name']); $pos = strpos($notification["message"],$notification['name']);
if ($pos !== false) if ($pos !== false)
$notification["msg"] = substr_replace($notification["msg"],"{0}",$pos,strlen($notification["name"])); $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
$notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id'];
if ($notification["visible"] AND !$notification["spam"] AND if ($notification["visible"] AND !$notification["spam"] AND
!$notification["deleted"] AND !is_array($result[$notification["parent"]])) { !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
$result[$notification["parent"]] = $notification; $result[$notification["parent"]] = $notification;
@ -377,14 +371,6 @@ function ping_get_notifications($uid) {
} while ((count($result) < 50) AND !$quit); } while ((count($result) < 50) AND !$quit);
// sort result by $[]['id'], inversed
$sort_function = function($a, $b) {
if ($a['id'] == $b['id']) {
return 0;
}
return ($a['id'] < $b['id']) ? 1 : -1;
};
usort($result, $sort_function);
return($result); return($result);
} }

View File

@ -65,5 +65,5 @@
</nav> </nav>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li> <li class="{4}"><a href="{0}" title="{5}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul> </ul>

View File

@ -67,5 +67,5 @@
</nav> </nav>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li> <li class="{4}"><a href="{0}" title="{5}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul> </ul>

View File

@ -109,7 +109,7 @@
</nav> </nav>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li> <li class="{4}"><a href="{0}" title="{5}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul> </ul>
<div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div> <div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div>

View File

@ -97,44 +97,8 @@
</nav> </nav>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li> <li class="{4}"><a href="{0}" title="{5}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul> </ul>
<!-- <!--
<div class="icon-flag" style="position: fixed; bottom: 10px; left: 20px; z-index:9;">{{$langselector}}</div> <div class="icon-flag" style="position: fixed; bottom: 10px; left: 20px; z-index:9;">{{$langselector}}</div>
--> -->
{{*
{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
<span id="nav-link-wrapper" >
{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
<a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
{{if $nav.notifications}}
<a id="nav-notify-link" class="nav-commlink {{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a>
<span id="notify-update" class="nav-ajax-left"></span>
{{/if}}
{{if $nav.messages}}
<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
<span id="mail-update" class="nav-ajax-left"></span>
{{/if}}
{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
</span>
<span id="nav-end"></span>
<span id="banner">{{$banner}}</span>
*}}