X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGContact.php;h=6ffa0b2e7d0feaac0b87d2c7c36de59f41db9fa7;hb=bdc07b42139ed1f4c5f7c0f7afb29b7abdbb0bcd;hp=398fc77588766a3ed6609d5ef91ca20aaf2c0a24;hpb=2f28c2ebbfd8f66093d7081d40b1d48f65fcff20;p=friendica.git diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 398fc77588..6ffa0b2e7d 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -17,8 +17,7 @@ use Friendica\Network\Probe; use Friendica\Protocol\PortableContact; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; - -require_once 'include/dba.php'; +use Friendica\Util\Strings; /** * @brief This class handles GlobalContact related functions @@ -32,6 +31,7 @@ class GContact * @param string $mode Search mode (e.g. "community") * * @return array with search results + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function searchByName($search, $mode = '') { @@ -92,6 +92,7 @@ class GContact * @param integer $cid Contact ID * @param integer $zcid Global Contact ID * @return void + * @throws Exception */ public static function link($gcid, $uid = 0, $cid = 0, $zcid = 0) { @@ -106,16 +107,16 @@ class GContact /** * @brief Sanitize the given gcontact data * - * @param array $gcontact array with gcontact data - * @throw Exception - * * Generation: * 0: No definition * 1: Profiles on this server * 2: Contacts of profiles on this server * 3: Contacts of contacts of profiles on this server * 4: ... + * + * @param array $gcontact array with gcontact data * @return array $gcontact + * @throws Exception */ public static function sanitize($gcontact) { @@ -139,20 +140,20 @@ class GContact } // Assure that there are no parameter fragments in the profile url - if (in_array($gcontact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) { + if (empty($gcontact["network"]) || in_array($gcontact["network"], Protocol::FEDERATED)) { $gcontact['url'] = self::cleanContactUrl($gcontact['url']); } $alternate = PortableContact::alternateOStatusUrl($gcontact['url']); // The global contacts should contain the original picture, not the cached one - if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(System::baseUrl()."/photo/"))) { + if (($gcontact['generation'] != 1) && stristr(Strings::normaliseLink($gcontact['photo']), Strings::normaliseLink(System::baseUrl()."/photo/"))) { $gcontact['photo'] = ""; } if (!isset($gcontact['network'])) { $condition = ["`uid` = 0 AND `nurl` = ? AND `network` != '' AND `network` != ?", - normalise_link($gcontact['url']), Protocol::STATUSNET]; + Strings::normaliseLink($gcontact['url']), Protocol::STATUSNET]; $contact = DBA::selectFirst('contact', ['network'], $condition); if (DBA::isResult($contact)) { $gcontact['network'] = $contact["network"]; @@ -160,7 +161,7 @@ class GContact if (($gcontact['network'] == "") || ($gcontact['network'] == Protocol::OSTATUS)) { $condition = ["`uid` = 0 AND `alias` IN (?, ?) AND `network` != '' AND `network` != ?", - $gcontact['url'], normalise_link($gcontact['url']), Protocol::STATUSNET]; + $gcontact['url'], Strings::normaliseLink($gcontact['url']), Protocol::STATUSNET]; $contact = DBA::selectFirst('contact', ['network'], $condition); if (DBA::isResult($contact)) { $gcontact['network'] = $contact["network"]; @@ -172,7 +173,7 @@ class GContact $gcontact['network'] = ''; $fields = ['network', 'updated', 'server_url', 'url', 'addr']; - $gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($gcontact['url'])]); + $gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($gcontact['url'])]); if (DBA::isResult($gcnt)) { if (!isset($gcontact['network']) && ($gcnt["network"] != Protocol::STATUSNET)) { $gcontact['network'] = $gcnt["network"]; @@ -180,7 +181,7 @@ class GContact if ($gcontact['updated'] <= DBA::NULL_DATETIME) { $gcontact['updated'] = $gcnt["updated"]; } - if (!isset($gcontact['server_url']) && (normalise_link($gcnt["server_url"]) != normalise_link($gcnt["url"]))) { + if (!isset($gcontact['server_url']) && (Strings::normaliseLink($gcnt["server_url"]) != Strings::normaliseLink($gcnt["url"]))) { $gcontact['server_url'] = $gcnt["server_url"]; } if (!isset($gcontact['addr'])) { @@ -205,8 +206,8 @@ class GContact if ($alternate && ($gcontact['network'] == Protocol::OSTATUS)) { // Delete the old entry - if it exists - if (DBA::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) { - DBA::delete('gcontact', ['nurl' => normalise_link($orig_profile)]); + if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink($orig_profile)])) { + DBA::delete('gcontact', ['nurl' => Strings::normaliseLink($orig_profile)]); } } } @@ -215,7 +216,7 @@ class GContact throw new Exception('No name and photo for URL '.$gcontact['url']); } - if (!in_array($gcontact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) { + if (!in_array($gcontact['network'], Protocol::FEDERATED)) { throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']); } @@ -241,6 +242,7 @@ class GContact * @param integer $uid id * @param integer $cid id * @return integer + * @throws Exception */ public static function countCommonFriends($uid, $cid) { @@ -268,6 +270,7 @@ class GContact * @param integer $uid id * @param integer $zcid zcid * @return integer + * @throws Exception */ public static function countCommonFriendsZcid($uid, $zcid) { @@ -294,6 +297,7 @@ class GContact * @param integer $limit optional, default 9999 * @param boolean $shuffle optional, default false * @return object + * @throws Exception */ public static function commonFriends($uid, $cid, $start = 0, $limit = 9999, $shuffle = false) { @@ -332,6 +336,7 @@ class GContact * @param integer $limit optional, default 9999 * @param boolean $shuffle optional, default false * @return object + * @throws Exception */ public static function commonFriendsZcid($uid, $zcid, $start = 0, $limit = 9999, $shuffle = false) { @@ -361,6 +366,7 @@ class GContact * @param integer $uid user * @param integer $cid cid * @return integer + * @throws Exception */ public static function countAllFriends($uid, $cid) { @@ -386,6 +392,7 @@ class GContact * @param integer $start optional, default 0 * @param integer $limit optional, default 80 * @return array + * @throws Exception */ public static function allFriends($uid, $cid, $start = 0, $limit = 80) { @@ -409,10 +416,11 @@ class GContact } /** - * @param object $uid user + * @param int $uid user * @param integer $start optional, default 0 * @param integer $limit optional, default 80 * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function suggestionQuery($uid, $start = 0, $limit = 80) { @@ -429,7 +437,7 @@ class GContact // return $list; //} - $network = [Protocol::DFRN]; + $network = [Protocol::DFRN, Protocol::ACTIVITYPUB]; if (Config::get('system', 'diaspora_enabled')) { $network[] = Protocol::DIASPORA; @@ -450,7 +458,7 @@ class GContact where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d ) AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d) AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d) - AND `gcontact`.`updated` >= '%s' + AND `gcontact`.`updated` >= '%s' AND NOT `gcontact`.`hide` AND `gcontact`.`last_contact` >= `gcontact`.`last_failure` AND `gcontact`.`network` IN (%s) GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d", @@ -516,11 +524,10 @@ class GContact /** * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function updateSuggestions() { - $a = get_app(); - $done = []; /// @TODO Check if it is really neccessary to poll the own server @@ -569,6 +576,7 @@ class GContact * @param string $url Contact url * * @return string Contact url with the wanted parts + * @throws Exception */ public static function cleanContactUrl($url) { @@ -600,6 +608,8 @@ class GContact * * @param array $contact contact array (called by reference) * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function fixAlternateContactAddress(&$contact) { @@ -621,6 +631,8 @@ class GContact * @param array $contact contact array * * @return bool|int Returns false if not found, integer if contact was found + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function getId($contact) { @@ -652,13 +664,13 @@ class GContact self::fixAlternateContactAddress($contact); // Remove unwanted parts from the contact url (e.g. "?zrl=...") - if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) { + if (in_array($contact["network"], Protocol::FEDERATED)) { $contact["url"] = self::cleanContactUrl($contact["url"]); } DBA::lock('gcontact'); $fields = ['id', 'last_contact', 'last_failure', 'network']; - $gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($contact["url"])]); + $gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($contact["url"])]); if (DBA::isResult($gcnt)) { $gcontact_id = $gcnt["id"]; @@ -683,7 +695,7 @@ class GContact DBA::escape($contact["addr"]), DBA::escape($contact["network"]), DBA::escape($contact["url"]), - DBA::escape(normalise_link($contact["url"])), + DBA::escape(Strings::normaliseLink($contact["url"])), DBA::escape($contact["photo"]), DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()), @@ -693,7 +705,7 @@ class GContact intval($contact["generation"]) ); - $condition = ['nurl' => normalise_link($contact["url"])]; + $condition = ['nurl' => Strings::normaliseLink($contact["url"])]; $cnt = DBA::selectFirst('gcontact', ['id', 'network'], $condition, ['order' => ['id']]); if (DBA::isResult($cnt)) { $gcontact_id = $cnt["id"]; @@ -716,6 +728,8 @@ class GContact * @param array $contact contact array * * @return bool|int Returns false if not found, integer if contact was found + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function update($contact) { @@ -793,7 +807,7 @@ class GContact $contact["server_url"] = $data['baseurl']; } } else { - $contact["server_url"] = normalise_link($contact["server_url"]); + $contact["server_url"] = Strings::normaliseLink($contact["server_url"]); } if (($contact["addr"] == "") && ($contact["server_url"] != "") && ($contact["nick"] != "")) { @@ -822,7 +836,7 @@ class GContact if ($update) { Logger::log("Update gcontact for ".$contact["url"], Logger::DEBUG); $condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)', - normalise_link($contact["url"]), $contact["generation"]]; + Strings::normaliseLink($contact["url"]), $contact["generation"]]; $contact["updated"] = DateTimeFormat::utc($contact["updated"]); $updated = ['photo' => $contact['photo'], 'name' => $contact['name'], @@ -837,53 +851,134 @@ class GContact '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. - /// @todo Check if we really should do this. - // The quality of the gcontact table is mostly lower than the public contact - $public_contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]); - if (DBA::isResult($public_contact)) { - Logger::log("Update public contact ".$public_contact["id"], Logger::DEBUG); - - Contact::updateAvatar($contact["photo"], 0, $public_contact["id"]); - - $fields = ['name', 'nick', 'addr', - 'network', 'bd', 'gender', - 'keywords', 'alias', 'contact-type', - 'url', 'location', 'about']; - $old_contact = DBA::selectFirst('contact', $fields, ['id' => $public_contact["id"]]); - - // Update it with the current values - $fields = ['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']]; - - // Don't update the birthday field if not set or invalid - if (empty($contact['birthday']) || ($contact['birthday'] < '0001-01-01')) { - unset($fields['bd']); - } + return $gcontact_id; + } + + /** + * @brief Updates the gcontact entry from a given public contact id + * + * @param integer $cid contact id + * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function updateFromPublicContactID($cid) + { + self::updateFromPublicContact(['id' => $cid]); + } + + /** + * @brief Updates the gcontact entry from a given public contact url + * + * @param string $url contact url + * @return integer gcontact id + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function updateFromPublicContactURL($url) + { + return self::updateFromPublicContact(['nurl' => Strings::normaliseLink($url)]); + } + /** + * @brief Helper function for updateFromPublicContactID and updateFromPublicContactURL + * + * @param array $condition contact condition + * @return integer gcontact id + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function updateFromPublicContact($condition) + { + $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender', + 'bd', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archive', 'term-date', + 'created', 'updated', 'avatar', 'success_update', 'failure_update', 'forum', 'prv', + 'baseurl', 'sensitive', 'unsearchable']; - DBA::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact); + $contact = DBA::selectFirst('contact', $fields, array_merge($condition, ['uid' => 0, 'network' => Protocol::FEDERATED])); + if (!DBA::isResult($contact)) { + return 0; + } + + $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender', 'generation', + 'birthday', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archived', 'archive_date', + 'created', 'updated', 'photo', 'last_contact', 'last_failure', 'community', 'connect', + 'server_url', 'nsfw', 'hide', 'id']; + + $old_gcontact = DBA::selectFirst('gcontact', $fields, ['nurl' => $contact['nurl']]); + $do_insert = !DBA::isResult($old_gcontact); + if ($do_insert) { + $old_gcontact = []; + } + + $gcontact = []; + + // These fields are identical in both contact and gcontact + $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender', + 'contact-type', 'network', 'addr', 'notify', 'alias', 'created', 'updated']; + + foreach ($fields as $field) { + $gcontact[$field] = $contact[$field]; + } + + // These fields are having different names but the same content + $gcontact['server_url'] = $contact['baseurl'] ?? ''; // "baseurl" can be null, "server_url" not + $gcontact['nsfw'] = $contact['sensitive']; + $gcontact['hide'] = $contact['unsearchable']; + $gcontact['archived'] = $contact['archive']; + $gcontact['archive_date'] = $contact['term-date']; + $gcontact['birthday'] = $contact['bd']; + $gcontact['photo'] = $contact['avatar']; + $gcontact['last_contact'] = $contact['success_update']; + $gcontact['last_failure'] = $contact['failure_update']; + $gcontact['community'] = ($contact['forum'] || $contact['prv']); + + foreach (['last_contact', 'last_failure', 'updated'] as $field) { + if (!empty($old_gcontact[$field]) && ($old_gcontact[$field] >= $gcontact[$field])) { + unset($gcontact[$field]); } } - return $gcontact_id; + if (!$gcontact['archived']) { + $gcontact['archive_date'] = DBA::NULL_DATETIME; + } + + if (!empty($old_gcontact['created']) && ($old_gcontact['created'] > DBA::NULL_DATETIME) + && ($old_gcontact['created'] <= $gcontact['created'])) { + unset($gcontact['created']); + } + + if (empty($gcontact['birthday']) && ($gcontact['birthday'] <= DBA::NULL_DATETIME)) { + unset($gcontact['birthday']); + } + + if (empty($old_gcontact['generation']) || ($old_gcontact['generation'] > 2)) { + $gcontact['generation'] = 2; // We fetched the data directly from the other server + } + + if (!$do_insert) { + DBA::update('gcontact', $gcontact, ['nurl' => $contact['nurl']], $old_gcontact); + return $old_gcontact['id']; + } elseif (!$gcontact['archived']) { + DBA::insert('gcontact', $gcontact); + return DBA::lastInsertId(); + } } /** * @brief Updates the gcontact entry from probe * - * @param string $url profile link + * @param string $url profile link + * @param boolean $force Optional forcing of network probing (otherwise we use the cached data) * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function updateFromProbe($url) + public static function updateFromProbe($url, $force = false) { - $data = Probe::uri($url); + $data = Probe::uri($url, $force); if (in_array($data["network"], [Protocol::PHANTOM])) { Logger::log("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), Logger::DEBUG); @@ -899,7 +994,9 @@ class GContact * @brief Update the gcontact entry for a given user id * * @param int $uid User ID - * @return void + * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function updateForUser($uid) { @@ -950,7 +1047,9 @@ class GContact * If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this. * * @param string $server Server address - * @return void + * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function fetchGsUsers($server) { @@ -965,8 +1064,8 @@ class GContact $statistics = json_decode($curlResult->getBody()); - if (!empty($statistics->config)) { - if ($statistics->config->instance_with_ssl) { + if (!empty($statistics->config->instance_address)) { + if (!empty($statistics->config->instance_with_ssl)) { $server = "https://"; } else { $server = "http://"; @@ -975,8 +1074,8 @@ class GContact $server .= $statistics->config->instance_address; $hostname = $statistics->config->instance_address; - } elseif (!empty($statistics)) { - if ($statistics->instance_with_ssl) { + } elseif (!empty($statistics->instance_address)) { + if (!empty($statistics->instance_with_ssl)) { $server = "https://"; } else { $server = "http://"; @@ -1010,6 +1109,8 @@ class GContact /** * @brief Asking GNU Social server on a regular base for their user data * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function discoverGsUsers() { @@ -1017,11 +1118,16 @@ class GContact $last_update = date("c", time() - (60 * 60 * 24 * $requery_days)); - $r = q( - "SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5", - DBA::escape(Protocol::OSTATUS), - DBA::escape($last_update) - ); + $r = DBA::select('gserver', ['nurl', 'url'], [ + '`network` = ? + AND `last_contact` >= `last_failure` + AND `last_poco_query` < ?', + Protocol::OSTATUS, + $last_update + ], [ + 'limit' => 5, + 'order' => ['RAND()'] + ]); if (!DBA::isResult($r)) { return; @@ -1034,20 +1140,23 @@ class GContact } /** - * @return string + * Returns a random, global contact of the current node + * + * @return string The profile URL + * @throws Exception */ public static function getRandomUrl() { - $r = q( - "SELECT `url` FROM `gcontact` WHERE `network` = '%s' - AND `last_contact` >= `last_failure` - AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH - ORDER BY rand() LIMIT 1", - DBA::escape(Protocol::DFRN) - ); + $r = DBA::selectFirst('gcontact', ['url'], [ + '`network` = ? + AND `last_contact` >= `last_failure` + AND `updated` > ?', + Protocol::DFRN, + DateTimeFormat::utc('now - 1 month'), + ], ['order' => ['RAND()']]); if (DBA::isResult($r)) { - return dirname($r[0]['url']); + return $r['url']; } return '';