add some context to the notifications

3 files changed, 11 insertions, 13 deletions

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index f706b0fb9..90c498d78 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -856,11 +856,11 @@ class Enotify {
 			'photo' => $item[$who]['xchan_photo_s'],
 			'when' => (($edit) ? datetime_convert('UTC', date_default_timezone_get(), $item['edited']) : datetime_convert('UTC', date_default_timezone_get(), $item['created'])),
 			'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'),
-			'b64mid' => 'b64.' . base64url_encode($item['mid']),
+			'b64mid' => (($item['mid']) ? 'b64.' . base64url_encode($item['mid']) : ''),
 			//'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
-			'notify_id' => 'undefined',
 			'thread_top' => (($item['item_thread_top']) ? true : false),
 			'message' => bbcode(escape_tags($itemem_text)),
+			'body' =>  htmlentities(html2plain(bbcode($item['body'])), ENT_COMPAT, 'UTF-8', false),
 			// these are for the superblock addon
 			'hash' => $item[$who]['xchan_hash'],
 			'uid' => $item['uid'],
@@ -885,7 +885,6 @@ class Enotify {
 		$mid = basename($tt['link']);
 
 		$b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : 'b64.' . base64url_encode($mid));
-
 		$x = [
 			'notify_link' => z_root() . '/notify/view/' . $tt['id'],
 			'name' => $tt['xname'],
@@ -893,8 +892,8 @@ class Enotify {
 			'photo' => $tt['photo'],
 			'when' => datetime_convert('UTC', date_default_timezone_get(), $tt['created']),
 			'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'),
-			'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'),
-			'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'),
+			'b64mid' => (($tt['otype'] == 'item') ? $b64mid : ''),
+			'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : ''),
 			'message' => $message
 		];
 
@@ -980,8 +979,7 @@ class Enotify {
 		$x = [
 			'notify_link' => z_root() . '/admin/accounts',
 			'name' => $rr['account_email'],
-			'addr' => $rr['account_email'],
-			'url' => '',
+			//'addr' => $rr['account_email'],
 			'photo' => z_root() . '/' . get_default_profile_photo(48),
 			'when' => datetime_convert('UTC', date_default_timezone_get(),$rr['account_created']),
 			'hclass' => ('notify-unseen'),
diff --git a/view/js/main.js b/view/js/main.js
index f6a009937..853f2333d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1550,7 +1550,7 @@ String.prototype.format = function() {
 	var formatted = this;
 	for (var i = 0; i < arguments.length; i++) {
 		var regexp = new RegExp('\\{'+i+'\\}', 'gi');
-		formatted = formatted.replace(regexp, arguments[i]);
+		formatted = formatted.replace(regexp, ((typeof arguments[i] !== 'undefined') ? arguments[i] : ''));
 	}
 	return formatted;
 };
@@ -1876,7 +1876,7 @@ function sse_handleNotificationsItems(notifyType, data, replace, followup) {
 	}
 
 	$(data).each(function() {
-		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, encodeURIComponent(this.mids));
+		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, encodeURIComponent(this.mids), this.body);
 		notify_menu.append(html);
 	});
 
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index bf2c4c945..d8cc76ccb 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -36,12 +36,12 @@
 		var path = $(this)[0].pathname.substr(1,7);
 		var stateObj = { b64mid: b64mid };
 
-		if(b64mid === 'undefined' && notify_id === 'undefined')
+		if(! b64mid && ! notify_id)
 			return;
 
 		{{if $module != 'hq' && $startpage == 'hq'}}
 			e.preventDefault();
-			if(typeof notify_id !== 'undefined' && notify_id !== 'undefined') {
+			if(notify_id != null) {
 				$.post(
 					"hq",
 					{
@@ -142,9 +142,9 @@
 		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 	</div>
 	<div id="nav-notifications-template" rel="template">
-		<a class="list-group-item clearfix notification {6}" href="{0}" title="{3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
+		<a class="list-group-item clearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
 			<img class="menu-img-3" src="{1}">
-			<span class="contactname">{2}</span>
+			<span class="contactname">{2} <span class="font-weight-normal text-muted">{3}</span></span>
 			<span class="dropdown-sub-text">{4}</span><br>
 			<span class="dropdown-sub-text notifications-autotime" title="{5}">{5}</span>
 		</a>