harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix saved searches on network page, fix caching mith multiple autocompleters

Browse Source
This commit is contained in:
Stefan Parviainen 2015-01-08 17:16:08 +01:00
parent 4beb782014
commit 32c6eab01c
3 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mod/search_ac.php
View File

@ -1,8 +1,9 @@
<?php <?php
// Autocomplete for saved searches. Should probably be put in the same place as the other autocompletes
function search_ac_init(&$a){ function search_ac_init(&$a){
if(!local_user()) if(!local_user())
return ""; killme();
$start = (x($_REQUEST,'start')?$_REQUEST['start']:0); $start = (x($_REQUEST,'start')?$_REQUEST['start']:0);
@ -13,17 +14,6 @@ function search_ac_init(&$a){
$search = $_REQUEST['query']; $search = $_REQUEST['query'];
} }
$sql_extra = '';
$x = array();
$x['query'] = $search;
$x['photos'] = array();
$x['links'] = array();
$x['suggestions'] = array();
$x['data'] = array();
// Priority to people searches // Priority to people searches
if ($search) { if ($search) {
@ -32,18 +22,23 @@ function search_ac_init(&$a){
} }
$r = q("SELECT `abook_id`, `xchan_name`, `xchan_photo_s`, `xchan_url` FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d $r = q("SELECT `abook_id`, `xchan_name`, `xchan_photo_s`, `xchan_url`, `xchan_addr` FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d
$people_sql_extra $people_sql_extra
ORDER BY `xchan_name` ASC ", ORDER BY `xchan_name` ASC ",
intval(local_user()) intval(local_user())
); );
$results = array();
if($r) { if($r) {
foreach($r as $g) { foreach($r as $g) {
$x['photos'][] = $g['xchan_photo_s']; $results[] = array(
$x['links'][] = $g['xchan_url']; "photo" => $g['xchan_photo_s'],
$x['suggestions'][] = '@' . $g['xchan_name']; "name" => '@'.$g['xchan_name'],
$x['data'][] = 'cid=' . intval($g['abook_id']); "id" => $g['abook_id'],
"link" => $g['xchan_url'],
"label" => '',
"nick" => '',
);
} }
} }
@ -53,15 +48,24 @@ function search_ac_init(&$a){
if(count($r)) { if(count($r)) {
foreach($r as $g) { foreach($r as $g) {
$x['photos'][] = $a->get_baseurl() . '/images/hashtag.png'; $results[] = array(
$x['links'][] = $g['url']; "photo" => $a->get_baseurl() . '/images/hashtag.png',
$x['suggestions'][] = '#' . $g['term']; "name" => '#'.$g['term'],
$x['data'][] = intval($g['tid']); "id" => $g['tid'],
"link" => $g['url'],
"label" => '',
"nick" => '',
);
} }
} }
header("content-type: application/json"); header("content-type: application/json");
echo json_encode($x); $o = array(
'start' => $start,
'count' => $count,
'items' => $results,
);
echo json_encode($o);
logger('search_ac: ' . print_r($x,true)); logger('search_ac: ' . print_r($x,true));

19
view/js/autocomplete.js
View File

@ -5,12 +5,15 @@
*/ */
function contact_search(term, callback, backend_url, type, extra_channels) { function contact_search(term, callback, backend_url, type, extra_channels) {
// Check if there is a cached result that contains the same information we would get with a full server-side search // Check if there is a cached result that contains the same information we would get with a full server-side search
// Assume type hasn't changed
var bt = backend_url+type;
if(!(bt in contact_search.cache)) contact_search.cache[bt] = {};
var lterm = term.toLowerCase(); // Ignore case var lterm = term.toLowerCase(); // Ignore case
for(t in contact_search.cache) { for(t in contact_search.cache[bt]) {
if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results
// Filter old results locally // Filter old results locally
var matching = contact_search.cache[t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || x.nick.toLowerCase().indexOf(lterm) >= 0); }); var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || x.nick.toLowerCase().indexOf(lterm) >= 0); });
matching.unshift({taggable:false, text: term, replace: term}); matching.unshift({taggable:false, text: term, replace: term});
callback(matching); callback(matching);
return; return;
@ -36,7 +39,7 @@ function contact_search(term, callback, backend_url, type, extra_channels) {
// Cache results if we got them all (more information would not improve results) // Cache results if we got them all (more information would not improve results)
// data.count represents the maximum number of items // data.count represents the maximum number of items
if(data.items.length -1 < data.count) { if(data.items.length -1 < data.count) {
contact_search.cache[lterm] = data.items; contact_search.cache[bt][lterm] = data.items;
} }
var items = data.items.slice(0); var items = data.items.slice(0);
items.unshift({taggable:false, text: term, replace: term}); items.unshift({taggable:false, text: term, replace: term});
@ -48,8 +51,12 @@ contact_search.cache = {};
function contact_format(item) { function contact_format(item) {
if(typeof item.text === 'undefined') // Show contact information if not explicitly told to show something else
return "<div class='{0}' title='{4}'><img src='{1}'>{2} ({3})</div>".format(item.taggable, item.photo, item.name, ((item.label) ? item.nick + ' ' + item.label : item.nick), item.link) if(typeof item.text === 'undefined') {
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick)
if(desc) desc = ' ('+desc+')';
return "<div class='{0}' title='{4}'><img src='{1}'>{2}{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link)
}
else else
return "<div>"+item.text+"</div>" return "<div>"+item.text+"</div>"
} }

2
view/js/mod_network.js
View File

@ -1,5 +1,5 @@
$(document).ready(function() { $(document).ready(function() {
$("#search-text").contact_autocomplete(baseurl + '/acl'); $("#search-text").contact_autocomplete(baseurl + '/search_ac');
$('.jslider-scale ins').addClass('hidden-xs'); $('.jslider-scale ins').addClass('hidden-xs');
}); });