link socgraph to zrls
This commit is contained in:
parent
f8acb32961
commit
0ca4fa78c8
2 changed files with 21 additions and 25 deletions
|
@ -36,20 +36,24 @@ function gprobe_run($argv, $argc){
|
||||||
dbesc(normalise_link($url))
|
dbesc(normalise_link($url))
|
||||||
);
|
);
|
||||||
|
|
||||||
if(count($r))
|
if(! count($r)) {
|
||||||
return;
|
|
||||||
|
|
||||||
$arr = probe_url($url);
|
$arr = probe_url($url);
|
||||||
|
if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) {
|
||||||
if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) {
|
q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
|
||||||
q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
|
values ( '%s', '%s', '%s', '%s') ",
|
||||||
values ( '%s', '%s', '%s', '%s') ",
|
dbesc($arr['name']),
|
||||||
dbesc($arr['name']),
|
dbesc($arr['url']),
|
||||||
dbesc($arr['url']),
|
dbesc(normalise_link($arr['url'])),
|
||||||
dbesc(normalise_link($arr['url'])),
|
dbesc($arr['photo'])
|
||||||
dbesc($arr['photo'])
|
);
|
||||||
|
}
|
||||||
|
$r = q("select * from gcontact where nurl = '%s' limit 1",
|
||||||
|
dbesc(normalise_link($url))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
if(count($r))
|
||||||
|
poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,6 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
|
||||||
if(($a->get_curl_code() > 299) || (! $s))
|
if(($a->get_curl_code() > 299) || (! $s))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
$j = json_decode($s);
|
$j = json_decode($s);
|
||||||
|
|
||||||
logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
|
logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
|
||||||
|
@ -81,7 +80,6 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
|
||||||
$connect_url = str_replace('acct:' , '', $url->value);
|
$connect_url = str_replace('acct:' , '', $url->value);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
foreach($entry->photos as $photo) {
|
foreach($entry->photos as $photo) {
|
||||||
if($photo->type == 'profile') {
|
if($photo->type == 'profile') {
|
||||||
|
@ -156,17 +154,11 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
|
||||||
}
|
}
|
||||||
logger("poco_load: loaded $total entries",LOGGER_DEBUG);
|
logger("poco_load: loaded $total entries",LOGGER_DEBUG);
|
||||||
|
|
||||||
if($zcid) {
|
q("delete from glink where `cid` = %d and `uid` = %d and `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
|
||||||
q("delete from glink where `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 14 DAY",
|
intval($cid),
|
||||||
intval($zcid)
|
intval($uid),
|
||||||
);
|
intval($zcid)
|
||||||
}
|
);
|
||||||
else {
|
|
||||||
q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
|
|
||||||
intval($cid),
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue