X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=30fa41307d4103047b16b708c51f34a9546df290;hb=96809b3fddbd49d5e722cb8e26859c5b02437174;hp=aa6f4c75c2f04b0014d84111aed391056b88774e;hpb=b621d2c714e9b611bdc3cc48542a8e10c7cb637b;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index aa6f4c75c2..30fa41307d 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -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']; @@ -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) { @@ -1933,8 +1949,8 @@ 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)) { @@ -2523,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? @@ -2554,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