X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=30fa41307d4103047b16b708c51f34a9546df290;hb=96809b3fddbd49d5e722cb8e26859c5b02437174;hp=99e34abd20a02390d340cc82eb7e0291d07bd247;hpb=9636ffe27d448ff05d536595270fdb60c6826262;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 99e34abd20..30fa41307d 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1,6 +1,6 @@ $contact['url']]); + $pcid = self::getIdForURL($contact['url'], 0, false, ['url' => $contact['url']]); if (empty($pcid)) { return []; } $ucid = $contact['id']; } else { $pcid = $contact['id']; - $ucid = Contact::getIdForURL($contact['url'], $uid); + $ucid = self::getIdForURL($contact['url'], $uid); } return ['public' => $pcid, 'user' => $ucid]; @@ -567,17 +566,13 @@ class Contact */ public static function createSelfFromUserId($uid) { - // Only create the entry if it doesn't exist yet - if (DBA::exists('contact', ['uid' => $uid, 'self' => true])) { - return true; - } - - $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], ['uid' => $uid]); + $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], + ['uid' => $uid, 'account_expired' => false]); if (!DBA::isResult($user)) { return false; } - $return = DBA::insert('contact', [ + $contact = [ 'uid' => $user['uid'], 'created' => DateTimeFormat::utcNow(), 'self' => 1, @@ -602,7 +597,23 @@ class Contact 'uri-date' => DateTimeFormat::utcNow(), 'avatar-date' => DateTimeFormat::utcNow(), 'closeness' => 0 - ]); + ]; + + $return = true; + + // Only create the entry if it doesn't exist yet + if (!DBA::exists('contact', ['uid' => $uid, 'self' => true])) { + $return = DBA::insert('contact', $contact); + } + + // Create the public contact + if (!DBA::exists('contact', ['nurl' => $contact['nurl'], 'uid' => 0])) { + $contact['self'] = false; + $contact['uid'] = 0; + $contact['prvkey'] = null; + + DBA::insert('contact', $contact, Database::INSERT_IGNORE); + } return $return; } @@ -612,6 +623,7 @@ class Contact * * @param int $uid * @param boolean $update_avatar Force the avatar update + * @return bool "true" if updated * @throws HTTPException\InternalServerErrorException */ public static function updateSelfFromUserID($uid, $update_avatar = false) @@ -621,20 +633,20 @@ class Contact 'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco']; $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); if (!DBA::isResult($self)) { - return; + return false; } $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey']; - $user = DBA::selectFirst('user', $fields, ['uid' => $uid]); + $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]); if (!DBA::isResult($user)) { - return; + return false; } $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region', 'country-name', 'pub_keywords', 'xmpp', 'net-publish']; $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]); if (!DBA::isResult($profile)) { - return; + return false; } $file_suffix = 'jpg'; @@ -645,6 +657,16 @@ class Contact 'contact-type' => $user['account-type'], 'prvkey' => $user['prvkey'], 'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp']]; + // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine. + $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname']; + $fields['nurl'] = Strings::normaliseLink($fields['url']); + $fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); + $fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname']; + $fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname']; + $fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname']; + $fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname']; + $fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname']; + $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); if (DBA::isResult($avatar)) { if ($update_avatar) { @@ -668,9 +690,9 @@ class Contact $fields['micro'] = $prefix . '6' . $suffix; } else { // We hadn't found a photo entry, so we use the default avatar - $fields['photo'] = DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO; - $fields['thumb'] = DI::baseUrl() . self::DEFAULT_AVATAR_THUMB; - $fields['micro'] = DI::baseUrl() . self::DEFAULT_AVATAR_MICRO; + $fields['photo'] = self::getDefaultAvatar($fields, Proxy::SIZE_SMALL); + $fields['thumb'] = self::getDefaultAvatar($fields, Proxy::SIZE_THUMB); + $fields['micro'] = self::getDefaultAvatar($fields, Proxy::SIZE_MICRO); } $fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix; @@ -678,16 +700,6 @@ class Contact $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP; $fields['unsearchable'] = !$profile['net-publish']; - // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine. - $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname']; - $fields['nurl'] = Strings::normaliseLink($fields['url']); - $fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); - $fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname']; - $fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname']; - $fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname']; - $fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname']; - $fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname']; - $update = false; foreach ($fields as $field => $content) { @@ -704,6 +716,8 @@ class Contact DBA::update('contact', $fields, ['id' => $self['id']]); // Update the public contact as well + $fields['prvkey'] = null; + $fields['self'] = false; DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); // Update the profile @@ -711,6 +725,8 @@ class Contact 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix]; DBA::update('profile', $fields, ['uid' => $uid]); } + + return $update; } /** @@ -724,7 +740,7 @@ class Contact { // We want just to make sure that we don't delete our "self" contact $contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]); - if (!DBA::isResult($contact) || !intval($contact['uid'])) { + if (!DBA::isResult($contact)) { return; } @@ -809,7 +825,7 @@ class Contact Logger::info('Empty contact', ['contact' => $contact, 'callstack' => System::callstack(20)]); } - Logger::info('Contact is marked for archival', ['id' => $contact['id']]); + Logger::info('Contact is marked for archival', ['id' => $contact['id'], 'term-date' => $contact['term-date']]); // Contact already archived or "self" contact? => nothing to do if ($contact['archive'] || $contact['self']) { @@ -856,7 +872,9 @@ class Contact if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) { $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false]; $condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY]; - DBA::update('contact', $fields, $condition); + if (!DBA::exists('contact', array_merge($condition, $fields))) { + DBA::update('contact', $fields, $condition); + } } $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME]; @@ -867,7 +885,7 @@ class Contact return; } - Logger::info('Contact is marked as vital again', ['id' => $contact['id']]); + Logger::info('Contact is marked as vital again', ['id' => $contact['id'], 'term-date' => $contact['term-date']]); if (!isset($contact['url']) && !empty($contact['id'])) { $fields = ['id', 'url', 'batch']; @@ -906,7 +924,7 @@ class Contact if (empty($contact['uid']) || ($contact['uid'] != $uid)) { if ($uid == 0) { - $profile_link = self::magicLink($contact['url']); + $profile_link = self::magicLinkByContact($contact); $menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]]; return $menu; @@ -1085,7 +1103,7 @@ class Contact if (($uid == 0) && (empty($data['network']) || ($data['network'] == Protocol::PHANTOM))) { // Fetch data for the public contact via the first found personal contact /// @todo Check if this case can happen at all (possibly with mail accounts?) - $fields = ['name', 'nick', 'url', 'addr', 'alias', 'avatar', 'contact-type', + $fields = ['name', 'nick', 'url', 'addr', 'alias', 'avatar', 'header', 'contact-type', 'keywords', 'location', 'about', 'unsearchable', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'subscribe', 'network', 'baseurl', 'gsid']; @@ -1167,6 +1185,12 @@ class Contact self::updateFromProbeArray($contact_id, $data); + // Don't return a number for a deleted account + if (!empty($data['account-type']) && $data['account-type'] == User::ACCOUNT_TYPE_DELETED) { + Logger::info('Contact is a tombstone', ['url' => $url, 'uid' => $uid]); + return 0; + } + return $contact_id; } @@ -1266,7 +1290,7 @@ class Contact * * @param string $contact_url Contact URL * @param bool $thread_mode - * @param int $update Update mode + * @param int $update Update mode * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception @@ -1281,7 +1305,7 @@ class Contact * * @param int $cid Contact ID * @param bool $thread_mode - * @param int $update Update mode + * @param int $update Update mode * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception @@ -1296,9 +1320,9 @@ class Contact } if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) { - $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))"; + $sql = "(`uid` = 0 OR (`uid` = ? AND NOT `global`))"; } else { - $sql = "`item`.`uid` = ?"; + $sql = "`uid` = ?"; } $contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id'); @@ -1339,19 +1363,12 @@ class Contact $o = ''; } - if ($thread_mode) { - $r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri', 'thr-parent-id', 'author-id'], $condition, $params); - $items = []; - while ($item = DBA::fetch($r)) { - $items[] = $item; - } - DBA::close($r); + if ($thread_mode) { + $items = Post::toArray(Post::selectForUser(local_user(), ['uri-id', 'gravity', 'parent-uri-id', 'thr-parent-id', 'author-id'], $condition, $params)); $o .= conversation($a, $items, 'contacts', $update, false, 'commented', local_user()); } else { - $r = Item::selectForUser(local_user(), [], $condition, $params); - - $items = Item::inArray($r); + $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params)); $o .= conversation($a, $items, 'contact-posts', $update); } @@ -1473,24 +1490,28 @@ class Contact /** * Return the photo path for a given contact array in the given size * - * @param array $contact contact array - * @param string $field Fieldname of the photo in the contact array - * @param string $default Default path when no picture had been found - * @param string $size Size of the avatar picture - * @param string $avatar Avatar path that is displayed when no photo had been found + * @param array $contact contact array + * @param string $field Fieldname of the photo in the contact array + * @param string $size Size of the avatar picture + * @param string $avatar Avatar path that is displayed when no photo had been found + * @param bool $no_update Don't perfom an update if no cached avatar was found * @return string photo path */ - private static function getAvatarPath(array $contact, string $field, string $default, string $size, string $avatar) + private static function getAvatarPath(array $contact, string $field, string $size, string $avatar, $no_update = false) { if (!empty($contact)) { - $contact = self::checkAvatarCacheByArray($contact); + $contact = self::checkAvatarCacheByArray($contact, $no_update); if (!empty($contact[$field])) { $avatar = $contact[$field]; } } + if ($no_update && empty($avatar) && !empty($contact['avatar'])) { + $avatar = $contact['avatar']; + } + if (empty($avatar)) { - return $default; + $avatar = self::getDefaultAvatar([], $size); } if (Proxy::isLocalImage($avatar)) { @@ -1503,46 +1524,50 @@ class Contact /** * Return the photo path for a given contact array * - * @param array $contact Contact array - * @param string $avatar Avatar path that is displayed when no photo had been found + * @param array $contact Contact array + * @param string $avatar Avatar path that is displayed when no photo had been found + * @param bool $no_update Don't perfom an update if no cached avatar was found * @return string photo path */ - public static function getPhoto(array $contact, string $avatar = '') + public static function getPhoto(array $contact, string $avatar = '', bool $no_update = false) { - return self::getAvatarPath($contact, 'photo', DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO, Proxy::SIZE_SMALL, $avatar); + return self::getAvatarPath($contact, 'photo', Proxy::SIZE_SMALL, $avatar, $no_update); } /** * Return the photo path (thumb size) for a given contact array * - * @param array $contact Contact array - * @param string $avatar Avatar path that is displayed when no photo had been found + * @param array $contact Contact array + * @param string $avatar Avatar path that is displayed when no photo had been found + * @param bool $no_update Don't perfom an update if no cached avatar was found * @return string photo path */ - public static function getThumb(array $contact, string $avatar = '') + public static function getThumb(array $contact, string $avatar = '', bool $no_update = false) { - return self::getAvatarPath($contact, 'thumb', DI::baseUrl() . self::DEFAULT_AVATAR_THUMB, Proxy::SIZE_THUMB, $avatar); + return self::getAvatarPath($contact, 'thumb', Proxy::SIZE_THUMB, $avatar, $no_update); } /** * Return the photo path (micro size) for a given contact array * - * @param array $contact Contact array - * @param string $avatar Avatar path that is displayed when no photo had been found + * @param array $contact Contact array + * @param string $avatar Avatar path that is displayed when no photo had been found + * @param bool $no_update Don't perfom an update if no cached avatar was found * @return string photo path */ - public static function getMicro(array $contact, string $avatar = '') + public static function getMicro(array $contact, string $avatar = '', bool $no_update = false) { - return self::getAvatarPath($contact, 'micro', DI::baseUrl() . self::DEFAULT_AVATAR_MICRO, Proxy::SIZE_MICRO, $avatar); + return self::getAvatarPath($contact, 'micro', Proxy::SIZE_MICRO, $avatar, $no_update); } /** * Check the given contact array for avatar cache fields * * @param array $contact + * @param bool $no_update Don't perfom an update if no cached avatar was found * @return array contact array with avatar cache fields */ - private static function checkAvatarCacheByArray(array $contact) + private static function checkAvatarCacheByArray(array $contact, bool $no_update = false) { $update = false; $contact_fields = []; @@ -1556,7 +1581,7 @@ class Contact } } - if (!$update) { + if (!$update || $no_update) { return $contact; } @@ -1572,18 +1597,71 @@ class Contact /// add the default avatars if the fields aren't filled if (isset($contact['photo']) && empty($contact['photo'])) { - $contact['photo'] = DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO; + $contact['photo'] = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL); } if (isset($contact['thumb']) && empty($contact['thumb'])) { - $contact['thumb'] = DI::baseUrl() . self::DEFAULT_AVATAR_THUMB; + $contact['thumb'] = self::getDefaultAvatar($contact, Proxy::SIZE_THUMB); } if (isset($contact['micro']) && empty($contact['micro'])) { - $contact['micro'] = DI::baseUrl() . self::DEFAULT_AVATAR_MICRO; + $contact['micro'] = self::getDefaultAvatar($contact, Proxy::SIZE_MICRO); } return $contact; } + /** + * Fetch the default avatar for the given contact and size + * + * @param array $contact contact array + * @param string $size Size of the avatar picture + * @return string avatar URL + */ + public static function getDefaultAvatar(array $contact, string $size) + { + switch ($size) { + case Proxy::SIZE_MICRO: + $avatar['size'] = 48; + $default = self::DEFAULT_AVATAR_MICRO; + break; + + case Proxy::SIZE_THUMB: + $avatar['size'] = 80; + $default = self::DEFAULT_AVATAR_THUMB; + break; + + case Proxy::SIZE_SMALL: + default: + $avatar['size'] = 300; + $default = self::DEFAULT_AVATAR_PHOTO; + break; + } + + if (!DI::config()->get('system', 'remote_avatar_lookup')) { + return DI::baseUrl() . $default; + } + + if (!empty($contact['xmpp'])) { + $avatar['email'] = $contact['xmpp']; + } elseif (!empty($contact['addr'])) { + $avatar['email'] = $contact['addr']; + } elseif (!empty($contact['url'])) { + $avatar['email'] = $contact['url']; + } else { + return DI::baseUrl() . $default; + } + + $avatar['url'] = ''; + $avatar['success'] = false; + + Hook::callAll('avatar_lookup', $avatar); + + if ($avatar['success'] && !empty($avatar['url'])) { + return $avatar['url']; + } + + return DI::baseUrl() . $default; + } + /** * Updates the avatar links in a contact only if needed * @@ -1599,7 +1677,8 @@ class Contact */ public static function updateAvatar(int $cid, string $avatar, bool $force = false, bool $create_cache = false) { - $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'nurl', 'url', 'network'], ['id' => $cid, 'self' => false]); + $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'xmpp', 'addr', 'nurl', 'url', 'network'], + ['id' => $cid, 'self' => false]); if (!DBA::isResult($contact)) { return; } @@ -1624,13 +1703,18 @@ class Contact return; } } - - // Replace cached avatar pictures from the default avatar with the default avatars in different sizes - if (strpos($avatar, self::DEFAULT_AVATAR_PHOTO)) { + + $default_avatar = empty($avatar) || strpos($avatar, self::DEFAULT_AVATAR_PHOTO); + + if ($default_avatar) { + $avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL); + } + + if ($default_avatar && Proxy::isLocalImage($avatar)) { $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(), - 'photo' => DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO, - 'thumb' => DI::baseUrl() . self::DEFAULT_AVATAR_THUMB, - 'micro' => DI::baseUrl() . self::DEFAULT_AVATAR_MICRO]; + 'photo' => $avatar, + 'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB), + 'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)]; Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]); } @@ -1652,7 +1736,7 @@ class Contact $contact['thumb'] ?? '', $contact['micro'] ?? '', ]; - + foreach ($data as $image_uri) { $image_rid = Photo::ridFromURI($image_uri); if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) { @@ -1704,49 +1788,73 @@ class Contact DBA::update('contact', $fields, ['id' => $cids]); } + public static function deleteContactByUrl(string $url) + { + // Update contact data for all users + $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)]; + $contacts = DBA::select('contact', ['id', 'uid'], $condition); + while ($contact = DBA::fetch($contacts)) { + Logger::info('Deleting contact', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $url]); + self::remove($contact['id']); + } + } + /** * Helper function for "updateFromProbe". Updates personal and public contact * * @param integer $id contact id * @param integer $uid user id - * @param string $url The profile URL of the contact + * @param string $old_url The previous profile URL of the contact + * @param string $new_url The profile URL of the contact * @param array $fields The fields that are updated * * @throws \Exception */ - private static function updateContact($id, $uid, $url, array $fields) + private static function updateContact(int $id, int $uid, string $old_url, string $new_url, array $fields) { + if (Strings::normaliseLink($new_url) != Strings::normaliseLink($old_url)) { + Logger::notice('New URL differs from old URL', ['old' => $old_url, 'new' => $new_url]); + // @todo It is to decide what to do when the URL is changed + } + if (!DBA::update('contact', $fields, ['id' => $id])) { Logger::info('Couldn\'t update contact.', ['id' => $id, 'fields' => $fields]); return; } // Search for duplicated contacts and get rid of them - if (self::removeDuplicates(Strings::normaliseLink($url), $uid) || ($uid != 0)) { + if (self::removeDuplicates(Strings::normaliseLink($new_url), $uid)) { return; } - // Archive or unarchive the contact. We only need to do this for the public contact. - // The archive/unarchive function will update the personal contacts by themselves. + // Archive or unarchive the contact. $contact = DBA::selectFirst('contact', [], ['id' => $id]); if (!DBA::isResult($contact)) { Logger::info('Couldn\'t select contact for archival.', ['id' => $id]); return; } - if (!empty($fields['success_update'])) { - self::unmarkForArchival($contact); - } elseif (!empty($fields['failure_update'])) { - self::markForArchival($contact); + if (isset($fields['failed'])) { + if ($fields['failed']) { + self::markForArchival($contact); + } else { + self::unmarkForArchival($contact); + } } - $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url), 'network' => Protocol::FEDERATED]; + if ($contact['uid'] != 0) { + return; + } - // These contacts are sharing with us, we don't poll them. - // This means that we don't set the update fields in "OnePoll.php". - $condition['rel'] = self::SHARING; + // Update contact data for all users + $condition = ['self' => false, 'nurl' => Strings::normaliseLink($old_url)]; + + $condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]; DBA::update('contact', $fields, $condition); + // We mustn't set the update fields for OStatus contacts since they are updated in OnePoll + $condition['network'] = Protocol::OSTATUS; + // If the contact failed, propagate the update fields to all contacts if (empty($fields['failed'])) { unset($fields['last-update']); @@ -1758,8 +1866,6 @@ class Contact return; } - // We are polling these contacts, so we mustn't set the update fields here. - $condition['rel'] = [self::FOLLOWER, self::FRIEND]; DBA::update('contact', $fields, $condition); } @@ -1804,7 +1910,7 @@ class Contact Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid); } DBA::close($duplicates); - Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]); + Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl, 'callstack' => System::callstack(20)]); return true; } @@ -1843,14 +1949,28 @@ class Contact // These fields aren't updated by this routine: // 'xmpp', 'sensitive' - $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe', 'manually-approve', - 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco', + $fields = ['uid', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe', + 'manually-approve', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item']; $contact = DBA::selectFirst('contact', $fields, ['id' => $id]); if (!DBA::isResult($contact)) { return false; } + if (self::isLocal($ret['url'])) { + Logger::info('Local contacts are not updated here.'); + return true; + } + + if (!empty($ret['account-type']) && $ret['account-type'] == User::ACCOUNT_TYPE_DELETED) { + Logger::info('Deleted account', ['id' => $id, 'url' => $ret['url'], 'ret' => $ret]); + self::remove($id); + + // Delete all contacts with the same URL + self::deleteContactByUrl($ret['url']); + return true; + } + $uid = $contact['uid']; unset($contact['uid']); @@ -1866,14 +1986,14 @@ class Contact // We check after the probing to be able to correct falsely detected contact types. if (($contact['contact-type'] == self::TYPE_RELAY) && (!Strings::compareLink($ret['url'], $contact['url']) || in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]))) { - self::updateContact($id, $uid, $contact['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]); + self::updateContact($id, $uid, $contact['url'], $contact['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]); Logger::info('Not updating relais', ['id' => $id, 'url' => $contact['url']]); return true; } // If Probe::uri fails the network code will be different ("feed" or "unkn") - if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) { - self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]); + if (($ret['network'] == Protocol::PHANTOM) || (($ret['network'] == Protocol::FEED) && ($ret['network'] != $contact['network']))) { + self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]); return false; } @@ -1923,12 +2043,12 @@ class Contact } if (!$update) { - self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]); + self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]); if (Contact\Relation::isDiscoverable($ret['url'])) { Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']); } - + // Update the public contact if ($uid != 0) { $contact = self::getByURL($ret['url'], false, ['id']); @@ -1957,14 +2077,14 @@ class Contact $ret['name-date'] = $updated; } - if ($uid == 0) { + if (($uid == 0) || in_array($ret['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { $ret['last-update'] = $updated; $ret['success_update'] = $updated; } unset($ret['photo']); - self::updateContact($id, $uid, $ret['url'], $ret); + self::updateContact($id, $uid, $contact['url'], $ret['url'], $ret); if (Contact\Relation::isDiscoverable($ret['url'])) { Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']); @@ -2224,8 +2344,11 @@ class Contact self::updateAvatar($contact_id, $ret['photo']); // pull feed and consume it, which should subscribe to the hub. - - Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force"); + if ($contact['network'] == Protocol::OSTATUS) { + Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force'); + } else { + Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id); + } $owner = User::getOwnerDataById($user['uid']); @@ -2307,6 +2430,50 @@ class Contact return $contact; } + /** + * Follow a contact + * + * @param int $cid Public contact id + * @param int $uid User ID + * + * @return bool "true" if following had been successful + */ + public static function follow(int $cid, int $uid) + { + $user = User::getById($uid); + if (empty($user)) { + return false; + } + + $contact = self::getById($cid, ['url']); + + $result = self::createFromProbe($user, $contact['url'], false); + + return $result['cid']; + } + + /** + * Unfollow a contact + * + * @param int $cid Public contact id + * @param int $uid User ID + * + * @return bool "true" if unfollowing had been successful + */ + public static function unfollow(int $cid, int $uid) + { + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata['user'])) { + return false; + } + + $contact = self::getById($cdata['user']); + + self::removeSharer([], $contact); + + return true; + } + /** * @param array $importer Owner (local user) data * @param array $contact Existing owner-specific contact data we want to expand the relationship with. Optional. @@ -2372,6 +2539,8 @@ class Contact // Ensure to always have the correct network type, independent from the connection request method self::updateFromProbe($contact['id']); + Post\UserNotification::insertNotication($contact['id'], Verb::getID(Activity::FOLLOW), $importer['uid']); + return true; } else { // send email notification to owner? @@ -2403,6 +2572,8 @@ class Contact self::updateAvatar($contact_id, $photo, true); + Post\UserNotification::insertNotication($contact_id, Verb::getID(Activity::FOLLOW), $importer['uid']); + $contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]); /// @TODO Encapsulate this into a function/method @@ -2420,12 +2591,12 @@ class Contact Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); - if (($user['notify-flags'] & Type::INTRO) && + if (($user['notify-flags'] & Notification\Type::INTRO) && in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { notification([ - 'type' => Type::INTRO, - 'otype' => Notify\ObjectType::INTRO, + 'type' => Notification\Type::INTRO, + 'otype' => Notification\ObjectType::INTRO, 'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW), 'uid' => $user['uid'], 'cid' => $contact_record['id'], @@ -2440,7 +2611,7 @@ class Contact $condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true]; $fields = ['pending' => false]; if ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) { - $fields['rel'] = Contact::FRIEND; + $fields['rel'] = self::FRIEND; } DBA::update('contact', $fields, $condition); @@ -2452,21 +2623,21 @@ class Contact return null; } - public static function removeFollower($importer, $contact, array $datarray = [], $item = "") + public static function removeFollower($importer, $contact) { if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) { DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]); } else { - Contact::remove($contact['id']); + self::remove($contact['id']); } } - public static function removeSharer($importer, $contact, array $datarray = [], $item = "") + public static function removeSharer($importer, $contact) { if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) { DBA::update('contact', ['rel' => self::FOLLOWER], ['id' => $contact['id']]); } else { - Contact::remove($contact['id']); + self::remove($contact['id']); } } @@ -2478,17 +2649,16 @@ class Contact public static function updateBirthdays() { $condition = [ - '`bd` != "" - AND `bd` > "0001-01-01" - AND SUBSTRING(`bd`, 1, 4) != `bdyear` + '`bd` > ? AND (`contact`.`rel` = ? OR `contact`.`rel` = ?) AND NOT `contact`.`pending` AND NOT `contact`.`hidden` AND NOT `contact`.`blocked` AND NOT `contact`.`archive` AND NOT `contact`.`deleted`', - Contact::SHARING, - Contact::FRIEND + DBA::NULL_DATE, + self::SHARING, + self::FRIEND ]; $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition); @@ -2523,7 +2693,7 @@ class Contact return []; } - $contacts = Contact::selectToArray(['id'], [ + $contacts = self::selectToArray(['id'], [ 'id' => $contact_ids, 'blocked' => false, 'pending' => false, @@ -2572,7 +2742,7 @@ class Contact * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function magicLinkbyId($cid, $url = '') + public static function magicLinkById($cid, $url = '') { $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]); @@ -2606,14 +2776,10 @@ class Contact return 'contact/' . $contact['id'] . '/conversations'; } - if ($contact['network'] != Protocol::DFRN) { + if (!empty($contact['network']) && $contact['network'] != Protocol::DFRN) { return $destination; } - if (!empty($contact['uid'])) { - return self::magicLink($contact['url'], $url); - } - if (empty($contact['id'])) { return $destination; } @@ -2666,11 +2832,12 @@ class Contact * * @param string $search Name or nick * @param string $mode Search mode (e.g. "community") + * @param int $uid User ID * * @return array with search results * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function searchByName($search, $mode = '') + public static function searchByName(string $search, string $mode = '', int $uid = 0) { if (empty($search)) { return []; @@ -2691,7 +2858,7 @@ class Contact // check if we search only communities or every contact if ($mode === 'community') { - $extra_sql = sprintf(' AND `contact-type` = %d', Contact::TYPE_COMMUNITY); + $extra_sql = sprintf(' AND `contact-type` = %d', self::TYPE_COMMUNITY); } else { $extra_sql = ''; } @@ -2703,7 +2870,7 @@ class Contact NOT `failed` AND `uid` = ? AND (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql ORDER BY `nurl` DESC LIMIT 1000", - Protocol::DFRN, Protocol::ACTIVITYPUB, $ostatus, $diaspora, 0, $search, $search, $search + Protocol::DFRN, Protocol::ACTIVITYPUB, $ostatus, $diaspora, $uid, $search, $search, $search ); $contacts = DBA::toArray($results); @@ -2724,7 +2891,10 @@ class Contact $count = 0; foreach ($urls as $url) { - $contact = Contact::getByURL($url, false, ['id', 'updated']); + if (empty($url) || !is_string($url)) { + continue; + } + $contact = self::getByURL($url, false, ['id', 'updated']); if (empty($contact['id'])) { Worker::add(PRIORITY_LOW, 'AddContact', 0, $url); ++$added; @@ -2741,22 +2911,22 @@ class Contact } /** - * Returns a random, global contact of the current node + * Returns a random, global contact array of the current node * - * @return string The profile URL + * @return array The profile array * @throws Exception */ - public static function getRandomUrl() + public static function getRandomContact() { - $r = DBA::selectFirst('contact', ['url'], [ + $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], [ "`uid` = ? AND `network` = ? AND NOT `failed` AND `last-item` > ?", 0, Protocol::DFRN, DateTimeFormat::utc('now - 1 month'), ], ['order' => ['RAND()']]); - if (DBA::isResult($r)) { - return $r['url']; + if (DBA::isResult($contact)) { + return $contact; } - return ''; + return []; } }