New landing page HQ with separate views for direct messages, public/limited messages and starred messages if the feature is enabled

14 files changed, 285 insertions, 80 deletions

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index bd51f0896..30c108cc1 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -76,7 +76,8 @@ class Apps {
 			'Directory',
 			'Search',
 			'Help',
-			'Profile Photo'
+			'Profile Photo',
+			'HQ'
 		]);
 
 		/**
@@ -374,7 +375,7 @@ class Apps {
 			'Permission Categories' => t('Permission Categories'),
 			'Public Stream' => t('Public Stream'),
 			'My Chatrooms' => t('My Chatrooms'),
-			'Channel Export' => t('Channel Export')
+			'Channel Export' => t('Channel Export'),
 		);
 
 		if(array_key_exists('name',$arr)) {
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 7e33f09b8..50b564bde 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -124,14 +124,14 @@ class Enotify {
 
 	if ($params['type'] == NOTIFY_MAIL) {
 		logger('notification: mail');
-		$subject = 	sprintf( t('[$Projectname:Notify] New mail received at %s'),$sitename);
-
-		$preamble = sprintf( t('%1$s sent you a new private message at %2$s.'), $sender['xchan_name'],$sitename);
-		$epreamble = sprintf( t('%1$s sent you %2$s.'),'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]');
-		$sitelink = t('Please visit %s to view and/or reply to your private messages.');
-		$tsitelink = sprintf( $sitelink, $siteurl . '/mail/' . $params['item']['id'] );
-		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/mail/' . $params['item']['id'] . '">' . $sitename . '</a>');
-		$itemlink = $siteurl . '/mail/' . $params['item']['id'];
+		$subject = 	sprintf( t('[$Projectname:Notify] New direct message received at %s'),$sitename);
+
+		$preamble = sprintf( t('%1$s sent you a new direct message at %2$s.'), $sender['xchan_name'],$sitename);
+		$epreamble = sprintf( t('%1$s sent you %2$s.'),'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a direct message') . '[/zrl]');
+		$sitelink = t('Please visit %s to view and/or reply to your direct messages.');
+		$tsitelink = sprintf( $sitelink, $siteurl . '/hq/' . gen_link_id($params['item']['mid']));
+		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/hq/' . gen_link_id($params['item']['mid']) . '">' . $sitename . '</a>');
+		$itemlink = $siteurl . '/hq/' . gen_link_id($params['item']['mid']);
 	}
 
 	if ($params['type'] == NOTIFY_COMMENT) {
@@ -886,7 +886,7 @@ class Enotify {
 
 		$b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : 'b64.' . base64url_encode($mid));
 		$x = [
-			'notify_link' => z_root() . '/notify/view/' . $tt['id'],
+			'notify_link' => (($tt['ntype'] === NOTIFY_MAIL) ? $tt['link'] : z_root() . '/notify/view/' . $tt['id']),
 			'name' => $tt['xname'],
 			'url' => $tt['url'],
 			'photo' => $tt['photo'],
@@ -945,7 +945,7 @@ class Enotify {
 			'photo' => $rr['xchan_photo_s'],
 			'when' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']),
 			'hclass' => (intval($rr['mail_seen']) ? 'notify-seen' : 'notify-unseen'),
-			'message' => t('sent you a private message'),
+			'message' => t('sent you a direct message'),
 		];
 
 		return $x;
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index 68b2c70dd..7fe8fcc2e 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -77,7 +77,7 @@ class ThreadStream {
 				$this->reload = $_SESSION['return_url'];
 				break;
 			case 'display':
-				// in this mode we set profile_owner after initialisation (from conversation()) and then 
+				// in this mode we set profile_owner after initialisation (from conversation()) and then
 				// pull some trickery which allows us to re-invoke this function afterward
 				// it's an ugly hack so @FIXME
 				$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
@@ -170,14 +170,14 @@ class ThreadStream {
 		 * Only add things that will be displayed
 		 */
 
-		
+
 		if(($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE))) {
 			return false;
 		}
 
 		$item->set_commentable(false);
 		$ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
-		
+
 		if(! comments_are_now_closed($item->get_data())) {
 			if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash))
 				$item->set_commentable(true);
@@ -194,7 +194,7 @@ class ThreadStream {
 		}
 		if($this->mode === 'pubstream' && (! local_channel())) {
 			$item->set_commentable(false);
-		} 
+		}
 
 
 		$item->set_conversation($this);
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 862a97bdc..7373de899 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -222,6 +222,7 @@ class Acl extends \Zotlabs\Web\Controller {
 					WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
 					intval(local_channel())
 				);
+
 				if($r2)
 					$r = array_merge($r2,$r);
 
@@ -282,13 +283,12 @@ class Acl extends \Zotlabs\Web\Controller {
 			}
 		}
 		elseif($type == 'm') {
-
 			$r = array();
 			$z = q("SELECT xchan_hash as hash, xchan_name as name, xchan_network as net, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
 				FROM abook left join xchan on abook_xchan = xchan_hash
 				WHERE abook_channel = %d
 				and xchan_deleted = 0
-				and xchan_network IN ('zot', 'diaspora', 'friendica-over-diaspora')
+				and not xchan_network IN ('rss', 'anon', 'unknown')
 				$sql_extra3
 				ORDER BY xchan_name ASC ",
 				intval(local_channel())
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php
index 2bfab986f..315d05af6 100644
--- a/Zotlabs/Module/Home.php
+++ b/Zotlabs/Module/Home.php
@@ -40,7 +40,7 @@ class Home extends Controller {
 			if (!$dest)
 				$dest = get_config('system', 'startpage');
 			if (!$dest)
-				$dest = z_root() . '/network';
+				$dest = z_root() . '/hq';
 
 			goaway($dest);
 		}
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index a2c4100ad..a8d321b24 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -1,6 +1,10 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Widget\Messages;
+
+
 require_once("include/bbcode.php");
 require_once('include/security.php');
 require_once('include/conversation.php');
@@ -14,23 +18,7 @@ class Hq extends \Zotlabs\Web\Controller {
 		if(! local_channel())
 			return;
 
-		\App::$profile_uid = local_channel();
-	}
-
-	function post() {
-
-		if(!local_channel())
-			return;
-
-		if($_REQUEST['notify_id']) {
-			q("update notify set seen = 1 where id = %d and uid = %d",
-				intval($_REQUEST['notify_id']),
-				intval(local_channel())
-			);
-		}
-
-		killme();
-
+		App::$profile_uid = local_channel();
 	}
 
 	function get($update = 0, $load = false) {
@@ -42,8 +30,9 @@ class Hq extends \Zotlabs\Web\Controller {
 			$item_hash = argv(1);
 		}
 
-		if($_REQUEST['mid'])
+		if(isset($_REQUEST['mid'])) {
 			$item_hash = $_REQUEST['mid'];
+		}
 
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
@@ -55,7 +44,6 @@ class Hq extends \Zotlabs\Web\Controller {
 				ORDER BY created DESC LIMIT 1",
 				intval(local_channel())
 			);
-
 			if($r[0]['mid']) {
 				$item_hash = 'b64.' . base64url_encode($r[0]['mid']);
 			}
@@ -96,7 +84,7 @@ class Hq extends \Zotlabs\Web\Controller {
 		}
 
 		if(! $update) {
-			$channel = \App::get_channel();
+			$channel = App::get_channel();
 
 			$channel_acl = [
 				'allow_cid' => $channel['channel_allow_cid'],
@@ -116,7 +104,7 @@ class Hq extends \Zotlabs\Web\Controller {
 				'bang'                => '',
 				'visitor'             => true,
 				'profile_uid'         => local_channel(),
-				'return_path'         => 'hq',
+				'return_path'         => 'hq', //(($dm_mode) ? 'dm' : 'hq'),
 				'expanded'            => true,
 				'editor_autocomplete' => true,
 				'bbco_autocomplete'   => 'bbcode',
@@ -127,8 +115,6 @@ class Hq extends \Zotlabs\Web\Controller {
 
 			$o = replace_macros(get_markup_template("hq.tpl"),
 				[
-					'$no_messages' => (($target_item) ? false : true),
-					'$no_messages_label' => [ t('Welcome to Hubzilla!'), t('You have got no unseen posts...') ],
 					'$editor' => status_editor($a,$x,false,'Hq')
 				]
 			);
@@ -137,6 +123,7 @@ class Hq extends \Zotlabs\Web\Controller {
 
 		if(! $update && ! $load) {
 
+			//$app = (($dm_mode) ? 'Direct Messages' : 'Start');
 			nav_set_selected('HQ');
 
 			if($target_item) {
@@ -153,11 +140,11 @@ class Hq extends \Zotlabs\Web\Controller {
 
 			$o .= '<div id="live-hq"></div>' . "\r\n";
 			$o .= "<script> var profile_uid = " . local_channel()
-				. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . ";</script>\r\n";
+				. "; var netargs = '?f='; var profile_page = " . App::$pager['page'] . ";</script>\r\n";
 
-			\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),[
+			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),[
 				'$baseurl' => z_root(),
-				'$pgtype'  => 'hq',
+				'$pgtype'  => 'hq', //(($dm_mode) ? 'dm' : 'hq'),
 				'$uid'     => local_channel(),
 				'$gid'     => '0',
 				'$cid'     => '0',
@@ -267,4 +254,17 @@ class Hq extends \Zotlabs\Web\Controller {
 
 	}
 
+	function post() {
+		if (!local_channel())
+			return;
+
+		$options['offset'] = $_REQUEST['offset'];
+		$options['dm'] = $_REQUEST['dm'];
+		$options['type'] = $_REQUEST['type'];
+
+		$ret = Messages::get_messages_page($options);
+
+		json_return_and_die($ret);
+	}
+
 }
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index a21095940..be954cbfd 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -388,6 +388,10 @@ class Network extends \Zotlabs\Web\Controller {
 		if ($dm) {
 			$sql_extra .= " AND item_private = 2 ";
 		}
+		else {
+			$sql_extra .= " AND item_private IN (0, 1) ";
+		}
+
 
 		if($conv) {
 			$item_thread_top = '';
diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php
index cffcc8099..5bfcec4f7 100644
--- a/Zotlabs/Module/Notify.php
+++ b/Zotlabs/Module/Notify.php
@@ -8,7 +8,15 @@ class Notify extends \Zotlabs\Web\Controller {
 	function init() {
 		if(! local_channel())
 			return;
-	
+
+		if($_REQUEST['notify_id']) {
+			q("update notify set seen = 1 where id = %d and uid = %d",
+				intval($_REQUEST['notify_id']),
+				intval(local_channel())
+			);
+			killme();
+		}
+
 		if(argc() > 2 && argv(1) === 'view' && intval(argv(2))) {
 			$r = q("select * from notify where id = %d and uid = %d limit 1",
 				intval(argv(2)),
@@ -29,24 +37,24 @@ class Notify extends \Zotlabs\Web\Controller {
 			}
 			goaway(z_root());
 		}
-	
-	
+
+
 	}
-	
-	
+
+
 	function get() {
 		if(! local_channel())
 			return login();
-	
+
 		$notif_tpl = get_markup_template('notifications.tpl');
-			
+
 		$not_tpl = get_markup_template('notify.tpl');
 		require_once('include/bbcode.php');
-	
+
 		$r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc",
 			intval(local_channel())
 		);
-			
+
 		if($r) {
 			foreach ($r as $it) {
 				$notif_content .= replace_macros($not_tpl,array(
@@ -56,18 +64,18 @@ class Notify extends \Zotlabs\Web\Controller {
 					'$item_when' => relative_date($it['created'])
 				));
 			}
-		} 
+		}
 		else {
 			$notif_content .= t('No more system notifications.');
 		}
-			
+
 		$o .= replace_macros($notif_tpl,array(
 			'$notif_header' => t('System Notifications'),
 			'$tabs' => '', // $tabs,
 			'$notif_content' => $notif_content,
 		));
-	
+
 		return $o;
-	
+
 	}
 }
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 3316a6beb..ca86f4f1f 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -37,7 +37,7 @@ class Sse_bs extends Controller {
 
 		self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify', -1);
 		self::$evdays = intval(get_pconfig(self::$uid, 'system', 'evdays'));
-		self::$limit = 50;
+		self::$limit = 30;
 		self::$offset = 0;
 		self::$xchans = '';
 
@@ -57,8 +57,6 @@ class Sse_bs extends Controller {
 
 		if(intval(argv(2)) > 0)
 			self::$offset = argv(2);
-		else
-			$_SESSION['sse_loadtime'] = datetime_convert();
 
 		$network = false;
 		$dm = false;
@@ -178,7 +176,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash)
 			);
 
@@ -254,7 +252,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash)
 			);
 
@@ -330,7 +328,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash)
 			);
 
@@ -417,7 +415,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval($sys['channel_id']),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash),
 				dbescdate($_SESSION['static_loadtime'])
 			);
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index de0d5a883..685f75897 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -39,6 +39,8 @@ class WebServer {
 			register_shutdown_function('session_write_close');
   		}
 
+		$_SESSION['page_loadtime'] = datetime_convert();
+
 		/**
 		 * Language was set earlier, but we can over-ride it in the session.
 		 * We have to do it here because the session was just now opened.
diff --git a/Zotlabs/Widget/Hq_controls.php b/Zotlabs/Widget/Hq_controls.php
index 0caa54a1a..781e2a0bd 100644
--- a/Zotlabs/Widget/Hq_controls.php
+++ b/Zotlabs/Widget/Hq_controls.php
@@ -9,17 +9,32 @@ class Hq_controls {
 		if (! local_channel())
 			return;
 
+		$entries = [
+			'toggle_editor' => [
+				'label' => t('Toggle post editor'),
+				'id' => 'jot-toggle',
+				'href' => '#',
+				'class' => 'btn btn-outline-primary',
+				'type' => 'button',
+				'icon' => 'pencil',
+				'extra' => 'data-toggle="button"'
+			]
+		];
+
+
+		$entries['toggle_notes'] = [
+			'label' => t('Toggle personal notes'),
+			'id' => 'notes-toggle',
+			'href' => '#',
+			'class' => 'btn btn-outline-primary',
+			'type' => 'button',
+			'icon' => 'sticky-note-o',
+			'extra' => 'data-toggle="button"'
+		];
+
 		return replace_macros(get_markup_template('hq_controls.tpl'),
 			[
-				'$title' => t('HQ Control Panel'),
-				'$menu' => [
-					'create' => [
-						'label' => t('Create a new post'),
-						'id' => 'jot-toggle',
-						'href' => '#',
-						'class' => ''
-					]
-				]
+				'$entries' => $entries
 			]
 		);
 	}
diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php
new file mode 100644
index 000000000..6117bfa73
--- /dev/null
+++ b/Zotlabs/Widget/Messages.php
@@ -0,0 +1,181 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+use App;
+use Zotlabs\Lib\IConfig;
+
+class Messages {
+
+	public static function widget($arr) {
+		if (!local_channel())
+			return EMPTY_STR;
+
+		$o = '';
+		$page = self::get_messages_page($options);
+
+		if (!$page['entries'])
+			return $o;
+
+		$tpl = get_markup_template('messages_widget.tpl');
+		$o .= replace_macros($tpl, [
+			'$entries' => $page['entries'],
+			'$offset' => $page['offset'],
+			'$feature_star' => feature_enabled(local_channel(), 'star_posts'),
+			'$strings' => [
+				'messages_title' => t('Public and restricted messages'),
+				'direct_messages_title' => t('Direct messages'),
+				'starred_messages_title' => t('Starred messages'),
+				'loading' => t('Loading')
+			]
+		]);
+
+		return $o;
+	}
+
+	public static function get_messages_page($options) {
+		if (!local_channel())
+			return;
+
+		if ($options['offset'] == -1) {
+			return;
+		}
+
+		$channel = App::get_channel();
+		$item_normal = item_normal();
+		$entries = [];
+		$limit = 30;
+
+		$offset = 0;
+		if ($options['offset']) {
+			$offset = intval($options['offset']);
+		}
+
+		$loadtime = (($offset) ? $_SESSION['page_loadtime'] : datetime_convert());
+
+		switch($options['type']) {
+			case 'direct':
+				$type_sql = ' AND item_private = 2 ';
+				break;
+			case 'starred':
+				$type_sql = ' AND item_starred = 1 ';
+				break;
+			default:
+				$type_sql = ' AND item_private IN (0, 1) ';
+		}
+
+		$items = q("SELECT * FROM item WHERE uid = %d
+			AND created <= '%s'
+			$type_sql
+			AND item_thread_top = 1
+			$item_normal
+			ORDER BY created DESC
+			LIMIT $limit OFFSET $offset",
+			intval(local_channel()),
+			dbescdate($loadtime)
+		);
+
+		xchan_query($items, false);
+
+		$i = 0;
+
+		foreach($items as $item) {
+
+			$info = '';
+			if ($options['type'] == 'direct') {
+				$info .= self::get_dm_recipients($channel, $item);
+			}
+
+			if($item['owner_xchan'] !== $item['author_xchan']) {
+				$info .= t('via') . ' ' . $item['owner']['xchan_name'];
+			}
+
+			$summary = $item['title'];
+			if (!$summary) {
+				$summary = $item['summary'];
+			}
+			if (!$summary) {
+				$summary = htmlentities(html2plain(bbcode($item['body']), 75, true), ENT_QUOTES, 'UTF-8', false);
+			}
+			if (!$summary) {
+				$summary = t('Sorry, there is no text preview available for this post');
+			}
+			$summary = substr_words($summary, 68);
+
+			switch(intval($item['item_private'])) {
+				case 1:
+					$icon = '<i class="fa fa-lock"></i>';
+					break;
+				case 2:
+					$icon = '<i class="fa fa-envelope-o"></i>';
+					break;
+				default:
+					$icon = '';
+			}
+
+			$entries[$i]['author_name'] = $item['author']['xchan_name'];
+			$entries[$i]['author_addr'] = (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']);
+			$entries[$i]['info'] = $info;
+			$entries[$i]['created'] = datetime_convert('UTC', date_default_timezone_get(), $item['created']);
+			$entries[$i]['summary'] = $summary;
+			$entries[$i]['b64mid'] = gen_link_id($item['mid']);
+			$entries[$i]['href'] = z_root() . '/hq/' . gen_link_id($item['mid']);
+			$entries[$i]['icon'] = $icon;
+
+			$i++;
+		}
+
+		$result = [
+			'offset' => ((count($entries) < $limit) ? -1 : intval($offset + $limit)),
+			'entries' => $entries
+		];
+
+		return $result;
+	}
+
+	public static function get_dm_recipients($channel, $item) {
+
+		if($channel['channel_hash'] === $item['owner']['xchan_hash']) {
+			// we are the owner, get the recipients from the item
+			$recips = expand_acl($item['allow_cid']);
+			if (is_array($recips)) {
+				array_unshift($recips, $item['owner']['xchan_hash']);
+				$column = 'xchan_hash';
+			}
+		}
+		else {
+			$recips = IConfig::Get($item, 'activitypub', 'recips');
+			if (isset($recips['to']) && is_array($recips['to'])) {
+				$recips = $recips['to'];
+				array_unshift($recips, $item['owner']['xchan_url']);
+				$column = 'xchan_url';
+			}
+			else {
+				$hookinfo = [
+					'item' => $item,
+					'recips' => null,
+					'column' => ''
+				];
+
+				call_hooks('direct_message_recipients', $hookinfo);
+
+				$recips = $hookinfo['recips'];
+				$column = $hookinfo['column'];
+			}
+		}
+
+		if(is_array($recips)) {
+			stringify_array_elms($recips, true);
+
+			$query_str = implode(',', $recips);
+			$xchans = dbq("SELECT DISTINCT xchan_name FROM xchan WHERE $column IN ($query_str)");
+
+			foreach($xchans as $xchan) {
+				$recipients .= $xchan['xchan_name'] . ', ';
+			}
+		}
+
+		return trim($recipients, ', ');
+	}
+
+}
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
index 238008d81..b2c8eda86 100644
--- a/Zotlabs/Widget/Notes.php
+++ b/Zotlabs/Widget/Notes.php
@@ -10,9 +10,6 @@ class Notes {
 		if(! local_channel())
 			return EMPTY_STR;
 
-		if(! Apps::system_app_installed(local_channel(), 'Notes'))
-			return EMPTY_STR;
-
 		$text = get_pconfig(local_channel(),'notes','text');
 
 		$tpl = get_markup_template('notes.tpl');
@@ -21,7 +18,8 @@ class Notes {
 			'$banner' => t('Notes'),
 			'$text' => $text,
 			'$save' => t('Save'),
-			'$app' => ((isset($arr['app'])) ? true : false)
+			'$app' => ((isset($arr['app'])) ? true : false),
+			'$hidden' => ((isset($arr['hidden'])) ? true : false)
 		));
 
 		return $o;
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index d59312148..56b1f9caa 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -161,11 +161,9 @@ class Notifications {
 		}
 
 		$o = replace_macros(get_markup_template('notifications_widget.tpl'), [
-			'$module' => \App::$module,
 			'$notifications' => $notifications,
 			'$no_notifications' => t('Sorry, you have got no notifications at the moment'),
 			'$loading' => t('Loading'),
-			'$startpage' => ($channel ? $channel['channel_startpage'] : '')
 		]);
 
 		return $o;