require_once('include/datetime.php');
require_once("include/Scrape.php");
+require_once("include/network.php");
require_once("include/html2bbcode.php");
require_once("include/Contact.php");
require_once("include/Photo.php");
if(! $url)
return;
- $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation') ;
+ $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ;
logger('poco_load: ' . $url, LOGGER_DEBUG);
$about = '';
$keywords = '';
$gender = '';
+ $contact_type = -1;
$generation = 0;
$name = $entry->displayName;
foreach($entry->tags as $tag)
$keywords = implode(", ", $tag);
+ if(isset($entry->contactType) AND ($entry->contactType >= 0))
+ $contact_type = $entry->contactType;
+
// If you query a Friendica server for its profiles, the network has to be Friendica
/// TODO It could also be a Redmatrix server
//if ($uid == 0)
poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
+ $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
+ update_gcontact($gcontact);
+
// Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
// Deactivated because we now update Friendica contacts in dfrn.php
//if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
function suggestion_query($uid, $start = 0, $limit = 80) {
- if(! $uid)
+ if (!$uid) {
return array();
+ }
+
+ $list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
+ if (!is_null($list)) {
+ return $list;
+ }
$network = array(NETWORK_DFRN);
$network[] = NETWORK_OSTATUS;
$sql_network = implode("', '", $network);
- //$sql_network = "'".$sql_network."', ''";
$sql_network = "'".$sql_network."'";
+ /// @todo This query is really slow
+ // By now we cache the data for five minutes
$r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact
INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id`
where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
intval($limit)
);
- if(count($r) && count($r) >= ($limit -1))
+ if (count($r) && count($r) >= ($limit -1)) {
+ Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
return $r;
+ }
$r2 = q("SELECT gcontact.* FROM gcontact
INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id`
while (sizeof($list) > ($limit))
array_pop($list);
+ Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
return $list;
}
}
// Fetch all users from the other server
- $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+ $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
logger("Fetch all users from the server ".$server["nurl"], LOGGER_DEBUG);
$updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
// Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
- $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+ $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
$success = false;
logger("Fetch contacts for the user ".$username." from the server ".$server["nurl"], LOGGER_DEBUG);
// Fetch all contacts from a given user from the other server
- $url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+ $url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
$retdata = z_fetch_url($url);
if ($retdata["success"])
$about = '';
$keywords = '';
$gender = '';
+ $contact_type = -1;
$generation = $default_generation;
$name = $entry->displayName;
if(isset($entry->generation) AND ($entry->generation > 0))
$generation = ++$entry->generation;
+ if(isset($entry->contactType) AND ($entry->contactType >= 0))
+ $contact_type = $entry->contactType;
+
if(isset($entry->tags))
foreach($entry->tags as $tag)
$keywords = implode(", ", $tag);
logger("Store profile ".$profile_url, LOGGER_DEBUG);
poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, 0, 0, 0);
+
+ $gcontact = array("url" => $profile_url, "contact-type" => $contact_type, "generation" => $generation);
+ update_gcontact($gcontact);
+
logger("Done for profile ".$profile_url, LOGGER_DEBUG);
}
}
if ($doprobing) {
logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
- proc_run('php', 'include/gprobe.php', bin2hex($contact["url"]));
+ proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
}
if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
return false;
$r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`,
- `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
+ `contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
FROM `gcontact` WHERE `id` = %d LIMIT 1",
intval($gcontact_id));
}
if ($update) {
- logger("Update gcontact for ".$contact["url"]." Callstack: ".App::callstack(), LOGGER_DEBUG);
+ logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s',
`birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d,
- `alias` = '%s', `notify` = '%s', `url` = '%s',
+ `contact-type` = %d, `alias` = '%s', `notify` = '%s', `url` = '%s',
`location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s',
`server_url` = '%s', `connect` = '%s'
WHERE `nurl` = '%s' AND (`generation` = 0 OR `generation` >= %d)",
dbesc($contact["photo"]), dbesc($contact["name"]), dbesc($contact["nick"]),
dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]),
dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
- intval($contact["nsfw"]), dbesc($contact["alias"]), dbesc($contact["notify"]),
- dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
- intval($contact["generation"]), dbesc($contact["updated"]),
+ intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
+ dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
+ dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]),
dbesc($contact["server_url"]), dbesc($contact["connect"]),
dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s',
`network` = '%s', `bd` = '%s', `gender` = '%s',
- `keywords` = '%s', `alias` = '%s', `url` = '%s',
- `location` = '%s', `about` = '%s'
+ `keywords` = '%s', `alias` = '%s', `contact-type` = %d,
+ `url` = '%s', `location` = '%s', `about` = '%s'
WHERE `id` = %d",
dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]),
dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]),
- dbesc($contact["keywords"]), dbesc($contact["alias"]), dbesc($contact["url"]),
- dbesc($contact["location"]), dbesc($contact["about"]), intval($r[0]["id"]));
+ dbesc($contact["keywords"]), dbesc($contact["alias"]), intval($contact["contact-type"]),
+ dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
+ intval($r[0]["id"]));
}
}