X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=60213cacb51751f232c9b3067ef5b16b5317baa1;hb=1701ea2034feb1cb8b7cce8455ff8e3c1f8875c6;hp=411cf333ef5820e1e080b02e0a138f077b6ca9c7;hpb=befc2af5043a3afde251721c0d27df695db1bb7e;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 411cf333ef..60213cacb5 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -264,14 +264,14 @@ class Contact $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid]; $contact = DBA::selectFirst('contact', $fields, $condition, $options); } - + if (!DBA::isResult($contact)) { return []; } // Update the contact in the background if needed $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)) { + if (($updated < DateTimeFormat::utc('now -7 days')) && in_array($contact['network'], Protocol::FEDERATED) && !self::isLocalById($contact['id'])) { Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']); } @@ -307,7 +307,7 @@ class Contact } $contact = self::getByURL($url, $update, $fields); - if (!empty($contact['id'])) { + if (!empty($contact['id'])) { $contact['cid'] = 0; $contact['zid'] = $contact['id']; } @@ -566,18 +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, '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, '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'; @@ -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; } /** @@ -1087,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']; @@ -1274,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 @@ -1289,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 @@ -1347,7 +1363,7 @@ class Contact $o = ''; } - if ($thread_mode) { + 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()); @@ -1486,14 +1502,14 @@ class Contact if (!empty($contact)) { $contact = self::checkAvatarCacheByArray($contact, $no_update); if (!empty($contact[$field])) { - $avatar = $contact[$field]; + return $contact[$field]; + } elseif (!empty($contact['id'])) { + return self::getAvatarUrlForId($contact['id'], $size, $contact['updated'] ?? ''); + } elseif (!empty($contact['avatar'])) { + $avatar = $contact['avatar']; } } - if ($no_update && empty($avatar) && !empty($contact['avatar'])) { - $avatar = $contact['avatar']; - } - if (empty($avatar)) { $avatar = self::getDefaultAvatar([], $size); } @@ -1598,7 +1614,7 @@ class Contact * * @param array $contact contact array * @param string $size Size of the avatar picture - * @return void + * @return string avatar URL */ public static function getDefaultAvatar(array $contact, string $size) { @@ -1607,12 +1623,12 @@ class Contact $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; @@ -1646,6 +1662,99 @@ class Contact return DI::baseUrl() . $default; } + /** + * Get avatar link for given contact id + * + * @param integer $cid contact id + * @param string $size One of the ProxyUtils::SIZE_* constants + * @param string $updated Contact update date + * @return string avatar link + */ + public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = ''):string + { + // We have to fetch the "updated" variable when it wasn't provided + // The parameter can be provided to improve performance + if (empty($updated)) { + $contact = self::getById($cid, ['updated']); + $updated = $contact['updated'] ?? ''; + } + + $url = DI::baseUrl() . '/photo/contact/'; + switch ($size) { + case Proxy::SIZE_MICRO: + $url .= Proxy::PIXEL_MICRO . '/'; + break; + case Proxy::SIZE_THUMB: + $url .= Proxy::PIXEL_THUMB . '/'; + break; + case Proxy::SIZE_SMALL: + $url .= Proxy::PIXEL_SMALL . '/'; + break; + case Proxy::SIZE_MEDIUM: + $url .= Proxy::PIXEL_MEDIUM . '/'; + break; + case Proxy::SIZE_LARGE: + $url .= Proxy::PIXEL_LARGE . '/'; + break; + } + return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : ''); + } + + /** + * Get avatar link for given contact URL + * + * @param string $url contact url + * @param integer $uid user id + * @param string $size One of the ProxyUtils::SIZE_* constants + * @return string avatar link + */ + public static function getAvatarUrlForUrl(string $url, int $uid, string $size = ''):string + { + $condition = ["`nurl` = ? AND ((`uid` = ? AND `network` IN (?, ?)) OR `uid` = ?)", + Strings::normaliseLink($url), $uid, Protocol::FEED, Protocol::MAIL, 0]; + $contact = self::selectFirst(['id', 'updated'], $condition); + return self::getAvatarUrlForId($contact['id'] ?? 0, $size, $contact['updated']); + } + + /** + * Get header link for given contact id + * + * @param integer $cid contact id + * @param string $size One of the ProxyUtils::SIZE_* constants + * @param string $updated Contact update date + * @return string header link + */ + public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = ''):string + { + // We have to fetch the "updated" variable when it wasn't provided + // The parameter can be provided to improve performance + if (empty($updated)) { + $contact = self::getById($cid, ['updated']); + $updated = $contact['updated'] ?? ''; + } + + $url = DI::baseUrl() . '/photo/header/'; + switch ($size) { + case Proxy::SIZE_MICRO: + $url .= Proxy::PIXEL_MICRO . '/'; + break; + case Proxy::SIZE_THUMB: + $url .= Proxy::PIXEL_THUMB . '/'; + break; + case Proxy::SIZE_SMALL: + $url .= Proxy::PIXEL_SMALL . '/'; + break; + case Proxy::SIZE_MEDIUM: + $url .= Proxy::PIXEL_MEDIUM . '/'; + break; + case Proxy::SIZE_LARGE: + $url .= Proxy::PIXEL_LARGE . '/'; + break; + } + + return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : ''); + } + /** * Updates the avatar links in a contact only if needed * @@ -1720,7 +1829,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])) { @@ -1933,14 +2042,19 @@ 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); @@ -2027,7 +2141,7 @@ class Contact 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']); @@ -2409,6 +2523,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. @@ -2474,6 +2632,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? @@ -2505,6 +2665,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 @@ -2554,7 +2716,7 @@ 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']]); @@ -2563,7 +2725,7 @@ class Contact } } - 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']]); @@ -2763,11 +2925,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 []; @@ -2800,7 +2963,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);