From: Michael Date: Tue, 9 Apr 2019 10:29:53 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/develop' into fetchprofile X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00071abf51bf37d5153e5742b5676c9d9e51aca9;hp=6ea531d2f814a017b6b0ba13e34ee846501c020a;p=friendica.git Merge remote-tracking branch 'upstream/develop' into fetchprofile --- diff --git a/config/dbstructure.config.php b/config/dbstructure.config.php index 8ae14ad41f..3996205db0 100755 --- a/config/dbstructure.config.php +++ b/config/dbstructure.config.php @@ -34,7 +34,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1309); + define('DB_UPDATE_VERSION', 1310); } return [ @@ -180,6 +180,7 @@ return [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], + "updated" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => "Date of last contact update"], "self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 if the contact is the user him/her self"], "remote_self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "rel" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "The kind of the relation between the user and the contact"], @@ -187,7 +188,7 @@ return [ "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network protocol of the contact"], "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name that this contact is known by"], "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Nick- and user name of the contact"], - "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "location" => ["type" => "varchar(255)", "default" => "", "comment" => ""], "about" => ["type" => "text", "comment" => ""], "keywords" => ["type" => "text", "comment" => "public keywords (interests) of the contact"], "gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""], diff --git a/database.sql b/database.sql index 9c4af9a43f..b9e70097ee 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2019.06-dev (Dalmatian Bellflower) --- DB_UPDATE_VERSION 1309 +-- DB_UPDATE_VERSION 1310 -- ------------------------------------------ @@ -138,6 +138,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', + `updated` datetime DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last contact update', `self` boolean NOT NULL DEFAULT '0' COMMENT '1 if the contact is the user him/her self', `remote_self` boolean NOT NULL DEFAULT '0' COMMENT '', `rel` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The kind of the relation between the user and the contact', @@ -145,7 +146,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `network` char(4) NOT NULL DEFAULT '' COMMENT 'Network protocol of the contact', `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this contact is known by', `nick` varchar(255) NOT NULL DEFAULT '' COMMENT 'Nick- and user name of the contact', - `location` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `location` varchar(255) DEFAULT '' COMMENT '', `about` text COMMENT '', `keywords` text COMMENT 'public keywords (interests) of the contact', `gender` varchar(32) NOT NULL DEFAULT '' COMMENT '', diff --git a/src/Model/Contact.php b/src/Model/Contact.php index fe373ae94a..ecbf7411c3 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -599,7 +599,10 @@ class Contact extends BaseObject } if ($update) { - $fields['name-date'] = DateTimeFormat::utcNow(); + if ($fields['name'] != $self['name']) { + $fields['name-date'] = DateTimeFormat::utcNow(); + } + $fields['updated'] = DateTimeFormat::utcNow(); DBA::update('contact', $fields, ['id' => $self['id']]); // Update the public contact as well @@ -1114,6 +1117,90 @@ class Contact extends BaseObject )", intval($uid), intval($uid)); } + /** + * Have a look at all contact tables for a given profile url. + * This function works as a replacement for probing the contact. + * + * @param string $url Contact URL + * @param integer $cid Contact ID + * + * @return array Contact array in the "probe" structure + */ + private static function getProbeDataFromDatabase($url, $cid) + { + // The link could be provided as http although we stored it as https + $ssl_url = str_replace('http://', 'https://', $url); + + $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', + 'photo', 'keywords', 'location', 'about', 'network', + 'priority', 'batch', 'request', 'confirm', 'poco']; + + if (!empty($cid)) { + $data = DBA::selectFirst('contact', $fields, ['id' => $cid]); + if (DBA::isResult($data)) { + return $data; + } + } + + $data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]); + + if (!DBA::isResult($data)) { + $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; + $data = DBA::selectFirst('contact', $fields, $condition); + } + + if (DBA::isResult($data)) { + // For security reasons we don't fetch key data from our users + $data["pubkey"] = ''; + return $data; + } + + $fields = ['url', 'addr', 'alias', 'notify', 'name', 'nick', + 'photo', 'keywords', 'location', 'about', 'network']; + $data = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]); + + if (!DBA::isResult($data)) { + $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; + $data = DBA::selectFirst('contact', $fields, $condition); + } + + if (DBA::isResult($data)) { + $data["pubkey"] = ''; + $data["poll"] = ''; + $data["priority"] = 0; + $data["batch"] = ''; + $data["request"] = ''; + $data["confirm"] = ''; + $data["poco"] = ''; + return $data; + } + + $data = ActivityPub::probeProfile($url, false); + if (!empty($data)) { + return $data; + } + + $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', + 'photo', 'network', 'priority', 'batch', 'request', 'confirm']; + $data = DBA::selectFirst('fcontact', $fields, ['url' => $url]); + + if (!DBA::isResult($data)) { + $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; + $data = DBA::selectFirst('contact', $fields, $condition); + } + + if (DBA::isResult($data)) { + $data["pubkey"] = ''; + $data["keywords"] = ''; + $data["location"] = ''; + $data["about"] = ''; + $data["poco"] = ''; + return $data; + } + + return []; + } + /** * @brief Fetch the contact id for a given URL and user * @@ -1154,11 +1241,11 @@ class Contact extends BaseObject /// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following // We first try the nurl (http://server.tld/nick), most common case - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]); + $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]); // Then the addr (nick@server.tld) if (!DBA::isResult($contact)) { - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]); + $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]); } // Then the alias (which could be anything) @@ -1166,19 +1253,25 @@ class Contact extends BaseObject // The link could be provided as http although we stored it as https $ssl_url = str_replace('http://', 'https://', $url); $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid]; - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition); + $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], $condition); } if (DBA::isResult($contact)) { $contact_id = $contact["id"]; // Update the contact every 7 days - $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days')); + $update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days')); // We force the update if the avatar is empty if (empty($contact['avatar'])) { $update_contact = true; } + + // Update the contact in the background if needed but it is called by the frontend + if ($update_contact && $no_update) { + Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id); + } + if (!$update_contact || $no_update) { return $contact_id; } @@ -1187,19 +1280,13 @@ class Contact extends BaseObject return 0; } - // When we don't want to update, we look if some of our users already know this contact - if ($no_update) { - $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', - 'photo', 'keywords', 'location', 'about', 'network', - 'priority', 'batch', 'request', 'confirm', 'poco']; - $data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]); - - if (DBA::isResult($data)) { - // For security reasons we don't fetch key data from our users - $data["pubkey"] = ''; - } + // When we don't want to update, we look if we know this contact in any way + if ($no_update && empty($default)) { + $data = self::getProbeDataFromDatabase($url, $contact_id); + $background_update = true; } else { $data = []; + $background_update = false; } if (empty($data)) { @@ -1217,44 +1304,16 @@ class Contact extends BaseObject return 0; } - // Get data from the gcontact table - $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network']; - $contact = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]); - if (!DBA::isResult($contact)) { - $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]); - } - - if (!DBA::isResult($contact)) { - $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', - 'photo', 'keywords', 'location', 'about', 'network', - 'priority', 'batch', 'request', 'confirm', 'poco']; - $contact = DBA::selectFirst('contact', $fields, ['addr' => $url]); - } - - // The link could be provided as http although we stored it as https - $ssl_url = str_replace('http://', 'https://', $url); - - if (!DBA::isResult($contact)) { - $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; - $contact = DBA::selectFirst('contact', $fields, $condition); - } - - if (!DBA::isResult($contact)) { - $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', - 'photo', 'network', 'priority', 'batch', 'request', 'confirm']; - $condition = ['url' => [$url, Strings::normaliseLink($url), $ssl_url]]; - $contact = DBA::selectFirst('fcontact', $fields, $condition); + $contact = array_merge(self::getProbeDataFromDatabase($url, $contact_id), $default); + if (empty($contact)) { + return 0; } - if (!empty($default)) { - $contact = $default; - } + $data = array_merge($data, $contact); + } - if (!DBA::isResult($contact)) { - return 0; - } else { - $data = array_merge($data, $contact); - } + if (empty($data)) { + return 0; } if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) { @@ -1305,6 +1364,11 @@ class Contact extends BaseObject $contact_id = $contacts[0]["id"]; + // Update in the background when we fetched the data solely from the database + if ($background_update) { + Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id); + } + // Update the newly created contact from data in the gcontact table $gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => Strings::normaliseLink($data["url"])]); if (DBA::isResult($gcontact)) { @@ -1385,7 +1449,7 @@ class Contact extends BaseObject $updated['name-date'] = DateTimeFormat::utcNow(); } - $updated['avatar-date'] = DateTimeFormat::utcNow(); + $updated['updated'] = DateTimeFormat::utcNow(); DBA::update('contact', $updated, ['id' => $contact_id], $contact); @@ -1684,6 +1748,7 @@ class Contact extends BaseObject } $ret['nurl'] = Strings::normaliseLink($ret['url']); + $ret['updated'] = DateTimeFormat::utcNow(); self::updateAvatar($ret['photo'], $uid, $id, true); diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index bf8fed94c6..22073a5028 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -89,14 +89,15 @@ class ActivityPub /** * Fetches a profile from the given url into an array that is compatible to Probe::uri * - * @param string $url profile url + * @param string $url profile url + * @param boolean $update Update the profile * @return array * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function probeProfile($url) + public static function probeProfile($url, $update = true) { - $apcontact = APContact::getByURL($url, true); + $apcontact = APContact::getByURL($url, $update); if (empty($apcontact)) { return false; } diff --git a/src/Worker/UpdateContact.php b/src/Worker/UpdateContact.php new file mode 100644 index 0000000000..ae3b06b506 --- /dev/null +++ b/src/Worker/UpdateContact.php @@ -0,0 +1,28 @@ + DateTimeFormat::utcNow()], ['id' => $contact_id]); + } + + Logger::info('Updated from probe', ['id' => $contact_id, 'success' => $success]); + } +}