X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=5cf40a9f03abea010e6ad32909cff591f3fc1bbe;hb=ad20c5504deba9dbb4ea5c5deba598f2c448b344;hp=458f56ce524c1c3bfa87d8409de79a0e4234381c;hpb=fa33f94b29a9eef1e8e84adcb4dfa7458123a1c5;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index 458f56ce52..5cf40a9f03 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -8,7 +8,6 @@
 function user_remove($uid) {
 	if(! $uid)
 		return;
-	$a = get_app();
 	logger('Removing user: ' . $uid);
 
 	$r = q("select * from user where uid = %d limit 1", intval($uid));
@@ -22,6 +21,7 @@ function user_remove($uid) {
 		$r[0]['nickname']
 	);
 
+	/// @todo Should be done in a background job since this likely will run into a time out
 	// don't delete yet, will be done later when contacts have deleted my stuff
 	// q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
@@ -53,7 +53,7 @@ function user_remove($uid) {
 	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
 		unset($_SESSION['uid']);
-		goaway($a->get_baseurl());
+		goaway(App::get_baseurl());
 	}
 }
 
@@ -63,7 +63,7 @@ function contact_remove($id) {
 	$r = q("select uid from contact where id = %d limit 1",
 		intval($id)
 	);
-	if((! count($r)) || (! intval($r[0]['uid'])))
+	if((! dbm::is_result($r)) || (! intval($r[0]['uid'])))
 		return;
 
 	$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
@@ -74,25 +74,10 @@ function contact_remove($id) {
 		return;
 	}
 
-	q("DELETE FROM `contact` WHERE `id` = %d",
-		intval($id)
-	);
-	q("DELETE FROM `item` WHERE `contact-id` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `photo` WHERE `contact-id` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `mail` WHERE `contact-id` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `event` WHERE `cid` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `queue` WHERE `cid` = %d ",
-		intval($id)
-	);
+	q("DELETE FROM `contact` WHERE `id` = %d", intval($id));
 
+	// Delete the rest in the background
+	proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
 }
 
 
@@ -100,27 +85,19 @@ function contact_remove($id) {
 
 function terminate_friendship($user,$self,$contact) {
 
-
 	$a = get_app();
 
 	require_once('include/datetime.php');
 
 	if($contact['network'] === NETWORK_OSTATUS) {
 
-		$slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
-			'$name' => $user['username'],
-			'$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
-			'$photo' => $self['photo'],
-			'$thumb' => $self['thumb'],
-			'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
-			'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . get_guid(32),
-			'$title' => '',
-			'$type' => 'text',
-			'$content' => t('stopped following'),
-			'$nick' => $user['nickname'],
-			'$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
-			'$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
-		));
+		require_once('include/ostatus.php');
+
+		// create an unfollow slap
+		$item = array();
+		$item['verb'] = NAMESPACE_OSTATUS."/unfollow";
+		$item['follow'] = $contact["url"];
+		$slap = ostatus::salmon($item, $user);
 
 		if((x($contact,'notify')) && (strlen($contact['notify']))) {
 			require_once('include/salmon.php');
@@ -129,7 +106,7 @@ function terminate_friendship($user,$self,$contact) {
 	}
 	elseif($contact['network'] === NETWORK_DIASPORA) {
 		require_once('include/diaspora.php');
-		diaspora::send_unshare($user,$contact);
+		Diaspora::send_unshare($user,$contact);
 	}
 	elseif($contact['network'] === NETWORK_DFRN) {
 		require_once('include/dfrn.php');
@@ -145,7 +122,6 @@ function terminate_friendship($user,$self,$contact) {
 // This provides for the possibility that their database is temporarily messed
 // up or some other transient event and that there's a possibility we could recover from it.
 
-if(! function_exists('mark_for_death')) {
 function mark_for_death($contact) {
 
 	if($contact['archive'])
@@ -156,14 +132,24 @@ function mark_for_death($contact) {
 				dbesc(datetime_convert()),
 				intval($contact['id'])
 		);
-	}
-	else {
 
-		/// @todo 
+		if ($contact['url'] != '') {
+			q("UPDATE `contact` SET `term-date` = '%s'
+				WHERE `nurl` = '%s' AND `term-date` <= '1000-00-00'",
+					dbesc(datetime_convert()),
+					dbesc(normalise_link($contact['url']))
+			);
+		}
+	} else {
+
+		/// @todo
 		/// We really should send a notification to the owner after 2-3 weeks
 		/// so they won't be surprised when the contact vanishes and can take
 		/// remedial action if this was a serious mistake or glitch
 
+		/// @todo
+		/// Check for contact vitality via probing
+
 		$expiry = $contact['term-date'] . ' + 32 days ';
 		if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
 
@@ -171,31 +157,51 @@ function mark_for_death($contact) {
 			// archive them rather than delete
 			// though if the owner tries to unarchive them we'll start the whole process over again
 
-			q("update contact set `archive` = 1 where id = %d",
+			q("UPDATE `contact` SET `archive` = 1 WHERE `id` = %d",
 				intval($contact['id'])
 			);
-			q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
-
-			//contact_remove($contact['id']);
 
+			if ($contact['url'] != '') {
+				q("UPDATE `contact` SET `archive` = 1 WHERE `nurl` = '%s'",
+					dbesc(normalise_link($contact['url']))
+				);
+			}
 		}
 	}
 
-}}
+}
 
-if(! function_exists('unmark_for_death')) {
 function unmark_for_death($contact) {
+
+	$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` > '%s'",
+		intval($contact['id']),
+		dbesc('1000-00-00 00:00:00')
+	);
+
+	// We don't need to update, we never marked this contact as dead
+	if (!dbm::is_result($r)) {
+		return;
+	}
+
 	// It's a miracle. Our dead contact has inexplicably come back to life.
 	q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
 		dbesc('0000-00-00 00:00:00'),
 		intval($contact['id'])
 	);
-}}
+
+	if ($contact['url'] != '') {
+		q("UPDATE `contact` SET `term-date` = '%s' WHERE `nurl` = '%s'",
+			dbesc('0000-00-00 00:00:00'),
+			dbesc(normalise_link($contact['url']))
+		);
+	}
+}
 
 /**
  * @brief Get contact data for a given profile link
  *
  * The function looks at several places (contact table and gcontact table) for the contact
+ * It caches its result for the same script execution to prevent duplicate calls
  *
  * @param string $url The profile link
  * @param int $uid User id
@@ -204,8 +210,15 @@ function unmark_for_death($contact) {
  * @return array Contact data
  */
 function get_contact_details_by_url($url, $uid = -1, $default = array()) {
-	if ($uid == -1)
+	static $cache = array();
+
+	if ($uid == -1) {
 		$uid = local_user();
+	}
+
+	if (isset($cache[$url][$uid])) {
+		return $cache[$url][$uid];
+	}
 
 	// Fetch contact data from the contact table for the given user
 	$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
@@ -223,16 +236,19 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	// Fetch the data from the gcontact table
 	if (!$r)
 		$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
-			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, 0 AS `contact-type`, `birthday`, 0 AS `self`
+			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
 			FROM `gcontact` WHERE `nurl` = '%s'",
 				dbesc(normalise_link($url)));
 
-	if ($r) {
+	if (dbm::is_result($r)) {
 		// If there is more than one entry we filter out the connector networks
-		if (count($r) > 1)
-			foreach ($r AS $id => $result)
-				if ($result["network"] == NETWORK_STATUSNET)
+		if (count($r) > 1) {
+			foreach ($r AS $id => $result) {
+				if ($result["network"] == NETWORK_STATUSNET) {
 					unset($r[$id]);
+				}
+			}
+		}
 
 		$profile = array_shift($r);
 
@@ -251,31 +267,40 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 			$profile["bd"] = $current_year."-".$month."-".$day;
 			$current = $current_year."-".$current_month."-".$current_day;
 
-			if ($profile["bd"] < $current)
+			if ($profile["bd"] < $current) {
 				$profile["bd"] = (++$current_year)."-".$month."-".$day;
-		} else
+			}
+		} else {
 			$profile["bd"] = "0000-00-00";
-	} else
+		}
+	} else {
 		$profile = $default;
+	}
 
-	if (($profile["photo"] == "") AND isset($default["photo"]))
+	if (($profile["photo"] == "") AND isset($default["photo"])) {
 		$profile["photo"] = $default["photo"];
+	}
 
-	if (($profile["name"] == "") AND isset($default["name"]))
+	if (($profile["name"] == "") AND isset($default["name"])) {
 		$profile["name"] = $default["name"];
+	}
 
-	if (($profile["network"] == "") AND isset($default["network"]))
+	if (($profile["network"] == "") AND isset($default["network"])) {
 		$profile["network"] = $default["network"];
+	}
 
-	if (($profile["thumb"] == "") AND isset($profile["photo"]))
+	if (($profile["thumb"] == "") AND isset($profile["photo"])) {
 		$profile["thumb"] = $profile["photo"];
+	}
 
-	if (($profile["micro"] == "") AND isset($profile["thumb"]))
+	if (($profile["micro"] == "") AND isset($profile["thumb"])) {
 		$profile["micro"] = $profile["thumb"];
+	}
 
 	if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND
-		in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+		in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
 		proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
+	}
 
 	// Show contact details of Diaspora contacts only if connected
 	if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
@@ -285,87 +310,93 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 		$profile["birthday"] = "0000-00-00";
 	}
 
-	return($profile);
-}
+	$cache[$url][$uid] = $profile;
 
-if(! function_exists('contact_photo_menu')){
-function contact_photo_menu($contact, $uid = 0) {
+	return $profile;
+}
 
+if (! function_exists('contact_photo_menu')) {
+function contact_photo_menu($contact, $uid = 0)
+{
 	$a = get_app();
 
-	$contact_url="";
-	$pm_url="";
-	$status_link="";
-	$photos_link="";
-	$posts_link="";
-	$contact_drop_link = "";
-	$poke_link="";
+	$contact_url = '';
+	$pm_url = '';
+	$status_link = '';
+	$photos_link = '';
+	$posts_link = '';
+	$contact_drop_link = '';
+	$poke_link = '';
 
-	if ($uid == 0)
+	if ($uid == 0) {
 		$uid = local_user();
+	}
 
-	if ($contact["uid"] != $uid) {
+	if ($contact['uid'] != $uid) {
 		if ($uid == 0) {
 			$profile_link = zrl($contact['url']);
-			$menu = Array('profile' => array(t("View Profile"), $profile_link, true));
+			$menu = Array('profile' => array(t('View Profile'), $profile_link, true));
 
 			return $menu;
 		}
 
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d",
-			dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid));
-		if ($r)
+			dbesc($contact['nurl']), dbesc($contact['network']), intval($uid));
+		if ($r) {
 			return contact_photo_menu($r[0], $uid);
-		else {
+		} else {
 			$profile_link = zrl($contact['url']);
 			$connlnk = 'follow/?url='.$contact['url'];
-			$menu = Array(
-				'profile' => array(t("View Profile"), $profile_link, true),
-				'follow' => array(t("Connect/Follow"), $connlnk, true)
-				);
+			$menu = array(
+				'profile' => array(t('View Profile'), $profile_link, true),
+				'follow' => array(t('Connect/Follow'), $connlnk, true)
+			);
 
 			return $menu;
 		}
 	}
 
 	$sparkle = false;
-	if($contact['network'] === NETWORK_DFRN) {
+	if ($contact['network'] === NETWORK_DFRN) {
 		$sparkle = true;
-		$profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
-	}
-	else
+		$profile_link = App::get_baseurl() . '/redir/' . $contact['id'];
+	} else {
 		$profile_link = $contact['url'];
+	}
 
-	if($profile_link === 'mailbox')
+	if ($profile_link === 'mailbox') {
 		$profile_link = '';
+	}
 
-	if($sparkle) {
-		$status_link = $profile_link . "?url=status";
-		$photos_link = $profile_link . "?url=photos";
-		$profile_link = $profile_link . "?url=profile";
+	if ($sparkle) {
+		$status_link = $profile_link . '?url=status';
+		$photos_link = $profile_link . '?url=photos';
+		$profile_link = $profile_link . '?url=profile';
 	}
 
-	if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA)))
-		$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+	if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
+		$pm_url = App::get_baseurl() . '/message/new/' . $contact['id'];
+	}
 
-	if ($contact["network"] == NETWORK_DFRN)
-		$poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+	if ($contact['network'] == NETWORK_DFRN) {
+		$poke_link = App::get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+	}
 
-	$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
-	$posts_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/posts';
-	$contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
+	$contact_url = App::get_baseurl() . '/contacts/' . $contact['id'];
 
+	$posts_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
+	$contact_drop_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
 
 	/**
 	 * menu array:
 	 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
 	 */
-	$menu = Array(
+	$menu = array(
 		'status' => array(t("View Status"), $status_link, true),
 		'profile' => array(t("View Profile"), $profile_link, true),
-		'photos' => array(t("View Photos"), $photos_link,true),
-		'network' => array(t("Network Posts"), $posts_link,false),
-		'edit' => array(t("Edit Contact"), $contact_url, false),
+		'photos' => array(t("View Photos"), $photos_link, true),
+		'network' => array(t("Network Posts"), $posts_link, false),
+		'edit' => array(t("View Contact"), $contact_url, false),
 		'drop' => array(t("Drop Contact"), $contact_drop_link, false),
 		'pm' => array(t("Send PM"), $pm_url, false),
 		'poke' => array(t("Poke"), $poke_link, false),
@@ -378,9 +409,11 @@ function contact_photo_menu($contact, $uid = 0) {
 
 	$menucondensed = array();
 
-	foreach ($menu AS $menuname=>$menuitem)
-		if ($menuitem[1] != "")
+	foreach ($menu AS $menuname => $menuitem) {
+		if ($menuitem[1] != '') {
 			$menucondensed[$menuname] = $menuitem;
+		}
+	}
 
 	return $menucondensed;
 }}
@@ -393,7 +426,7 @@ function random_profile() {
 			ORDER BY rand() LIMIT 1",
 		dbesc(NETWORK_DFRN));
 
-	if(count($r))
+	if (dbm::is_result($r))
 		return dirname($r[0]['url']);
 	return '';
 }
@@ -422,9 +455,20 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
 	return $r;
 }
 
-function get_contact($url, $uid = 0) {
+/**
+ * @brief Fetch the contact id for a given url and user
+ *
+ * @param string $url Contact URL
+ * @param integer $uid The user id for the contact
+ * @param boolean $no_update Don't update the contact
+ *
+ * @return integer Contact ID
+ */
+function get_contact($url, $uid = 0, $no_update = false) {
 	require_once("include/Scrape.php");
 
+	logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
+
 	$data = array();
 	$contactid = 0;
 
@@ -454,8 +498,9 @@ function get_contact($url, $uid = 0) {
 		$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -7 days'));
 		//$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
 
-		if (!$update_photo)
+		if (!$update_photo OR $no_update) {
 			return($contactid);
+		}
 	} elseif ($uid != 0)
 		return 0;
 
@@ -481,9 +526,9 @@ function get_contact($url, $uid = 0) {
 	if ($contactid == 0) {
 		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
 					`name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
-					`batch`, `request`, `confirm`, `poco`,
+					`batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`,
 					`writable`, `blocked`, `readonly`, `pending`)
-					VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
+					VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
 			intval($uid),
 			dbesc(datetime_convert()),
 			dbesc($data["url"]),
@@ -502,7 +547,9 @@ function get_contact($url, $uid = 0) {
 			dbesc($data["batch"]),
 			dbesc($data["request"]),
 			dbesc($data["confirm"]),
-			dbesc($data["poco"])
+			dbesc($data["poco"]),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert())
 		);
 
 		$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
@@ -533,16 +580,27 @@ function get_contact($url, $uid = 0) {
 
 	update_contact_avatar($data["photo"],$uid,$contactid);
 
-	q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
-		`name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
-		dbesc($data["addr"]),
-		dbesc($data["alias"]),
-		dbesc($data["name"]),
-		dbesc($data["nick"]),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		intval($contactid)
-	);
+	$r = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact`  WHERE `id` = %d", intval($contactid));
+
+	// This condition should always be true
+	if (!dbm::is_result($r))
+		return $contactid;
+
+	// Only update if there had something been changed
+	if (($data["addr"] != $r[0]["addr"]) OR
+		($data["alias"] != $r[0]["alias"]) OR
+		($data["name"] != $r[0]["name"]) OR
+		($data["nick"] != $r[0]["nick"]))
+		q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
+			`name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
+			dbesc($data["addr"]),
+			dbesc($data["alias"]),
+			dbesc($data["name"]),
+			dbesc($data["nick"]),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			intval($contactid)
+		);
 
 	return $contactid;
 }
@@ -599,57 +657,55 @@ function posts_from_gcontact($a, $gcontact_id) {
 
 	return $o;
 }
-
 /**
- * @brief Returns posts from a given contact
+ * @brief Returns posts from a given contact url
  *
  * @param App $a argv application class
- * @param int $contact_id contact
+ * @param string $contact_url Contact URL
  *
  * @return string posts in HTML
  */
-function posts_from_contact($a, $contact_id) {
+function posts_from_contact_url($a, $contact_url) {
 
 	require_once('include/conversation.php');
 
-	$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
-	if (!$r)
-		return false;
+	// There are no posts with "uid = 0" with connector networks
+	// This speeds up the query a lot
+	$r = q("SELECT `network`, `id` AS `author-id` FROM `contact`
+		WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
+		dbesc(normalise_link($contact_url)));
+	if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+		$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
+	} else {
+		$sql = "`item`.`uid` = %d";
+	}
 
-	$contact = $r[0];
+	$author_id = intval($r[0]["author-id"]);
 
-	if(get_config('system', 'old_pager')) {
+	if (get_config('system', 'old_pager')) {
 		$r = q("SELECT COUNT(*) AS `total` FROM `item`
-			WHERE `item`.`uid` = %d AND `author-link` IN ('%s', '%s')",
-			intval(local_user()),
-			dbesc(str_replace("https://", "http://", $contact["url"])),
-			dbesc(str_replace("http://", "https://", $contact["url"])));
+			WHERE `author-id` = %d and $sql",
+			intval($author_id),
+			intval(local_user()));
 
 		$a->set_pager_total($r[0]['total']);
 	}
 
-	$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
-			`author-name` AS `name`, `owner-avatar` AS `photo`,
-			`owner-link` AS `url`, `owner-avatar` AS `thumb`
-		FROM `item` FORCE INDEX (`uid_contactid_id`)
-		WHERE `item`.`uid` = %d AND `contact-id` = %d
-			AND `author-link` IN ('%s', '%s')
-			AND NOT `deleted` AND NOT `moderated` AND `visible`
-		ORDER BY `item`.`id` DESC LIMIT %d, %d",
+	$r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
+		" ORDER BY `item`.`created` DESC LIMIT %d, %d",
+		intval($author_id),
 		intval(local_user()),
-		intval($contact_id),
-		dbesc(str_replace("https://", "http://", $contact["url"])),
-		dbesc(str_replace("http://", "https://", $contact["url"])),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
 
-	$o .= conversation($a,$r,'community',false);
+	$o = conversation($a,$r,'community',false);
 
-	if(!get_config('system', 'old_pager'))
+	if (!get_config('system', 'old_pager')) {
 		$o .= alt_pager($a,count($r));
-	else
+	} else {
 		$o .= paginate($a);
+	}
 
 	return $o;
 }