X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=d5f63554fb3636c620472156e6108fc1ef873fca;hb=c3a532a9f682d0ceea70e65379018c59cf59efc4;hp=7415bac0a958bd5d1efc9236d93f5f4193a6cae3;hpb=bcd896c60431e43a78b29e82d42122e5fe31720e;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 7415bac0a9..d5f63554fb 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -22,6 +22,7 @@ use Friendica\Protocol\PortableContact; use Friendica\Protocol\Salmon; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; +use Friendica\Object\Image; use dba; require_once 'boot.php'; @@ -138,6 +139,95 @@ class Contact extends BaseObject return $return; } + /** + * Updates the self-contact for the provided user id + * + * @param int $uid + * @param boolean $update_avatar Force the avatar update + */ + public static function updateSelfFromUserID($uid, $update_avatar = false) + { + $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar', + 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl']; + $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); + if (!DBM::is_result($self)) { + return; + } + + $fields = ['nickname', 'page-flags', 'account-type']; + $user = dba::selectFirst('user', $fields, ['uid' => $uid]); + if (!DBM::is_result($user)) { + return; + } + + $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region', + 'country-name', 'gender', 'pub_keywords', 'xmpp']; + $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]); + if (!DBM::is_result($profile)) { + return; + } + + $fields = ['name' => $profile['name'], 'nick' => $user['nickname'], + 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), + 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'], + 'gender' => $profile['gender'], 'avatar' => $profile['photo'], + 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']]; + + $avatar = dba::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); + if (DBM::is_result($avatar)) { + if ($update_avatar) { + $fields['avatar-date'] = DateTimeFormat::utcNow(); + } + + // Creating the path to the avatar, beginning with the file suffix + $types = Image::supportedTypes(); + if (isset($types[$avatar['type']])) { + $file_suffix = $types[$avatar['type']]; + } else { + $file_suffix = 'jpg'; + } + + // We are adding a timestamp value so that other systems won't use cached content + $timestamp = strtotime($fields['avatar-date']); + + $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-'; + $suffix = '.' . $file_suffix . '?ts=' . $timestamp; + + $fields['photo'] = $prefix . '4' . $suffix; + $fields['thumb'] = $prefix . '5' . $suffix; + $fields['micro'] = $prefix . '6' . $suffix; + } else { + // We hadn't found a photo entry, so we use the default avatar + $fields['photo'] = System::baseUrl() . '/images/person-175.jpg'; + $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg'; + $fields['micro'] = System::baseUrl() . '/images/person-48.jpg'; + } + + $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY; + $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP; + + $update = false; + + foreach ($fields as $field => $content) { + if ($self[$field] != $content) { + $update = true; + } + } + + if ($update) { + $fields['name-date'] = DateTimeFormat::utcNow(); + dba::update('contact', $fields, ['id' => $self['id']]); + + // Update the public contact as well + dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); + + // Update the profile + $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.jpg', + 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.jpg']; + dba::update('profile', $fields, ['uid' => $uid, 'is-default' => true]); + } + } + /** * @brief Marks a contact for removal * @@ -173,20 +263,18 @@ class Contact extends BaseObject */ public static function terminateFriendship(array $user, array $contact) { - if ($contact['network'] === NETWORK_OSTATUS) { + if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) { // create an unfollow slap $item = []; $item['verb'] = NAMESPACE_OSTATUS . "/unfollow"; $item['follow'] = $contact["url"]; $slap = OStatus::salmon($item, $user); - if ((x($contact, 'notify')) && (strlen($contact['notify']))) { + if (!empty($contact['notify'])) { Salmon::slapper($user, $contact['notify'], $slap); } - } elseif ($contact['network'] === NETWORK_DIASPORA) { + } elseif ($contact['network'] == NETWORK_DIASPORA) { Diaspora::sendUnshare($user, $contact); - } elseif ($contact['network'] === NETWORK_DFRN) { - DFRN::deliver($user, $contact, 'placeholder', 1); } } @@ -223,7 +311,9 @@ class Contact extends BaseObject */ /// @todo Check for contact vitality via probing - $expiry = $contact['term-date'] . ' + 32 days '; + $archival_days = Config::get('system', 'archival_days', 32); + + $expiry = $contact['term-date'] . ' + ' . $archival_days . ' days '; if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) { /* Relationship is really truly dead. archive them rather than * delete, though if the owner tries to unarchive them we'll start @@ -260,9 +350,14 @@ class Contact extends BaseObject $fields = ['term-date' => NULL_DATE, 'archive' => false]; dba::update('contact', $fields, ['id' => $contact['id']]); - if ($contact['url'] != '') { + if (!empty($contact['url'])) { dba::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]); } + + if (!empty($contact['batch'])) { + $condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY]; + dba::update('contact', $fields, $condition); + } } /** @@ -328,7 +423,7 @@ class Contact extends BaseObject // Fetch the data from the gcontact table if (!DBM::is_result($r)) { $s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`, - `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` + `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` FROM `gcontact` WHERE `nurl` = ?", normalise_link($url)); $r = dba::inArray($s); } @@ -516,7 +611,7 @@ class Contact extends BaseObject } $sparkle = false; - if ($contact['network'] === NETWORK_DFRN) { + if (($contact['network'] === NETWORK_DFRN) && !$contact['self']) { $sparkle = true; $profile_link = System::baseUrl() . '/redir/' . $contact['id']; } else { @@ -533,18 +628,21 @@ class Contact extends BaseObject $profile_link = $profile_link . '?url=profile'; } - if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) { + if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) { $pm_url = System::baseUrl() . '/message/new/' . $contact['id']; } - if ($contact['network'] == NETWORK_DFRN) { + if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) { $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id']; } $contact_url = System::baseUrl() . '/contacts/' . $contact['id']; $posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts'; - $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1'; + + if (!$contact['self']) { + $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1'; + } /** * Menu array: @@ -654,10 +752,11 @@ class Contact extends BaseObject * @param string $url Contact URL * @param integer $uid The user id for the contact (0 = public contact) * @param boolean $no_update Don't update the contact + * @param array $default Default value for creating the contact when every else fails * * @return integer Contact ID */ - public static function getIdForURL($url, $uid = 0, $no_update = false) + public static function getIdForURL($url, $uid = 0, $no_update = false, $default = []) { logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG); @@ -669,11 +768,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-date'], ['nurl' => normalise_link($url), 'uid' => $uid]); + $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]); // Then the addr (nick@server.tld) if (!DBM::is_result($contact)) { - $contact = dba::selectFirst('contact', ['id', 'avatar-date'], ['addr' => $url, 'uid' => $uid]); + $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]); } // Then the alias (which could be anything) @@ -706,18 +805,48 @@ class Contact extends BaseObject $data = Probe::uri($url, "", $uid); // Last try in gcontact for unsupported networks - if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL])) { + if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) { if ($uid != 0) { return 0; } // Get data from the gcontact table - $gcontact = dba::selectFirst('gcontact', ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'], ['nurl' => normalise_link($url)]); - if (!DBM::is_result($gcontact)) { - return 0; + $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network']; + $contact = dba::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]); + if (!DBM::is_result($contact)) { + $contact = dba::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]); + } + + if (!DBM::is_result($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]); } - $data = array_merge($data, $gcontact); + if (!DBM::is_result($contact)) { + // The link could be provided as http although we stored it as https + $ssl_url = str_replace('http://', 'https://', $url); + $condition = ['alias' => [$url, normalise_link($url), $ssl_url]]; + $contact = dba::selectFirst('contact', $fields, $condition); + } + + if (!DBM::is_result($contact)) { + $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', + 'photo', 'network', 'priority', 'batch', 'request', 'confirm']; + $condition = ['url' => [$url, normalise_link($url), $ssl_url]]; + $contact = dba::selectFirst('fcontact', $fields, $condition); + } + + if (!empty($default)) { + $contact = $default; + } + + if (!DBM::is_result($contact)) { + return 0; + } else { + $data = array_merge($data, $contact); + } } if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) { @@ -1032,7 +1161,7 @@ class Contact extends BaseObject // Update the public contact (contact id = 0) if ($uid != 0) { - $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl']]); + $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]); if (DBM::is_result($pcontact)) { self::updateAvatar($avatar, 0, $pcontact['id'], $force); } @@ -1165,10 +1294,29 @@ class Contact extends BaseObject if (($network != '') && ($ret['network'] != $network)) { logger('Expected network ' . $network . ' does not match actual network ' . $ret['network']); - return result; + return $result; + } + + // check if we already have a contact + // the poll url is more reliable than the profile url, as we may have + // indirect links or webfinger links + + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' AND NOT `pending` LIMIT 1", + intval($uid), + dbesc($ret['poll']), + dbesc(normalise_link($ret['poll'])), + dbesc($ret['network']) + ); + + if (!DBM::is_result($r)) { + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1", + intval($uid), + dbesc(normalise_link($url)), + dbesc($ret['network']) + ); } - if ($ret['network'] === NETWORK_DFRN) { + if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) { if ($interactive) { if (strlen($a->path)) { $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']); @@ -1180,7 +1328,7 @@ class Contact extends BaseObject // NOTREACHED } - } elseif (Config::get('system', 'dfrn_only')) { + } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != NETWORK_DFRN)) { $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL; $result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL; return $result; @@ -1230,25 +1378,6 @@ class Contact extends BaseObject $writeable = 1; } - // check if we already have a contact - // the poll url is more reliable than the profile url, as we may have - // indirect links or webfinger links - - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' LIMIT 1", - intval($uid), - dbesc($ret['poll']), - dbesc(normalise_link($ret['poll'])), - dbesc($ret['network']) - ); - - if (!DBM::is_result($r)) { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1", - intval($uid), - dbesc(normalise_link($url)), - dbesc($ret['network']) - ); - } - if (DBM::is_result($r)) { // update contact $new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING); @@ -1309,16 +1438,16 @@ class Contact extends BaseObject ); if (DBM::is_result($r)) { - if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) { + if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) { // create a follow slap $item = []; $item['verb'] = ACTIVITY_FOLLOW; $item['follow'] = $contact["url"]; $slap = OStatus::salmon($item, $r[0]); - Salmon::slapper($r[0], $contact['notify'], $slap); - } - - if ($contact['network'] == NETWORK_DIASPORA) { + if (!empty($contact['notify'])) { + Salmon::slapper($r[0], $contact['notify'], $slap); + } + } elseif ($contact['network'] == NETWORK_DIASPORA) { $ret = Diaspora::sendShare($a->user, $contact); logger('share returns: ' . $ret); } @@ -1377,13 +1506,18 @@ class Contact extends BaseObject } if (is_array($contact)) { - if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING) + if (($contact['rel'] == CONTACT_IS_SHARING) || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) { dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true], ['id' => $contact['id'], 'uid' => $importer['uid']]); } // send email notification to owner? } else { + if (dba::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) { + logger('ignoring duplicated connection request from pending contact ' . $url); + return; + } + // create contact record q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, `blocked`, `readonly`, `pending`, `writable`) @@ -1517,4 +1651,29 @@ class Contact extends BaseObject } } } + + /** + * Remove the unavailable contact ids from the provided list + * + * @param array $contact_ids Contact id list + */ + public static function pruneUnavailable(array &$contact_ids) + { + if (empty($contact_ids)) { + return; + } + + $str = dbesc(implode(',', $contact_ids)); + + $stmt = dba::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0"); + + $return = []; + while($contact = dba::fetch($stmt)) { + $return[] = $contact['id']; + } + + dba::close($stmt); + + $contact_ids = $return; + } }