From f8c96d24b4d81df988f463fe68ea2b343c61203b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 16 Apr 2016 15:01:03 +0200 Subject: [PATCH 1/3] Speed up the contact search, proxy the images, search for addresses --- include/DirSearch.php | 13 +++++++------ include/acl_selectors.php | 2 +- mod/dirfind.php | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/DirSearch.php b/include/DirSearch.php index 8682cb18e..99a0698d4 100644 --- a/include/DirSearch.php +++ b/include/DirSearch.php @@ -13,9 +13,9 @@ class DirSearch { /** * @brief Search global contact table by nick or name - * * + * * @param string $search Name or nick - * @param string $mode Search mode + * @param string $mode Search mode (e.g. "community") * @return array with search results */ public static function global_search_by_name($search, $mode = '') { @@ -32,7 +32,7 @@ class DirSearch { else $ostatus = NETWORK_DFRN; - // check if fo + // check if we search only communities or every contact if($mode === "community") $extra_sql = " AND `community`"; else @@ -46,12 +46,13 @@ class DirSearch { AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s') WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND - (`gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql + (`gcontact`.`addr` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql GROUP BY `gcontact`.`nurl` - ORDER BY `gcontact`.`updated` DESC ", + ORDER BY `gcontact`.`nurl` DESC + LIMIT 40", intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND), dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora), - dbesc(escape_tags($search)), dbesc(escape_tags($search))); + dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search))); return $results; } diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 47f97250f..65f125b85 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -556,7 +556,7 @@ function acl_lookup(&$a, $out_type = 'json') { if($r) { foreach($r as $g) { $contacts[] = array( - "photo" => $g['photo'], + "photo" => proxy_url($g['photo'], false, PROXY_SIZE_MICRO), "name" => $g['name'], "nick" => (x($g['addr']) ? $g['addr'] : $g['url']), "network" => $g['network'], diff --git a/mod/dirfind.php b/mod/dirfind.php index 0dfe4d67a..f517bb72d 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -101,11 +101,11 @@ function dirfind_content(&$a, $prefix = "") { WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND (`gcontact`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR - `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql", + `gcontact`.`addr` REGEXP '%s' OR `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql", intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND), dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), - dbesc(escape_tags($search)), dbesc(escape_tags($search))); + dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search))); $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr` FROM `gcontact` @@ -115,13 +115,13 @@ function dirfind_content(&$a, $prefix = "") { WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND (`gcontact`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR - `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql + `gcontact`.`addr` REGEXP '%s' OR `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql GROUP BY `gcontact`.`nurl` ORDER BY `gcontact`.`updated` DESC LIMIT %d, %d", intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND), dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), - dbesc(escape_tags($search)), dbesc(escape_tags($search)), + dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), intval($startrec), intval($perpage)); $j = new stdClass(); $j->total = $count[0]["total"]; From bc4b5e1564619dbb35d9d15c8a375dadaa13c278 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 16 Apr 2016 15:37:34 +0200 Subject: [PATCH 2/3] rework autocomplete: don't show the id if contact doesn't have an id --- js/autocomplete.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/autocomplete.js b/js/autocomplete.js index dfe0bb320..51e01c6f7 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -84,7 +84,12 @@ function editor_replace(item) { // $2 ensures that prefix (@,@!) is preserved var id = item.id; - // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way. + + // don't add the id if it is empty (the id empty eg. if there are unknow contacts in thread) + if(id.length < 1) + return '$1$2' + item.nick; + + // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way. // 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id). if(id.length > 16) id = item.id.substring(0,16); From f83040f625730d35db81c6a50916719c4d5be4ae Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 16 Apr 2016 15:58:11 +0200 Subject: [PATCH 3/3] rework autocomplete: space after inserting contact without id --- js/autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/autocomplete.js b/js/autocomplete.js index 51e01c6f7..108447ad2 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -87,7 +87,7 @@ function editor_replace(item) { // don't add the id if it is empty (the id empty eg. if there are unknow contacts in thread) if(id.length < 1) - return '$1$2' + item.nick; + return '$1$2' + item.nick.replace(' ', '') + ' '; // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way. // 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).