X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=cacc3e4f1ef1a7b56bbfc0697893b0c745a8e79e;hb=d2c734c0256a2b6e8a5eef4422480edd820544b1;hp=80a5d93cb2ebcbcfcc649af45f7ed821e33058d0;hpb=93380b8471164a8ed5d1d46e94d53bf37fe87cee;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 80a5d93cb2..cacc3e4f1e 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -31,9 +31,9 @@ use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Core\Worker; +use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Notify\Type; use Friendica\Network\HTTPException; use Friendica\Network\Probe; use Friendica\Protocol\Activity; @@ -138,7 +138,12 @@ class Contact * @} */ - /** + const MIRROR_DEACTIVATED = 0; + const MIRROR_FORWARDED = 1; + const MIRROR_OWN_POST = 2; + const MIRROR_NATIVE_RESHARE = 3; + + /** * @param array $fields Array of selected fields, empty for all * @param array $condition Array of fields for condition * @param array $params Array of several parameters @@ -168,13 +173,13 @@ class Contact * Insert a row into the contact table * Important: You can't use DBA::lastInsertId() after this call since it will be set to 0. * - * @param array $fields field array - * @param bool $on_duplicate_update Do an update on a duplicate entry + * @param array $fields field array + * @param int $duplicate_mode Do an update on a duplicate entry * * @return boolean was the insert successful? * @throws \Exception */ - public static function insert(array $fields, bool $on_duplicate_update = false) + public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT) { if (!empty($fields['baseurl']) && empty($fields['gsid'])) { $fields['gsid'] = GServer::getID($fields['baseurl'], true); @@ -184,7 +189,7 @@ class Contact $fields['created'] = DateTimeFormat::utcNow(); } - $ret = DBA::insert('contact', $fields, $on_duplicate_update); + $ret = DBA::insert('contact', $fields, $duplicate_mode); $contact = DBA::selectFirst('contact', ['nurl', 'uid'], ['id' => DBA::lastInsertId()]); if (!DBA::isResult($contact)) { // Shouldn't happen @@ -517,14 +522,14 @@ class Contact } if ($contact['uid'] != 0) { - $pcid = Contact::getIdForURL($contact['url'], 0, false, ['url' => $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]; @@ -639,6 +644,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) { @@ -662,9 +677,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; @@ -672,16 +687,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) { @@ -718,7 +723,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; } @@ -803,7 +808,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']) { @@ -850,7 +855,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]; @@ -861,7 +868,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']; @@ -900,7 +907,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; @@ -1161,6 +1168,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; } @@ -1290,16 +1303,16 @@ class Contact } if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) { - $sql = "`item`.`uid` IN (0, ?)"; + $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'); if ($thread_mode) { - $condition = ["(`$contact_field` = ? OR (`causer-id` = ? AND `post-type` = ?)) AND `gravity` = ? AND " . $sql, - $cid, $cid, Item::PT_ANNOUNCEMENT, GRAVITY_PARENT, local_user()]; + $condition = ["((`$contact_field` = ? AND `gravity` = ?) OR (`author-id` = ? AND `gravity` = ? AND `vid` = ?)) AND " . $sql, + $cid, GRAVITY_PARENT, $cid, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), local_user()]; } else { $condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql, $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()]; @@ -1324,8 +1337,7 @@ class Contact $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage); - $params = ['order' => ['received' => true], 'group_by' => ['uri-id'], - 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; + $params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); @@ -1335,24 +1347,11 @@ class Contact } if ($thread_mode) { - $r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri'], $condition, $params); - $items = []; - while ($item = DBA::fetch($r)) { - if ($item['gravity'] != GRAVITY_PARENT) { - $item['uri'] = $item['parent-uri']; - } - unset($item['parent-uri']); - unset($item['gravity']); - - $items[] = $item; - } - DBA::close($r); + $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); } @@ -1474,24 +1473,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)) { @@ -1504,46 +1507,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 = []; @@ -1557,7 +1564,7 @@ class Contact } } - if (!$update) { + if (!$update || $no_update) { return $contact; } @@ -1573,18 +1580,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 void + */ + 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 * @@ -1600,7 +1660,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; } @@ -1625,13 +1686,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]); } @@ -1705,59 +1771,84 @@ 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); + } + } + + if ($contact['uid'] != 0) { + return; } - $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url), 'network' => Protocol::FEDERATED]; + // Update contact data for all users + $condition = ['self' => false, 'nurl' => Strings::normaliseLink($old_url)]; - // 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; + $condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]; DBA::update('contact', $fields, $condition); - unset($fields['last-update']); - unset($fields['success_update']); - unset($fields['failure_update']); + // 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']); + unset($fields['success_update']); + unset($fields['failure_update']); + } if (empty($fields)) { 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); } @@ -1802,7 +1893,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; } @@ -1849,6 +1940,15 @@ class Contact return false; } + 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']); @@ -1864,16 +1964,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'])) { - if ($uid == 0) { - 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,7 +2021,7 @@ 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']); @@ -1942,6 +2040,7 @@ class Contact $ret['nurl'] = Strings::normaliseLink($ret['url']); $ret['updated'] = $updated; + $ret['failed'] = false; // Only fill the pubkey if it had been empty before. We have to prevent identity theft. if (empty($pubkey) && !empty($new_pubkey)) { @@ -1956,15 +2055,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; - $ret['failed'] = false; } 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 +2322,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']); @@ -2420,22 +2521,16 @@ 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, - 'notify_flags' => $user['notify-flags'], - 'language' => $user['language'], - 'to_name' => $user['username'], - 'to_email' => $user['email'], - 'uid' => $user['uid'], - 'link' => DI::baseUrl() . '/notifications/intros', - 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : DI::l10n()->t('[Name Withheld]')), - 'source_link' => $contact_record['url'], - 'source_photo' => $contact_record['photo'], - 'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW), - 'otype' => 'intro' + 'type' => Notification\Type::INTRO, + 'otype' => Notification\ObjectType::INTRO, + 'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW), + 'uid' => $user['uid'], + 'cid' => $contact_record['id'], + 'link' => DI::baseUrl() . '/notifications/intros', ]); } } elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) { @@ -2446,7 +2541,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); @@ -2463,7 +2558,7 @@ class 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']); } } @@ -2472,7 +2567,7 @@ class 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']); } } @@ -2493,8 +2588,8 @@ class Contact AND NOT `contact`.`blocked` AND NOT `contact`.`archive` AND NOT `contact`.`deleted`', - Contact::SHARING, - Contact::FRIEND + self::SHARING, + self::FRIEND ]; $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition); @@ -2529,7 +2624,7 @@ class Contact return []; } - $contacts = Contact::selectToArray(['id'], [ + $contacts = self::selectToArray(['id'], [ 'id' => $contact_ids, 'blocked' => false, 'pending' => false, @@ -2578,7 +2673,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]); @@ -2612,14 +2707,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; } @@ -2697,7 +2788,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 = ''; } @@ -2730,7 +2821,7 @@ class Contact $count = 0; foreach ($urls as $url) { - $contact = Contact::getByURL($url, false, ['id', 'updated']); + $contact = self::getByURL($url, false, ['id', 'updated']); if (empty($contact['id'])) { Worker::add(PRIORITY_LOW, 'AddContact', 0, $url); ++$added; @@ -2747,22 +2838,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 []; } }