harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow notification filtering by name or addr

Browse Source
This commit is contained in:
zotlabs 2018-11-30 19:03:14 -08:00
parent 6cade7d935
commit c6acb6191c
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Lib/Enotify.php
View File

@ -828,6 +828,7 @@ class Enotify {
$x = array( $x = array(
'notify_link' => $item['llink'], 'notify_link' => $item['llink'],
'name' => $item['author']['xchan_name'], 'name' => $item['author']['xchan_name'],
'addr' => $item['author']['xchan_addr'],
'url' => $item['author']['xchan_url'], 'url' => $item['author']['xchan_url'],
'photo' => $item['author']['xchan_photo_s'], 'photo' => $item['author']['xchan_photo_s'],
'when' => relative_date(($edit)? $item['edited'] : $item['created']), 'when' => relative_date(($edit)? $item['edited'] : $item['created']),

8
Zotlabs/Module/Ping.php
View File

@ -330,6 +330,7 @@ class Ping extends \Zotlabs\Web\Controller {
$notifs[] = array( $notifs[] = array(
'notify_link' => z_root() . '/mail/' . $zz['id'], 'notify_link' => z_root() . '/mail/' . $zz['id'],
'name' => $zz['xchan_name'], 'name' => $zz['xchan_name'],
'addr' => $zz['xchan_addr'],
'url' => $zz['xchan_url'], 'url' => $zz['xchan_url'],
'photo' => $zz['xchan_photo_s'], 'photo' => $zz['xchan_photo_s'],
'when' => relative_date($zz['created']), 'when' => relative_date($zz['created']),
@ -383,6 +384,7 @@ class Ping extends \Zotlabs\Web\Controller {
$result[] = array( $result[] = array(
'notify_link' => z_root() . '/connections/ifpending', 'notify_link' => z_root() . '/connections/ifpending',
'name' => $rr['xchan_name'], 'name' => $rr['xchan_name'],
'addr' => $rr['xchan_addr'],
'url' => $rr['xchan_url'], 'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'], 'photo' => $rr['xchan_photo_s'],
'when' => relative_date($rr['abook_created']), 'when' => relative_date($rr['abook_created']),
@ -407,6 +409,7 @@ class Ping extends \Zotlabs\Web\Controller {
$result[] = array( $result[] = array(
'notify_link' => z_root() . '/admin/accounts', 'notify_link' => z_root() . '/admin/accounts',
'name' => $rr['account_email'], 'name' => $rr['account_email'],
'addr' => $rr['account_email'],
'url' => '', 'url' => '',
'photo' => z_root() . '/' . get_default_profile_photo(48), 'photo' => z_root() . '/' . get_default_profile_photo(48),
'when' => relative_date($rr['account_created']), 'when' => relative_date($rr['account_created']),
@ -444,6 +447,7 @@ class Ping extends \Zotlabs\Web\Controller {
$result[] = array( $result[] = array(
'notify_link' => z_root() . '/events', /// @FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event --> '/events/event/' . $rr['event_hash'], 'notify_link' => z_root() . '/events', /// @FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event --> '/events/event/' . $rr['event_hash'],
'name' => $rr['xchan_name'], 'name' => $rr['xchan_name'],
'addr' => $rr['xchan_addr'],
'url' => $rr['xchan_url'], 'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'], 'photo' => $rr['xchan_photo_s'],
'when' => $when, 'when' => $when,
@ -460,7 +464,7 @@ class Ping extends \Zotlabs\Web\Controller {
if(argc() > 1 && (argv(1) === 'files')) { if(argc() > 1 && (argv(1) === 'files')) {
$result = array(); $result = array();
$r = q("SELECT item.created, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s FROM item $r = q("SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item
LEFT JOIN xchan on author_xchan = xchan_hash LEFT JOIN xchan on author_xchan = xchan_hash
WHERE item.verb = '%s' WHERE item.verb = '%s'
AND item.obj_type = '%s' AND item.obj_type = '%s'
@ -477,6 +481,7 @@ class Ping extends \Zotlabs\Web\Controller {
$result[] = array( $result[] = array(
'notify_link' => z_root() . '/sharedwithme', 'notify_link' => z_root() . '/sharedwithme',
'name' => $rr['xchan_name'], 'name' => $rr['xchan_name'],
'addr' => $rr['xchan_addr'],
'url' => $rr['xchan_url'], 'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'], 'photo' => $rr['xchan_photo_s'],
'when' => relative_date($rr['created']), 'when' => relative_date($rr['created']),
@ -658,6 +663,7 @@ class Ping extends \Zotlabs\Web\Controller {
if($r[0]['unseen']) { if($r[0]['unseen']) {
$forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']); $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']);
$forums[$x]['name'] = $forums[$x]['xchan_name']; $forums[$x]['name'] = $forums[$x]['xchan_name'];
$forums[$x]['addr'] = $forums[$x]['xchan_addr'];
$forums[$x]['url'] = $forums[$x]['xchan_url']; $forums[$x]['url'] = $forums[$x]['xchan_url'];
$forums[$x]['photo'] = $forums[$x]['xchan_photo_s']; $forums[$x]['photo'] = $forums[$x]['xchan_photo_s'];
$forums[$x]['unseen'] = $r[0]['unseen']; $forums[$x]['unseen'] = $r[0]['unseen'];

2
view/js/main.js
View File

@ -544,7 +544,7 @@ function handleNotificationsItems(notifyType, data) {
notify_menu.html(''); notify_menu.html('');
$(data).each(function() { $(data).each(function() {
html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum); html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.addr,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum);
notify_menu.append(html); notify_menu.append(html);
}); });

13
view/tpl/notifications_widget.tpl
View File

@ -105,8 +105,9 @@
$("#nav-{{$notification.type}}-menu .notification").each(function(i, el){ $("#nav-{{$notification.type}}-menu .notification").each(function(i, el){
var cn = $(el).data('contact_name').toString().toLowerCase(); var cn = $(el).data('contact_name').toString().toLowerCase();
var ca = $(el).data('contact_addr').toString().toLowerCase();
if(cn.indexOf(val) === -1) if(cn.indexOf(val) === -1 && ca.indexOf(val) === -1)
$(this).addClass('d-none'); $(this).addClass('d-none');
else else
$(this).removeClass('d-none'); $(this).removeClass('d-none');
@ -134,18 +135,18 @@
{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
</div> </div>
<div id="nav-notifications-template" rel="template"> <div id="nav-notifications-template" rel="template">
<a class="list-group-item clearfix notification {5}" href="{0}" title="{2}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}"> <a class="list-group-item clearfix notification {6}" href="{0}" title="{2}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
<img class="menu-img-3" data-src="{1}"> <img class="menu-img-3" data-src="{1}">
<span class="contactname">{2}</span> <span class="contactname">{2}</span>
<span class="dropdown-sub-text">{3}<br>{4}</span> <span class="dropdown-sub-text">{4}<br>{5}</span>
</a> </a>
</div> </div>
<div id="nav-notifications-forums-template" rel="template"> <div id="nav-notifications-forums-template" rel="template">
<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}"> <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact-addr="{3}">
<span class="float-right badge badge-{{$notification.severity}}">{9}</span> <span class="float-right badge badge-{{$notification.severity}}">{10}</span>
<img class="menu-img-1" data-src="{1}"> <img class="menu-img-1" data-src="{1}">
<span class="">{2}</span> <span class="">{2}</span>
<i class="fa fa-{10} text-muted"></i> <i class="fa fa-{11} text-muted"></i>
</a> </a>
</div> </div>
<div id="notifications" class="navbar-nav"> <div id="notifications" class="navbar-nav">