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

reduce the likelihood that a given channel will have 30-40 valid hublocs with the same hubloc_url.

Browse Source
This commit is contained in:
friendica 2013-11-27 02:51:16 -08:00
parent e3f5c4458b
commit 64b467ea98
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/zot.php
View File

@ -18,33 +18,20 @@ function zot_new_uid($channel_nick) {
/** /**
* * @function zot_get_hublocs($hash)
* Given an array of zot hashes, return all distinct hubs * Given a zot hash, return all distinct hubs
* If primary is true, return only primary hubs * @param string $hash - xchan_hash
* Result is ordered by url to assist in batching. * @retuns array
* Return only the first primary hub as there should only be one.
* *
*/ */
function zot_get_hubloc($arr,$primary = false) { function zot_get_hublocs($hash) {
$tmp = ''; $ret = q("select * from hubloc where hubloc_hash = '%s' group by hubloc_url ",
dbesc($hash)
if(is_array($arr)) { );
foreach($arr as $e) {
if(strlen($tmp))
$tmp .= ',';
$tmp .= "'" . dbesc($e) . "'" ;
}
}
if(! strlen($tmp))
return array();
$sql_extra = (($primary) ? " and hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) : "" );
$limit = (($primary) ? " limit 1 " : "");
return q("select * from hubloc where hubloc_hash in ( $tmp ) $sql_extra order by hubloc_url $limit");
return $ret;
} }
/* /*

2
mod/zfinger.php
View File

@ -164,7 +164,7 @@ function zfinger_init(&$a) {
$ret['locations'] = array(); $ret['locations'] = array();
$x = zot_get_hubloc(array($e['channel_hash'])); $x = zot_get_hublocs($e['channel_hash']);
if($x && count($x)) { if($x && count($x)) {
foreach($x as $hub) { foreach($x as $hub) {
if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) {