return false;
}
- $public_contact = q(
- "SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`,
- `contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
- FROM `gcontact` WHERE `id` = %d LIMIT 1",
- intval($gcontact_id)
- );
+ $public_contact = DBA::selectFirst('gcontact', [
+ 'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'gender', 'keywords',
+ 'contact-type', 'hide', 'nsfw', 'network', 'alias', 'notify', 'server_url', 'connect', 'updated', 'url'
+ ], ['id' => $gcontact_id]);
+
+ if (!DBA::isResult($public_contact)) {
+ return false;
+ }
// Get all field names
$fields = [];
- foreach ($public_contact[0] as $field => $data) {
+ foreach ($public_contact as $field => $data) {
$fields[$field] = $data;
}
- unset($fields["url"]);
- unset($fields["updated"]);
- unset($fields["hide"]);
+ unset($fields['url']);
+ unset($fields['updated']);
+ unset($fields['hide']);
// Bugfix: We had an error in the storing of keywords which lead to the "0"
// This value is still transmitted via poco.
- if (!empty($contact["keywords"]) && ($contact["keywords"] == "0")) {
- unset($contact["keywords"]);
+ if (isset($contact['keywords']) && ($contact['keywords'] == '0')) {
+ unset($contact['keywords']);
}
- if (!empty($public_contact[0]["keywords"]) && ($public_contact[0]["keywords"] == "0")) {
- $public_contact[0]["keywords"] = "";
+ if (isset($public_contact['keywords']) && ($public_contact['keywords'] == '0')) {
+ $public_contact['keywords'] = '';
}
// assign all unassigned fields from the database entry
foreach ($fields as $field => $data) {
- if (!isset($contact[$field]) || ($contact[$field] == "")) {
- $contact[$field] = $public_contact[0][$field];
+ if (empty($contact[$field])) {
+ $contact[$field] = $public_contact[$field];
}
}
- if (!isset($contact["hide"])) {
- $contact["hide"] = $public_contact[0]["hide"];
+ if (!isset($contact['hide'])) {
+ $contact['hide'] = $public_contact['hide'];
}
- $fields["hide"] = $public_contact[0]["hide"];
+ $fields['hide'] = $public_contact['hide'];
- if ($contact["network"] == Protocol::STATUSNET) {
- $contact["network"] = Protocol::OSTATUS;
+ if ($contact['network'] == Protocol::STATUSNET) {
+ $contact['network'] = Protocol::OSTATUS;
}
// Replace alternate OStatus user format with the primary one
self::fixAlternateContactAddress($contact);
- if (!isset($contact["updated"])) {
- $contact["updated"] = DateTimeFormat::utcNow();
+ if (!isset($contact['updated'])) {
+ $contact['updated'] = DateTimeFormat::utcNow();
}
- if ($contact["network"] == Protocol::TWITTER) {
- $contact["server_url"] = 'http://twitter.com';
+ if ($contact['network'] == Protocol::TWITTER) {
+ $contact['server_url'] = 'http://twitter.com';
}
- if ($contact["server_url"] == "") {
- $data = Probe::uri($contact["url"]);
- if ($data["network"] != Protocol::PHANTOM) {
- $contact["server_url"] = $data['baseurl'];
+ if (empty($contact['server_url'])) {
+ $data = Probe::uri($contact['url']);
+ if ($data['network'] != Protocol::PHANTOM) {
+ $contact['server_url'] = $data['baseurl'];
}
} else {
- $contact["server_url"] = Strings::normaliseLink($contact["server_url"]);
+ $contact['server_url'] = Strings::normaliseLink($contact['server_url']);
}
- if (($contact["addr"] == "") && ($contact["server_url"] != "") && ($contact["nick"] != "")) {
- $hostname = str_replace("http://", "", $contact["server_url"]);
- $contact["addr"] = $contact["nick"]."@".$hostname;
+ if (empty($contact['addr']) && !empty($contact['server_url']) && !empty($contact['nick'])) {
+ $hostname = str_replace('http://', '', $contact['server_url']);
+ $contact['addr'] = $contact['nick'] . '@' . $hostname;
}
// Check if any field changed
$update = false;
- unset($fields["generation"]);
+ unset($fields['generation']);
- if ((($contact["generation"] > 0) && ($contact["generation"] <= $public_contact[0]["generation"])) || ($public_contact[0]["generation"] == 0)) {
+ if ((($contact['generation'] > 0) && ($contact['generation'] <= $public_contact['generation'])) || ($public_contact['generation'] == 0)) {
foreach ($fields as $field => $data) {
- if ($contact[$field] != $public_contact[0][$field]) {
- Logger::log("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$public_contact[0][$field]."'", Logger::DEBUG);
+ if ($contact[$field] != $public_contact[$field]) {
+ Logger::debug('Difference found.', ['contact' => $contact["url"], 'field' => $field, 'new' => $contact[$field], 'old' => $public_contact[$field]]);
$update = true;
}
}
- if ($contact["generation"] < $public_contact[0]["generation"]) {
- Logger::log("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$public_contact[0]["generation"]."'", Logger::DEBUG);
+ if ($contact['generation'] < $public_contact['generation']) {
+ Logger::debug('Difference found.', ['contact' => $contact["url"], 'field' => 'generation', 'new' => $contact['generation'], 'old' => $public_contact['generation']]);
$update = true;
}
}
if ($update) {
- Logger::log("Update gcontact for ".$contact["url"], Logger::DEBUG);
+ Logger::debug('Update gcontact.', ['contact' => $contact['url']]);
$condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
Strings::normaliseLink($contact["url"]), $contact["generation"]];
$contact["updated"] = DateTimeFormat::utc($contact["updated"]);
- $updated = ['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']];
+ $updated = [
+ '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);
}
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function updateFromPublicContact($cid)
+ 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'];
- $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => 0, 'network' => Protocol::FEDERATED]);
+ 'created', 'updated', 'avatar', 'success_update', 'failure_update', 'forum', 'prv',
+ 'baseurl', 'sensitive', 'unsearchable'];
+
+ $contact = DBA::selectFirst('contact', $fields, array_merge($condition, ['uid' => 0, 'network' => Protocol::FEDERATED]));
if (!DBA::isResult($contact)) {
- return;
+ return 0;
}
- // These fields cannot be updated, since they don't exist in the contact table
- // hide, nsfw, server_url
- // "connect" does exist, but seems to contain the same as "addr"
-
$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'];
+ '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);
$old_gcontact = [];
}
- $gcontact = $contact;
+ $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['archived'] = $gcontact['archive'];
- unset($gcontact['archive']);
- $gcontact['archive_date'] = $gcontact['term-date'];
- unset($gcontact['term-date']);
- $gcontact['birthday'] = $gcontact['bd'];
- unset($gcontact['bd']);
- $gcontact['photo'] = $gcontact['avatar'];
- unset($gcontact['avatar']);
- $gcontact['last_contact'] = $gcontact['success_update'];
- unset($gcontact['success_update']);
- $gcontact['last_failure'] = $gcontact['failure_update'];
- unset($gcontact['failure_update']);
- $gcontact['community'] = ($gcontact['forum'] || $gcontact['prv']);
- unset($gcontact['forum']);
- unset($gcontact['prv']);
+ $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])) {
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();
}
}
projects / friendica.git / blobdiff