X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FNotificationsManager.php;h=d11fea03a1b017533474c9287a8a3fe3b56005ba;hb=5a3991d4f7bc929c1087d9275716fc1c8cc299a6;hp=6e9d469eb9778370aa9319f45c1ad3f70840a298;hpb=b02cdc8a7f84a4931e80027de42a80daa58581e1;p=friendica.git

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 6e9d469eb9..d11fea03a1 100644
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -9,13 +9,13 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
+use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
@@ -69,7 +69,7 @@ class NotificationsManager extends BaseObject
 		$filter_str = [];
 		$filter_sql = "";
 		foreach ($filter as $column => $value) {
-			$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
+			$filter_str[] = sprintf("`%s` = '%s'", $column, DBA::escape($value));
 		}
 		if (count($filter_str) > 0) {
 			$filter_sql = "AND " . implode(" AND ", $filter_str);
@@ -99,7 +99,7 @@ class NotificationsManager extends BaseObject
 			intval(local_user())
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $this->_set_extra($r);
 		}
 
@@ -119,7 +119,7 @@ class NotificationsManager extends BaseObject
 			intval($id),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $this->_set_extra($r)[0];
 		}
 		return null;
@@ -137,9 +137,9 @@ class NotificationsManager extends BaseObject
 		return q(
 			"UPDATE `notify` SET `seen` = %d WHERE (`link` = '%s' OR (`parent` != 0 AND `parent` = %d AND `otype` = '%s')) AND `uid` = %d",
 			intval($seen),
-			dbesc($note['link']),
+			DBA::escape($note['link']),
 			intval($note['parent']),
-			dbesc($note['otype']),
+			DBA::escape($note['otype']),
 			intval(local_user())
 		);
 	}
@@ -166,39 +166,41 @@ class NotificationsManager extends BaseObject
 	 */
 	public function getTabs()
 	{
+		$selected = defaults(self::getApp()->argv, 1, '');
+
 		$tabs = [
 			[
 				'label' => L10n::t('System'),
 				'url'   => 'notifications/system',
-				'sel'   => ((self::getApp()->argv[1] == 'system') ? 'active' : ''),
+				'sel'   => (($selected == 'system') ? 'active' : ''),
 				'id'    => 'system-tab',
 				'accesskey' => 'y',
 			],
 			[
 				'label' => L10n::t('Network'),
 				'url'   => 'notifications/network',
-				'sel'   => ((self::getApp()->argv[1] == 'network') ? 'active' : ''),
+				'sel'   => (($selected == 'network') ? 'active' : ''),
 				'id'    => 'network-tab',
 				'accesskey' => 'w',
 			],
 			[
 				'label' => L10n::t('Personal'),
 				'url'   => 'notifications/personal',
-				'sel'   => ((self::getApp()->argv[1] == 'personal') ? 'active' : ''),
+				'sel'   => (($selected == 'personal') ? 'active' : ''),
 				'id'    => 'personal-tab',
 				'accesskey' => 'r',
 			],
 			[
 				'label' => L10n::t('Home'),
 				'url'   => 'notifications/home',
-				'sel'   => ((self::getApp()->argv[1] == 'home') ? 'active' : ''),
+				'sel'   => (($selected == 'home') ? 'active' : ''),
 				'id'    => 'home-tab',
 				'accesskey' => 'h',
 			],
 			[
 				'label' => L10n::t('Introductions'),
 				'url'   => 'notifications/intros',
-				'sel'   => ((self::getApp()->argv[1] == 'intros') ? 'active' : ''),
+				'sel'   => (($selected == 'intros') ? 'active' : ''),
 				'id'    => 'intro-tab',
 				'accesskey' => 'i',
 			],
@@ -222,12 +224,12 @@ class NotificationsManager extends BaseObject
 	 * 	string 'ago' => T relative date of the notification
 	 * 	bool 'seen' => Is the notification marked as "seen"
 	 */
-	private function formatNotifs($notifs, $ident = "")
+	private function formatNotifs(array $notifs, $ident = "")
 	{
 		$notif = [];
 		$arr = [];
 
-		if (DBM::is_result($notifs)) {
+		if (DBA::isResult($notifs)) {
 			foreach ($notifs as $it) {
 				// Because we use different db tables for the notification query
 				// we have sometimes $it['unseen'] and sometimes $it['seen].
@@ -236,12 +238,17 @@ class NotificationsManager extends BaseObject
 					$it['seen'] = ($it['unseen'] > 0 ? false : true);
 				}
 
+				// For feed items we use the user's contact, since the avatar is mostly self choosen.
+				if (!empty($it['network']) && $it['network'] == Protocol::FEED) {
+					$it['author-avatar'] = $it['contact-avatar'];
+				}
+
 				// Depending on the identifier of the notification we need to use different defaults
 				switch ($ident) {
 					case 'system':
 						$default_item_label = 'notify';
 						$default_item_link = System::baseUrl(true) . '/notify/view/' . $it['id'];
-						$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
+						$default_item_image = ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_MICRO);
 						$default_item_url = $it['url'];
 						$default_item_text = strip_tags(BBCode::convert($it['msg']));
 						$default_item_when = DateTimeFormat::local($it['date'], 'r');
@@ -250,22 +257,22 @@ class NotificationsManager extends BaseObject
 
 					case 'home':
 						$default_item_label = 'comment';
-						$default_item_link = System::baseUrl(true) . '/display/' . $it['pguid'];
-						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+						$default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
+						$default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO);
 						$default_item_url = $it['author-link'];
-						$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
+						$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name']);
 						$default_item_when = DateTimeFormat::local($it['created'], 'r');
 						$default_item_ago = Temporal::getRelativeDate($it['created']);
 						break;
 
 					default:
 						$default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
-						$default_item_link = System::baseUrl(true) . '/display/' . $it['pguid'];
-						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+						$default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
+						$default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO);
 						$default_item_url = $it['author-link'];
 						$default_item_text = (($it['id'] == $it['parent'])
 									? L10n::t("%s created a new post", $it['author-name'])
-									: L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
+									: L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name']));
 						$default_item_when = DateTimeFormat::local($it['created'], 'r');
 						$default_item_ago = Temporal::getRelativeDate($it['created']);
 				}
@@ -275,10 +282,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_LIKE:
 						$notif = [
 							'label' => 'like',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -288,10 +295,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_DISLIKE:
 						$notif = [
 							'label' => 'dislike',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -301,10 +308,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTEND:
 						$notif = [
 							'label' => 'attend',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -314,10 +321,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTENDNO:
 						$notif = [
 							'label' => 'attendno',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -327,10 +334,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTENDMAYBE:
 						$notif = [
 							'label' => 'attendmaybe',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -338,14 +345,30 @@ class NotificationsManager extends BaseObject
 						break;
 
 					case ACTIVITY_FRIEND:
+						if (!isset($it['object'])) {
+							$notif = [
+								'label' => 'friend',
+								'link' => $default_item_link,
+								'image' => $default_item_image,
+								'url' => $default_item_url,
+								'text' => $default_item_text,
+								'when' => $default_item_when,
+								'ago' => $default_item_ago,
+								'seen' => $it['seen']
+							];
+							break;
+						}
+						/// @todo Check if this part here is used at all
+						Logger::log('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), Logger::DEBUG);
+
 						$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
 						$obj = XML::parseString($xmlhead . $it['object']);
 						$it['fname'] = $obj->title;
 
 						$notif = [
 							'label' => 'friend',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']),
 							'when' => $default_item_when,
@@ -374,38 +397,6 @@ class NotificationsManager extends BaseObject
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of network notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of network notifications
-	 */
-	private function networkTotal($seen = 0)
-	{
-		$sql_seen = "";
-		$index_hint = "";
-
-		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total`
-				FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-				WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`
-				$sql_seen",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get network notifications
 	 *
@@ -416,74 +407,37 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available network notifications
 	 * 	array 'notifications' => Network notifications
 	 */
 	public function networkNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'network';
-		$total = $this->networkTotal($seen);
 		$notifs = [];
-		$sql_seen = "";
-		$index_hint = "";
+
+		$condition = ['wall' => false, 'uid' => local_user()];
 
 		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
+			$condition['unseen'] = true;
 		}
 
-		$r = q(
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-			WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`
-				$sql_seen
-			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-			intval(local_user()),
-			intval($start),
-			intval($limit)
-		);
-		if (DBM::is_result($r)) {
-			$notifs = $this->formatNotifs($r, $ident);
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if (DBA::isResult($items)) {
+			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of system notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of system notifications
-	 */
-	private function systemTotal($seen = 0)
-	{
-		$sql_seen = "";
-
-		if ($seen === 0) {
-			$sql_seen = " AND NOT `seen` ";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get system notifications
 	 *
@@ -494,13 +448,11 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available system notifications
 	 * 	array 'notifications' => System notifications
 	 */
 	public function systemNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'system';
-		$total = $this->systemTotal($seen);
 		$notifs = [];
 		$sql_seen = "";
 
@@ -509,80 +461,25 @@ class NotificationsManager extends BaseObject
 		}
 
 		$r = q(
-			"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
+			"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen`, `verb` FROM `notify`
 				WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
 			intval(local_user()),
 			intval($start),
 			intval($limit)
 		);
-		if (DBM::is_result($r)) {
+
+		if (DBA::isResult($r)) {
 			$notifs = $this->formatNotifs($r, $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Additional SQL query string for the personal notifications
-	 *
-	 * @return string The additional SQL query
-	 */
-	private function personalSqlExtra()
-	{
-		$myurl = System::baseUrl(true) . '/profile/' . self::getApp()->user['nickname'];
-		$myurl = substr($myurl, strpos($myurl, '://') + 3);
-		$myurl = str_replace(['www.', '.'], ['', '\\.'], $myurl);
-		$diasp_url = str_replace('/profile/', '/u/', $myurl);
-		$sql_extra = sprintf(
-			" AND (`item`.`author-link` REGEXP '%s' OR `item`.`tag` REGEXP '%s' OR `item`.`tag` REGEXP '%s') ",
-			dbesc($myurl . '$'),
-			dbesc($myurl . '\\]'),
-			dbesc($diasp_url . '\\]')
-		);
-
-		return $sql_extra;
-	}
-
-	/**
-	 * @brief Total number of personal notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of personal notifications
-	 */
-	private function personalTotal($seen = 0)
-	{
-		$sql_seen = "";
-		$index_hint = "";
-		$sql_extra = $this->personalSqlExtra();
-
-		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total`
-				FROM `item` $index_hint
-				WHERE `item`.`visible`
-				$sql_extra
-				$sql_seen
-				AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get personal notifications
 	 *
@@ -593,81 +490,41 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available personal notifications
 	 * 	array 'notifications' => Personal notifications
 	 */
 	public function personalNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'personal';
-		$total = $this->personalTotal($seen);
-		$sql_extra = $this->personalSqlExtra();
 		$notifs = [];
-		$sql_seen = "";
-		$index_hint = "";
+
+		$myurl = str_replace('http://', '', self::getApp()->contact['nurl']);
+		$diasp_url = str_replace('/profile/', '/u/', $myurl);
+
+		$condition = ["NOT `wall` AND `uid` = ? AND (`item`.`author-id` = ? OR `item`.`tag` REGEXP ? OR `item`.`tag` REGEXP ?)",
+			local_user(), public_contact(), $myurl . '\\]', $diasp_url . '\\]'];
 
 		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
+			$condition[0] .= " AND `unseen`";
 		}
 
-		$r = q(
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-			WHERE `item`.`visible`
-				$sql_extra
-				$sql_seen
-				AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`
-			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-			intval(local_user()),
-			intval($start),
-			intval($limit)
-		);
-		if (DBM::is_result($r)) {
-			$notifs = $this->formatNotifs($r, $ident);
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if (DBA::isResult($items)) {
+			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of home notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of home notifications
-	 */
-	private function homeTotal($seen = 0)
-	{
-		$sql_seen = "";
-		$index_hint = "";
-
-		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total` FROM `item` $index_hint
-				WHERE `item`.`visible` = 1 AND
-				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
-				$sql_seen",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get home notifications
 	 *
@@ -678,76 +535,36 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available home notifications
 	 * 	array 'notifications' => Home notifications
 	 */
 	public function homeNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'home';
-		$total = $this->homeTotal($seen);
 		$notifs = [];
-		$sql_seen = "";
-		$index_hint = "";
+
+		$condition = ['wall' => true, 'uid' => local_user()];
 
 		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
+			$condition['unseen'] = true;
 		}
 
-		$r = q(
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-			WHERE `item`.`visible` AND
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND `item`.`wall`
-				$sql_seen
-			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-			intval(local_user()),
-			intval($start),
-			intval($limit)
-		);
-		if (DBM::is_result($r)) {
-			$notifs = $this->formatNotifs($r, $ident);
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if (DBA::isResult($items)) {
+			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of introductions
-	 * @param bool $all If false only include introductions into the query
-	 * 	                which aren't marked as ignored
-	 *
-	 * @return int Number of introductions
-	 */
-	private function introTotal($all = false)
-	{
-		$sql_extra = "";
-
-		if (!$all) {
-			$sql_extra = " AND `ignore` = 0 ";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total` FROM `intro`
-			WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
-			intval($_SESSION['uid'])
-		);
-
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get introductions
 	 *
@@ -758,13 +575,11 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
-	 *	int 'total' => Total number of available introductions
 	 *	array 'notifications' => Introductions
 	 */
 	public function introNotifs($all = false, $start = 0, $limit = 80)
 	{
 		$ident = 'introductions';
-		$total = $this->introTotal($all);
 		$notifs = [];
 		$sql_extra = "";
 
@@ -775,7 +590,7 @@ class NotificationsManager extends BaseObject
 		/// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact
 		$r = q(
 			"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
-				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`,
+				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`,
 				`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
 				`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
 				`gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
@@ -790,13 +605,12 @@ class NotificationsManager extends BaseObject
 			intval($start),
 			intval($limit)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$notifs = $this->formatIntros($r);
 		}
 
 		$arr = [
 			'ident' => $ident,
-			'total' => $total,
 			'notifications' => $notifs,
 		];
 
@@ -818,17 +632,21 @@ class NotificationsManager extends BaseObject
 			// We have to distinguish between these two because they use different data.
 			// Contact suggestions
 			if ($it['fid']) {
-				$return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->get_hostname() . ((self::getApp()->path) ? '/' . self::getApp()->path : ''));
+				$return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->getHostName() . ((self::getApp()->getURLPath()) ? '/' . self::getApp()->getURLPath() : ''));
 
 				$intro = [
 					'label' => 'friend_suggestion',
 					'notify_type' => L10n::t('Friend Suggestion'),
 					'intro_id' => $it['intro_id'],
 					'madeby' => $it['name'],
+					'madeby_url' => $it['url'],
+					'madeby_zrl' => Contact::magicLink($it['url']),
+					'madeby_addr' => $it['addr'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it, 'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+					'photo' => (!empty($it['fphoto']) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
 					'name' => $it['fname'],
-					'url' => Contact::magicLink($it['furl']),
+					'url' => $it['furl'],
+					'zrl' => Contact::magicLink($it['furl']),
 					'hidden' => $it['hidden'] == 1,
 					'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
 					'knowyou' => $knowyou,
@@ -840,20 +658,24 @@ class NotificationsManager extends BaseObject
 			} else {
 				$it = $this->getMissingIntroData($it);
 
+				if (empty($it['url'])) {
+					continue;
+				}
+
 				// Don't show these data until you are connected. Diaspora is doing the same.
-				if ($it['gnetwork'] === NETWORK_DIASPORA) {
+				if ($it['gnetwork'] === Protocol::DIASPORA) {
 					$it['glocation'] = "";
 					$it['gabout'] = "";
 					$it['ggender'] = "";
 				}
 				$intro = [
-					'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'),
-					'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')),
+					'label' => (($it['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
+					'notify_type' => (($it['network'] !== Protocol::OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')),
 					'dfrn_id' => $it['issued-id'],
 					'uid' => $_SESSION['uid'],
 					'intro_id' => $it['intro_id'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it, 'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+					'photo' => (!empty($it['photo']) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
 					'name' => $it['name'],
 					'location' => BBCode::convert($it['glocation'], false),
 					'about' => BBCode::convert($it['gabout'], false),
@@ -888,22 +710,22 @@ class NotificationsManager extends BaseObject
 	{
 		// If the network and the addr isn't available from the gcontact
 		// table entry, take the one of the contact table entry
-		if ($arr['gnetwork'] == "") {
+		if (empty($arr['gnetwork']) && !empty($arr['network'])) {
 			$arr['gnetwork'] = $arr['network'];
 		}
-		if ($arr['gaddr'] == "") {
+		if (empty($arr['gaddr']) && !empty($arr['addr'])) {
 			$arr['gaddr'] = $arr['addr'];
 		}
 
 		// If the network and addr is still not available
 		// get the missing data data from other sources
-		if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
+		if (empty($arr['gnetwork']) || empty($arr['gaddr'])) {
 			$ret = Contact::getDetailsByURL($arr['url']);
 
-			if ($arr['gnetwork'] == "" && $ret['network'] != "") {
+			if (empty($arr['gnetwork']) && !empty($ret['network'])) {
 				$arr['gnetwork'] = $ret['network'];
 			}
-			if ($arr['gaddr'] == "" && $ret['addr'] != "") {
+			if (empty($arr['gaddr']) && !empty($ret['addr'])) {
 				$arr['gaddr'] = $ret['addr'];
 			}
 		}