X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=bbfb399238df47f38b8c69ad5b9ae2c91430b00a;hb=9ea6d4b26d4375502c567276705dff2ff678122e;hp=b5fef04b3178874d0ecc6da03a91fb9615fb2302;hpb=27d94023eef0263a3ce9750f79a73ac941a25304;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index b5fef04b31..bbfb399238 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,105 @@ 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; + + // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine. + $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname']; + $fields['nurl'] = normalise_link($fields['url']); + $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname']; + $fields['notify'] = System::baseUrl() . '/dfrn_notify/' . $user['nickname']; + $fields['poll'] = System::baseUrl() . '/dfrn_poll/' . $user['nickname']; + $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname']; + $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname']; + + $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 * @@ -221,7 +321,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 @@ -258,9 +360,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); + } } /** @@ -326,7 +433,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); } @@ -655,10 +762,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); @@ -707,18 +815,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)]); } - $data = array_merge($data, $gcontact); + 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]); + } + + 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)) { @@ -911,7 +1049,7 @@ class Contact extends BaseObject $contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id'); - $r = q(item_query() . " AND `item`.`" . $contact . "` = %d AND " . $sql . + $r = q(item_query(local_user()) . " AND `item`.`" . $contact . "` = %d AND " . $sql . " AND `item`.`verb` = '%s' ORDER BY `item`.`created` DESC LIMIT %d, %d", intval($author_id), intval(local_user()), dbesc(ACTIVITY_POST), intval($a->pager['start']), intval($a->pager['itemspage']) @@ -1166,7 +1304,7 @@ 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 @@ -1385,6 +1523,11 @@ class Contact extends BaseObject } // 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`)