X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=2908385f583e06430ebe775a754740c652bf9db6;hb=a331a8cf0a29f6a2542ccb8f53a214064481539a;hp=7772bad878c811f3338e15ba44c13dcae259e7b0;hpb=29494ea721b9ea2b2feee0f2950ecf7c1b8e4a69;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 7772bad878..2908385f58 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -23,12 +23,15 @@ namespace Friendica\Model; use Friendica\App\BaseURL; use Friendica\Content\Pager; +use Friendica\Content\Text\HTML; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; +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; @@ -89,6 +92,8 @@ class Contact * @} */ + const LOCK_INSERT = 'contact-insert'; + /** * Account types * @@ -126,6 +131,7 @@ class Contact * Relationship types * @{ */ + const NOTHING = 0; const FOLLOWER = 1; const SHARING = 2; const FRIEND = 3; @@ -133,7 +139,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 @@ -163,15 +174,23 @@ 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) { - $ret = DBA::insert('contact', $fields, $on_duplicate_update); + if (!empty($fields['baseurl']) && empty($fields['gsid'])) { + $fields['gsid'] = GServer::getID($fields['baseurl'], true); + } + + if (empty($fields['created'])) { + $fields['created'] = DateTimeFormat::utcNow(); + } + + $ret = DBA::insert('contact', $fields, $duplicate_mode); $contact = DBA::selectFirst('contact', ['nurl', 'uid'], ['id' => DBA::lastInsertId()]); if (!DBA::isResult($contact)) { // Shouldn't happen @@ -222,7 +241,7 @@ class Contact // Add internal fields $removal = []; if (!empty($fields)) { - foreach (['id', 'avatar', 'updated', 'last-update', 'success_update', 'failure_update', 'network'] as $internal) { + foreach (['id', 'avatar', 'created', 'updated', 'last-update', 'success_update', 'failure_update', 'network'] as $internal) { if (!in_array($internal, $fields)) { $fields[] = $internal; $removal[] = $internal; @@ -252,9 +271,8 @@ class Contact } // Update the contact in the background if needed - $updated = max($contact['success_update'], $contact['updated'], $contact['last-update'], $contact['failure_update']); - if ((($updated < DateTimeFormat::utc('now -7 days')) || empty($contact['avatar'])) && - in_array($contact['network'], Protocol::FEDERATED)) { + $updated = max($contact['success_update'], $contact['created'], $contact['updated'], $contact['last-update'], $contact['failure_update']); + if (($updated < DateTimeFormat::utc('now -7 days')) && in_array($contact['network'], Protocol::FEDERATED)) { Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']); } @@ -505,14 +523,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]; @@ -554,7 +572,7 @@ class Contact return true; } - $user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]); + $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], ['uid' => $uid]); if (!DBA::isResult($user)) { return false; } @@ -565,6 +583,8 @@ class Contact 'self' => 1, 'name' => $user['username'], 'nick' => $user['nickname'], + 'pubkey' => $user['pubkey'], + 'prvkey' => $user['prvkey'], 'photo' => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg', 'thumb' => DI::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg', 'micro' => DI::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg', @@ -596,7 +616,7 @@ class Contact */ public static function updateSelfFromUserID($uid, $update_avatar = false) { - $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', + $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable', 'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco']; $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); @@ -604,7 +624,7 @@ class Contact return; } - $fields = ['nickname', 'page-flags', 'account-type']; + $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey']; $user = DBA::selectFirst('user', $fields, ['uid' => $uid]); if (!DBA::isResult($user)) { return; @@ -622,8 +642,18 @@ class Contact $fields = ['name' => $profile['name'], 'nick' => $user['nickname'], 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'], - 'contact-type' => $user['account-type'], - 'xmpp' => $profile['xmpp']]; + '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)) { @@ -648,9 +678,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; @@ -658,16 +688,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,7 +724,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; } @@ -748,7 +768,6 @@ class Contact $item['title'] = ''; $item['guid'] = ''; $item['uri-id'] = 0; - $item['attach'] = ''; $slap = OStatus::salmon($item, $user); if (!empty($contact['notify'])) { @@ -790,7 +809,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']) { @@ -848,7 +867,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']; @@ -938,9 +957,9 @@ class Contact $unfollow_link = ''; if (!$contact['self'] && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) { - $unfollow_link = 'unfollow?url=' . urlencode($contact['url']); + $unfollow_link = 'unfollow?url=' . urlencode($contact['url']) . '&auto=1'; } elseif(!$contact['pending']) { - $follow_link = 'follow?url=' . urlencode($contact['url']); + $follow_link = 'follow?url=' . urlencode($contact['url']) . '&auto=1'; } } @@ -1100,7 +1119,7 @@ class Contact $contact = self::selectFirst(['id'], ['nurl' => $urls, 'uid' => $uid]); if (!empty($contact['id'])) { $contact_id = $contact['id']; - Logger::info('Fetched id by url', ['cid' => $contact_id, 'uid' => $uid, 'url' => $url, 'probed_url' => $data['url'], 'alias' => $data['alias'], 'addr' => $data['addr']]); + Logger::info('Fetched id by url', ['cid' => $contact_id, 'uid' => $uid, 'url' => $url, 'data' => $data]); } } @@ -1121,19 +1140,23 @@ class Contact $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false]; // Before inserting we do check if the entry does exist now. - DBA::lock('contact'); - $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]); - if (DBA::isResult($contact)) { - $contact_id = $contact['id']; - Logger::notice('Contact had been created (shortly) before', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]); - } else { - DBA::insert('contact', $fields); - $contact_id = DBA::lastInsertId(); - if ($contact_id) { - Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]); + if (DI::lock()->acquire(self::LOCK_INSERT, 0)) { + $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]); + if (DBA::isResult($contact)) { + $contact_id = $contact['id']; + Logger::notice('Contact had been created (shortly) before', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]); + } else { + DBA::insert('contact', $fields); + $contact_id = DBA::lastInsertId(); + if ($contact_id) { + Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]); + } } + DI::lock()->release(self::LOCK_INSERT); + } else { + Logger::warning('Contact lock had not been acquired'); } - DBA::unlock(); + if (!$contact_id) { Logger::info('Contact was not inserted', ['url' => $url, 'uid' => $uid]); return 0; @@ -1243,25 +1266,27 @@ class Contact * * @param string $contact_url Contact URL * @param bool $thread_mode - * @param int $update + * @param int $update Update mode + * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception */ - public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0) + public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0) { - return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update); + return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent); } /** * Returns posts from a given contact id * - * @param integer $cid - * @param bool $thread_mode - * @param integer $update + * @param int $cid Contact ID + * @param bool $thread_mode + * @param int $update Update mode + * @param int $parent Item parent ID for the update mode * @return string posts in HTML * @throws \Exception */ - public static function getPostsFromId($cid, $thread_mode = false, $update = 0) + public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0) { $a = DI::app(); @@ -1279,13 +1304,22 @@ class Contact $contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id'); if ($thread_mode) { - $condition = ["`$contact_field` = ? AND (`gravity` = ? OR (`gravity` = ? AND `vid` = ?)) AND " . $sql, - $cid, GRAVITY_PARENT, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), 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()]; } + if (!empty($parent)) { + $condition = DBA::mergeConditions($condition, ['parent' => $parent]); + } else { + $last_received = isset($_GET['last_received']) ? DateTimeFormat::utc($_GET['last_received']) : ''; + if (!empty($last_received)) { + $condition = DBA::mergeConditions($condition, ["`received` < ?", $last_received]); + } + } + if (DI::mode()->isMobile()) { $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', DI::config()->get('system', 'itemspage_network_mobile')); @@ -1296,34 +1330,38 @@ class Contact $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage); - $params = ['order' => ['received' => true], - 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; + $params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; - if ($thread_mode) { - $r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri'], $condition, $params); + if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { + $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); + $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); + } else { + $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)) { - if ($item['gravity'] != GRAVITY_PARENT) { - $item['uri'] = $item['parent-uri']; - } - unset($item['parent-uri']); - unset($item['gravity']); - $items[] = $item; } DBA::close($r); - $o = conversation($a, $items, 'contacts', $update, false, 'commented', local_user()); + $o .= conversation($a, $items, 'contacts', $update, false, 'commented', local_user()); } else { $r = Item::selectForUser(local_user(), [], $condition, $params); $items = Item::inArray($r); - $o = conversation($a, $items, 'contact-posts', false); + $o .= conversation($a, $items, 'contact-posts', $update); } if (!$update) { - $o .= $pager->renderMinimal(count($items)); + if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { + $o .= HTML::scrollLoader(); + } else { + $o .= $pager->renderMinimal(count($items)); + } } return $o; @@ -1437,12 +1475,11 @@ class Contact * * @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 * @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) { if (!empty($contact)) { $contact = self::checkAvatarCacheByArray($contact); @@ -1452,7 +1489,7 @@ class Contact } if (empty($avatar)) { - return $default; + $avatar = self::getDefaultAvatar([], $size); } if (Proxy::isLocalImage($avatar)) { @@ -1471,7 +1508,7 @@ class Contact */ public static function getPhoto(array $contact, string $avatar = '') { - return self::getAvatarPath($contact, 'photo', DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO, Proxy::SIZE_SMALL, $avatar); + return self::getAvatarPath($contact, 'photo', Proxy::SIZE_SMALL, $avatar); } /** @@ -1483,7 +1520,7 @@ class Contact */ public static function getThumb(array $contact, string $avatar = '') { - return self::getAvatarPath($contact, 'thumb', DI::baseUrl() . self::DEFAULT_AVATAR_THUMB, Proxy::SIZE_THUMB, $avatar); + return self::getAvatarPath($contact, 'thumb', Proxy::SIZE_THUMB, $avatar); } /** @@ -1495,7 +1532,7 @@ class Contact */ public static function getMicro(array $contact, string $avatar = '') { - return self::getAvatarPath($contact, 'micro', DI::baseUrl() . self::DEFAULT_AVATAR_MICRO, Proxy::SIZE_MICRO, $avatar); + return self::getAvatarPath($contact, 'micro', Proxy::SIZE_MICRO, $avatar); } /** @@ -1534,33 +1571,88 @@ 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 * - * @param int $cid Contact id - * @param string $avatar Link to avatar picture - * @param bool $force force picture update + * @param int $cid Contact id + * @param string $avatar Link to avatar picture + * @param bool $force force picture update + * @param bool $create_cache Enforces the creation of cached avatar fields * * @return void * @throws HTTPException\InternalServerErrorException * @throws HTTPException\NotFoundException * @throws \ImagickException */ - public static function updateAvatar(int $cid, string $avatar, bool $force = false) + 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'], ['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; } @@ -1568,7 +1660,7 @@ class Contact $uid = $contact['uid']; // Only update the cached photo links of public contacts when they already are cached - if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro'])) { + if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro']) && !$create_cache) { if ($contact['avatar'] != $avatar) { DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]); Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]); @@ -1576,48 +1668,109 @@ 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)) { - $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]; - if ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) { - DBA::update('contact', $fields, ['id' => $cid]); - Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'album' => Photo::CONTACT_PHOTOS]); + // User contacts use are updated through the public contacts + if (($uid != 0) && !in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) { + $pcid = self::getIdForURL($contact['url'], false); + if (!empty($pcid)) { + Logger::debug('Update the private contact via the public contact', ['id' => $cid, 'uid' => $uid, 'public' => $pcid]); + self::updateAvatar($pcid, $avatar, $force, true); + return; } - return; } - $data = [ - $contact['photo'] ?? '', - $contact['thumb'] ?? '', - $contact['micro'] ?? '', - ]; + $default_avatar = empty($avatar) || strpos($avatar, self::DEFAULT_AVATAR_PHOTO); - $update = ($contact['avatar'] != $avatar) || $force; + if ($default_avatar) { + $avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL); + } - if (!$update) { - foreach ($data as $image_uri) { - $image_rid = Photo::ridFromURI($image_uri); - if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) { - Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]); - $update = true; + if ($default_avatar && Proxy::isLocalImage($avatar)) { + $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(), + '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]); + } + + // Use the data from the self account + if (empty($fields)) { + $local_uid = User::getIdForURL($contact['url']); + if (!empty($local_uid)) { + $fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]); + Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]); + } + } + + if (empty($fields)) { + $update = ($contact['avatar'] != $avatar) || $force; + + if (!$update) { + $data = [ + $contact['photo'] ?? '', + $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])) { + Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]); + $update = true; + } + } + } + + if ($update) { + $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true); + if ($photos) { + $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()]; + $update = !empty($fields); + Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]); + } else { + $update = false; } } + } else { + $update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force; } - if ($update) { - $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true); - if ($photos) { - $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()]; - DBA::update('contact', $fields, ['id' => $cid]); - } elseif (empty($contact['avatar'])) { - // Ensure that the avatar field is set - DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]); - Logger::info('Failed profile import', ['id' => $cid, 'force' => $force, 'avatar' => $avatar, 'contact' => $contact]); + if (!$update) { + return; + } + + $cids = []; + $uids = []; + if (($uid == 0) && !in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) { + // Collect all user contacts of the given public contact + $personal_contacts = DBA::select('contact', ['id', 'uid'], + ["`nurl` = ? AND `id` != ? AND NOT `self`", $contact['nurl'], $cid]); + while ($personal_contact = DBA::fetch($personal_contacts)) { + $cids[] = $personal_contact['id']; + $uids[] = $personal_contact['uid']; + } + DBA::close($personal_contacts); + + if (!empty($cids)) { + // Delete possibly existing cached user contact avatars + Photo::delete(['uid' => $uids, 'contact-id' => $cids, 'album' => Photo::CONTACT_PHOTOS]); } } + + $cids[] = $cid; + $uids[] = $uid; + Logger::info('Updating cached contact avatars', ['cid' => $cids, 'uid' => $uids, 'fields' => $fields]); + 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']); + } } /** @@ -1638,41 +1791,49 @@ class Contact } // Search for duplicated contacts and get rid of them - if (self::removeDuplicates(Strings::normaliseLink($url), $uid) || ($uid != 0)) { + if (self::removeDuplicates(Strings::normaliseLink($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($url)]; + + $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); } @@ -1756,7 +1917,7 @@ class Contact // These fields aren't updated by this routine: // 'xmpp', 'sensitive' - $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe', + $fields = ['uid', 'avatar', '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]); @@ -1764,6 +1925,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']); @@ -1786,16 +1956,10 @@ class Contact // 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]); - } + self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]); return false; } - if (Contact\Relation::isDiscoverable($ret['url'])) { - Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']); - } - if (isset($ret['hide']) && is_bool($ret['hide'])) { $ret['unsearchable'] = $ret['hide']; } @@ -1804,12 +1968,9 @@ class Contact $ret['forum'] = false; $ret['prv'] = false; $ret['contact-type'] = $ret['account-type']; - if ($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) { - $apcontact = APContact::getByURL($ret['url'], false); - if (isset($apcontact['manually-approve'])) { - $ret['forum'] = (bool)!$apcontact['manually-approve']; - $ret['prv'] = (bool)!$ret['forum']; - } + if (($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && isset($ret['manually-approve'])) { + $ret['forum'] = (bool)!$ret['manually-approve']; + $ret['prv'] = (bool)!$ret['forum']; } } @@ -1847,6 +2008,10 @@ class Contact if (!$update) { self::updateContact($id, $uid, $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']); @@ -1860,13 +2025,14 @@ 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)) { $ret['pubkey'] = $new_pubkey; } - if (($ret['addr'] != $contact['addr']) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) { + if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) { $ret['uri-date'] = DateTimeFormat::utcNow(); } @@ -1874,16 +2040,19 @@ 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); + if (Contact\Relation::isDiscoverable($ret['url'])) { + Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']); + } + return true; } @@ -2042,7 +2211,7 @@ class Contact } // do we have enough information? - if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) { + if (empty($protocol) || ($protocol == Protocol::PHANTOM) || (empty($ret['url']) && empty($ret['addr']))) { $result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . EOL; if (empty($ret['poll'])) { $result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL; @@ -2076,11 +2245,8 @@ class Contact $hidden = (($protocol === Protocol::MAIL) ? 1 : 0); $pending = false; - if ($protocol == Protocol::ACTIVITYPUB) { - $apcontact = APContact::getByURL($ret['url'], false); - if (isset($apcontact['manually-approve'])) { - $pending = (bool)$apcontact['manually-approve']; - } + if (($protocol == Protocol::ACTIVITYPUB) && isset($ret['manually-approve'])) { + $pending = (bool)$ret['manually-approve']; } if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { @@ -2141,8 +2307,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']); @@ -2157,7 +2326,6 @@ class Contact $item['title'] = ''; $item['guid'] = ''; $item['uri-id'] = 0; - $item['attach'] = ''; $slap = OStatus::salmon($item, $owner); @@ -2342,18 +2510,12 @@ class Contact 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' => Type::INTRO, + 'otype' => Notify\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])) { @@ -2364,7 +2526,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); @@ -2381,7 +2543,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']); } } @@ -2390,7 +2552,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']); } } @@ -2411,8 +2573,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); @@ -2447,7 +2609,7 @@ class Contact return []; } - $contacts = Contact::selectToArray(['id'], [ + $contacts = self::selectToArray(['id'], [ 'id' => $contact_ids, 'blocked' => false, 'pending' => false, @@ -2517,7 +2679,7 @@ class Contact { $destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url']; - if (!Session::isAuthenticated() || ($contact['network'] != Protocol::DFRN)) { + if (!Session::isAuthenticated()) { return $destination; } @@ -2526,6 +2688,14 @@ class Contact return $url; } + if (DI::pConfig()->get(local_user(), 'system', 'stay_local') && ($url == '')) { + return 'contact/' . $contact['id'] . '/conversations'; + } + + if ($contact['network'] != Protocol::DFRN) { + return $destination; + } + if (!empty($contact['uid'])) { return self::magicLink($contact['url'], $url); } @@ -2607,7 +2777,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 = ''; } @@ -2636,21 +2806,24 @@ class Contact { $added = 0; $updated = 0; + $unchanged = 0; $count = 0; foreach ($urls as $url) { - $contact = Contact::getByURL($url, false, ['id']); + $contact = self::getByURL($url, false, ['id', 'updated']); if (empty($contact['id'])) { Worker::add(PRIORITY_LOW, 'AddContact', 0, $url); ++$added; - } else { + } elseif ($contact['updated'] < DateTimeFormat::utc('now -7 days')) { Worker::add(PRIORITY_LOW, 'UpdateContact', $contact['id']); ++$updated; + } else { + ++$unchanged; } ++$count; } - return ['count' => $count, 'added' => $added, 'updated' => $updated]; + return ['count' => $count, 'added' => $added, 'updated' => $updated, 'unchanged' => $unchanged]; } /**