use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
+use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/datetime.php';
*/
function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
// Call the function "poco_load_worker" via the worker
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
+ Worker::add(PRIORITY_LOW, "discover_poco", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
}
/**
$network = NETWORK_OSTATUS;
}
}
- if (strstr($orig_version, 'Pleroma')) {
+ if (strstr($orig_version.$version, 'Pleroma')) {
$platform = 'Pleroma';
+ $version = trim(str_replace('Pleroma', '', $version));
}
}
$network = array(NETWORK_DFRN);
- if (get_config('system','diaspora_enabled')) {
+ if (Config::get('system','diaspora_enabled')) {
$network[] = NETWORK_DIASPORA;
}
- if (!get_config('system','ostatus_disabled')) {
+ if (!Config::get('system','ostatus_disabled')) {
$network[] = NETWORK_OSTATUS;
}
$done[] = System::baseUrl() . '/poco';
- if (strlen(get_config('system','directory'))) {
+ if (strlen(Config::get('system','directory'))) {
$x = fetch_url(get_server()."/pubsites");
if ($x) {
$j = json_decode($x);
$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
if (!dbm::is_result($r)) {
logger("Call server check for server ".$server_url, LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
+ Worker::add(PRIORITY_LOW, "discover_poco", "server", $server_url);
}
}
}
function poco_discover_federation() {
- $last = get_config('poco','last_federation_discovery');
+ $last = Config::get('poco','last_federation_discovery');
if ($last) {
$next = $last + (24 * 60 * 60);
$servers = json_decode($serverdata);
foreach ($servers->pods as $server) {
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
+ Worker::add(PRIORITY_LOW, "discover_poco", "server", "https://".$server->host);
}
}
foreach ($servers as $server) {
$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
+ Worker::add(PRIORITY_LOW, "discover_poco", "server", $url);
}
}
}
// Currently disabled, since the service isn't available anymore.
// It is not removed since I hope that there will be a successor.
// Discover GNU Social Servers.
- //if (!get_config('system','ostatus_disabled')) {
+ //if (!Config::get('system','ostatus_disabled')) {
// $serverdata = "http://gstools.org/api/get_open_instances/";
// $result = z_fetch_url($serverdata);
// }
//}
- set_config('poco','last_federation_discovery', time());
+ Config::set('poco','last_federation_discovery', time());
}
function poco_discover_single_server($id) {
poco_discover_server($data, 2);
- if (get_config('system','poco_discovery') > 1) {
+ if (Config::get('system','poco_discovery') > 1) {
- $timeframe = get_config('system','poco_discovery_since');
+ $timeframe = Config::get('system','poco_discovery_since');
if ($timeframe == 0) {
$timeframe = 30;
}
$success = poco_discover_server(json_decode($retdata["body"]));
}
- if (!$success && (get_config('system','poco_discovery') > 2)) {
+ if (!$success && (Config::get('system','poco_discovery') > 2)) {
logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
poco_discover_server_users($data, $server);
}
$no_of_queries = 5;
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
if ($requery_days == 0) {
$requery_days = 7;
}
logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
+ Worker::add(PRIORITY_LOW, "discover_poco", "update_server_directory", (int)$server['id']);
if (!$complete && (--$no_of_queries == 0)) {
break;
*/
function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
- $data = probe_url($contact["url"]);
+ $data = Probe::uri($contact["url"]);
if ($contact["network"] == NETWORK_OSTATUS) {
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
$contact["url"] = $data["url"];
if ($doprobing) {
logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]);
+ Worker::add(PRIORITY_LOW, 'gprobe', $contact["url"]);
}
return $gcontact_id;
$contact["updated"] = dbm::date();
}
+ if ($contact["network"] == NETWORK_TWITTER) {
+ $contact["server_url"] = 'http://twitter.com';
+ }
+
if ($contact["server_url"] == "") {
$data = Probe::uri($contact["url"]);
if ($data["network"] != NETWORK_PHANTOM) {
if ($update) {
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,
- `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"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
- dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
- dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
- dbesc($contact["server_url"]), dbesc($contact["connect"]),
- dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
-
+ $condition = array('`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
+ normalise_link($contact["url"]), $contact["generation"]);
+ $contact["updated"] = dbm::date($contact["updated"]);
+
+ $updated = array('photo' => $contact['photo'], 'name' => $contact['name'],
+ 'nick' => $contact['nick'], 'addr' => $contact['addr'],
+ 'network' => $contact['network'], 'birthday' => $contact['birthday'],
+ 'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
+ 'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'],
+ 'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'],
+ 'notify' => $contact['notify'], 'url' => $contact['url'],
+ 'location' => $contact['location'], 'about' => $contact['about'],
+ 'generation' => $contact['generation'], 'updated' => $contact['updated'],
+ 'server_url' => $contact['server_url'], 'connect' => $contact['connect']);
+
+ dba::update('gcontact', $updated, $condition, $fields);
// Now update the contact entry with the user id "0" as well.
// This is used for the shadow copies of public items.
dbesc(normalise_link($contact["url"])));
if (dbm::is_result($r)) {
- logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG);
+ logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
- q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s',
- `network` = '%s', `bd` = '%s', `gender` = '%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"]), intval($contact["contact-type"]),
- dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
- intval($r[0]["id"]));
+ $fields = array('name', 'nick', 'addr',
+ 'network', 'bd', 'gender',
+ 'keywords', 'alias', 'contact-type',
+ 'url', 'location', 'about');
+ $old_contact = dba::select('contact', $fields, array('id' => $r[0]["id"]), array('limit' => 1));
+
+ // Update it with the current values
+ $fields = array('name' => $contact['name'], 'nick' => $contact['nick'],
+ 'addr' => $contact['addr'], 'network' => $contact['network'],
+ 'bd' => $contact['birthday'], 'gender' => $contact['gender'],
+ 'keywords' => $contact['keywords'], 'alias' => $contact['alias'],
+ 'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
+ 'location' => $contact['location'], 'about' => $contact['about']);
+
+ dba::update('contact', $fields, array('id' => $r[0]["id"]), $old_contact);
}
}
* @param str $url profile link
*/
function update_gcontact_from_probe($url) {
- $data = probe_url($url);
+ $data = Probe::uri($url);
if (in_array($data["network"], array(NETWORK_PHANTOM))) {
logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
*/
function gs_discover() {
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
projects / friendica.git / blobdiff