Reworked notifications ("alt pager" added) / use of Item class to fetch data

mod/notifications.php

@@ -11,29 +11,25 @@ use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-function notifications_post(App $a) {
+function notifications_post(App $a)
-
+{
 	if (!local_user()) {
 		goaway(System::baseUrl());
 	}
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
 
-	if($request_id === "all")
+	if ($request_id === "all") {
 		return;
+	}
 
 	if ($request_id) {
+		$intro = dba::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
 
-		$r = q("SELECT * FROM `intro` WHERE `id` = %d  AND `uid` = %d LIMIT 1",
+		if (DBM::is_result($intro)) {
-			intval($request_id),
+			$intro_id = $intro['id'];
-			intval(local_user())
+			$contact_id = $intro['contact-id'];
-		);
+		} else {
-
-		if (DBM::is_result($r)) {
-			$intro_id = $r[0]['id'];
-			$contact_id = $r[0]['contact-id'];
-		}
-		else {
 			notice(L10n::t('Invalid request identifier.') . EOL);
 			return;
 		}
@@ -41,34 +37,30 @@ function notifications_post(App $a) {
 		// If it is a friend suggestion, the contact is not a new friend but an existing friend
 		// that should not be deleted.
 
-		$fid = $r[0]['fid'];
+		$fid = $intro['fid'];
 
 		if ($_POST['submit'] == L10n::t('Discard')) {
-			$r = q("DELETE FROM `intro` WHERE `id` = %d",
+			dba::delete('intro', ['id' => $intro_id]);
-				intval($intro_id)
-			);
-			if(! $fid) {
 
+			if (!$fid) {
 				// The check for blocked and pending is in case the friendship was already approved
 				// and we just want to get rid of the now pointless notification
-
+				$condition = ['id' => $contact_id, 'uid' => local_user(),
-				$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1",
+					'self' => false, 'blocked' => true, 'pending' => true];
-					intval($contact_id),
+				dba::delete('contact', $condition);
-					intval(local_user())
-				);
 			}
 			goaway('notifications/intros');
 		}
+
 		if ($_POST['submit'] == L10n::t('Ignore')) {
-			$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
+			dba::update('intro', ['ignore' => true], ['id' => $intro_id]);
-				intval($intro_id));
 			goaway('notifications/intros');
 		}
 	}
 }
 
-function notifications_content(App $a) {
+function notifications_content(App $a)
-
+{
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
@@ -103,25 +95,21 @@ function notifications_content(App $a) {
 
 	// Get the network notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
-
 		$notif_header = L10n::t('Network Notifications');
 		$notifs = $nm->networkNotifs($show, $startrec, $perpage);
 
 	// Get the system notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
-
 		$notif_header = L10n::t('System Notifications');
 		$notifs = $nm->systemNotifs($show, $startrec, $perpage);
 
 	// Get the personal notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
-
 		$notif_header = L10n::t('Personal Notifications');
 		$notifs = $nm->personalNotifs($show, $startrec, $perpage);
 
 	// Get the home notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
-
 		$notif_header = L10n::t('Home Notifications');
 		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
 
@@ -129,7 +117,6 @@ function notifications_content(App $a) {
 
 
 	// Set the pager
-	$a->set_pager_total($notifs['total']);
 	$a->set_pager_itemspage($perpage);
 
 	// Add additional informations (needed for json output)
@@ -145,7 +132,6 @@ function notifications_content(App $a) {
 
 	// Process the data for template creation
 	if ($notifs['ident'] === 'introductions') {
-
 		$sugg = get_markup_template('suggestions.tpl');
 		$tpl = get_markup_template("intros.tpl");
 
@@ -220,8 +206,9 @@ function notifications_content(App $a) {
 
 					$header = $it["name"];
 
-					if ($it["addr"] != "")
+					if ($it["addr"] != "") {
 						$header .= " <".$it["addr"].">";
+					}
 
 					$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
 
@@ -269,12 +256,12 @@ function notifications_content(App $a) {
 			}
 		}
 
-		if($notifs['total'] == 0)
+		if (count($notifs['notifications']) == 0) {
 			info(L10n::t('No introductions.') . EOL);
+		}
 
 	// Normal notifications (no introductions)
 	} else {
-
 		// The template files we need in different cases for formatting the content
 		$tpl_item_like = 'notifications_likes_item.tpl';
 		$tpl_item_dislike = 'notifications_dislikes_item.tpl';
@@ -306,17 +293,13 @@ function notifications_content(App $a) {
 			]);
 		}
 
-		// It doesn't make sense to show the Show unread / Show all link visible if the user is on the
-		// "Show all" page and there are no notifications. So we will hide it.
-		if ($show == 0 || intval($show) && $notifs['total'] > 0) {
 		$notif_show_lnk = [
 			'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
 			'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
 		];
-		}
 
 		// Output if there aren't any notifications available
-		if ($notifs['total'] == 0) {
+		if (count($notifs['notifications']) == 0) {
 			$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
 		}
 	}
@@ -327,7 +310,7 @@ function notifications_content(App $a) {
 		'$notif_content' => $notif_content,
 		'$notif_nocontent' => $notif_nocontent,
 		'$notif_show_lnk' => $notif_show_lnk,
-		'$notif_paginate' => paginate($a)
+		'$notif_paginate' => alt_pager($a, count($notif_content))
 	]);
 
 	return $o;

src/Core/NotificationsManager.php

@@ -15,9 +15,11 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
+use dba;
 
 require_once 'include/dba.php';
 
@@ -250,22 +252,22 @@ class NotificationsManager extends BaseObject
 
 					case 'home':
 						$default_item_label = 'comment';
-						$default_item_link = System::baseUrl(true) . '/display/' . $it['pguid'];
+						$default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
 						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_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_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
 						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_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 +277,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_LIKE:
 						$notif = [
 							'label' => 'like',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
 							'image' => proxy_url($it['author-avatar'], false, PROXY_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 +290,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_DISLIKE:
 						$notif = [
 							'label' => 'dislike',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
 							'image' => proxy_url($it['author-avatar'], false, PROXY_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 +303,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTEND:
 						$notif = [
 							'label' => 'attend',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
 							'image' => proxy_url($it['author-avatar'], false, PROXY_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 +316,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTENDNO:
 						$notif = [
 							'label' => 'attendno',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
 							'image' => proxy_url($it['author-avatar'], false, PROXY_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 +329,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTENDMAYBE:
 						$notif = [
 							'label' => 'attendmaybe',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
 							'image' => proxy_url($it['author-avatar'], false, PROXY_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']
@@ -344,7 +346,7 @@ class NotificationsManager extends BaseObject
 
 						$notif = [
 							'label' => 'friend',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
 							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']),
@@ -374,38 +376,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 +386,36 @@ 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` ";
+			$condition['unseen'] = true;
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
 		}
 
-		$r = q(
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'created',
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+			'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+		$items = Item::select(local_user(), $fields, $condition, $params);
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+
-			WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND
+		if (DBM::is_result($items)) {
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`
+			$notifs = $this->formatNotifs(dba::inArray($items), $ident);
-				$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);
 		}
 
 		$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 +426,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 = "";
 
@@ -522,67 +452,11 @@ class NotificationsManager extends BaseObject
 		$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 +467,40 @@ 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` ";
+			$condition[0] .= " AND `unseen`";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
 		}
 
-		$r = q(
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'created',
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+			'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+		$items = Item::select(local_user(), $fields, $condition, $params);
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+
-			WHERE `item`.`visible`
+		if (DBM::is_result($items)) {
-				$sql_extra
+			$notifs = $this->formatNotifs(dba::inArray($items), $ident);
-				$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);
 		}
 
 		$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 +511,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` ";
+			$condition['unseen'] = true;
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
 		}
 
-		$r = q(
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'created',
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+			'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+		$items = Item::select(local_user(), $fields, $condition, $params);
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+
-			WHERE `item`.`visible` AND
+		if (DBM::is_result($items)) {
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND `item`.`wall`
+			$notifs = $this->formatNotifs(dba::inArray($items), $ident);
-				$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);
 		}
 
 		$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 +551,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 = "";
 
@@ -796,7 +587,6 @@ class NotificationsManager extends BaseObject
 
 		$arr = [
 			'ident' => $ident,
-			'total' => $total,
 			'notifications' => $notifs,
 		];
 

src/Model/Item.php

@@ -70,7 +70,7 @@ class Item extends BaseObject
 	 */
 	public static function select($uid, array $selected = [], array $condition = [], $params = [])
 	{
-		$fields = self::fieldlist();
+		$fields = self::fieldlist($selected);
 
 		$select_fields = self::constructSelectFields($fields, $selected);
 
@@ -85,7 +85,7 @@ class Item extends BaseObject
 		$table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false);
 
 		$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
-
+//echo $sql;
 		return dba::p($sql, $condition);
 	}
 
@@ -126,7 +126,7 @@ class Item extends BaseObject
 	 */
 	public static function selectThread($uid, array $selected = [], array $condition = [], $params = [])
 	{
-		$fields = self::fieldlist();
+		$fields = self::fieldlist($selected);
 
 		$threadfields = ['thread' => ['iid', 'uid', 'contact-id', 'owner-id', 'author-id',
 			'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private',
@@ -158,14 +158,14 @@ class Item extends BaseObject
 	 *
 	 * @return array field list
 	 */
-	private static function fieldlist()
+	private static function fieldlist($selected)
 	{
 		$item_fields = ['author-id', 'owner-id', 'contact-id', 'uid', 'id', 'parent',
 			'uri', 'thr-parent', 'parent-uri', 'content-warning',
 			'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
 			'guid', 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'event-id',
 			'location', 'coord', 'app', 'attach', 'rendered-hash', 'rendered-html', 'object',
-			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'unseen',
 			'id' => 'item_id', 'network' => 'item_network'];
 
 		$author_fields = ['url' => 'author-link', 'name' => 'author-name', 'thumb' => 'author-avatar'];
@@ -180,8 +180,15 @@ class Item extends BaseObject
 			'nofinish' => 'event-nofinish','adjust' => 'event-adjust',
 			'ignore' => 'event-ignore', 'id' => 'event-id'];
 
-		return ['item' => $item_fields, 'author' => $author_fields, 'owner' => $owner_fields,
+		$fields = ['item' => $item_fields, 'author' => $author_fields, 'owner' => $owner_fields,
 			'contact' => $contact_fields, 'event' => $event_fields];
+
+		if (!empty($selected)) {
+			$fields['parent-item'] = ['guid' => 'parent-guid'];
+			$fields['parent-item-author'] = ['url' => 'parent-author-link', 'name' => 'parent-author-name'];
+		}
+
+		return $fields;
 	}
 
 	/**
@@ -243,6 +250,14 @@ class Item extends BaseObject
 			$joins .= " LEFT JOIN `event` ON `event-id` = `event`.`id`";
 		}
 
+		if ((strpos($sql_commands, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-author`.") !== false)) {
+			$joins .= " STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`";
+		}
+
+		if (strpos($sql_commands, "`parent-item-author`.") !== false) {
+			$joins .= " STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`";
+		}
+
 		return $joins;
 	}