From: Hypolite Petovan <ben.lort@gmail.com>
Date: Mon, 6 Mar 2017 21:26:04 +0000 (-0500)
Subject: Switch nurl and addr lookups
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=97378893cd5875b37647f41e57349ba8af51b8c7;p=friendica.git

Switch nurl and addr lookups

- nurl lookup is more frequent than addr lookup, saves queries
---

diff --git a/include/Contact.php b/include/Contact.php
index 845ee168cc..1fcdc6951c 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -534,19 +534,20 @@ function get_contact($url, $uid = 0, $no_update = false) {
 	$data = array();
 	$contact_id = 0;
 
-	// We first try the addr (nick@server.tld)
+	// We first try the nurl (http://server.tld/nick), most common case
 	$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
-				WHERE `addr` = '%s'
-				AND `uid` = %d",
-		dbesc($url),
-		intval($uid));
+					WHERE `nurl` = '%s'
+					AND `uid` = %d",
+			dbesc(normalise_link($url)),
+			intval($uid));
 
-	// Then the nurl (http://server.tld/nick)
+
+	// Then the addr (nick@server.tld)
 	if (! dbm::is_result($contacts)) {
 		$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
-					WHERE `nurl` = '%s'
+					WHERE `addr` = '%s'
 					AND `uid` = %d",
-			dbesc(normalise_link($url)),
+			dbesc($url),
 			intval($uid));
 	}