X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=60dec8b2891f9b9a532892ecb790355b138ce59c;hb=a2607ea00aff0fa01b6bc7eff93fcf12fcf58969;hp=3b12dbf73966dbd4b0e76bc61834cd563c9ff5e6;hpb=bdbfffafea8da793c32a52d3d675d27e5082a4f3;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 3b12dbf739..60dec8b289 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -12,15 +12,17 @@ use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; -use Friendica\Network\Probe; use Friendica\Model\Photo; use Friendica\Model\Profile; -use Friendica\Protocol\Diaspora; +use Friendica\Network\Probe; use Friendica\Protocol\DFRN; +use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\PortableContact; use Friendica\Protocol\Salmon; +use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; +use Friendica\Object\Image; use dba; require_once 'boot.php'; @@ -111,7 +113,7 @@ class Contact extends BaseObject $return = dba::insert('contact', [ 'uid' => $user['uid'], - 'created' => datetime_convert(), + 'created' => DateTimeFormat::utcNow(), 'self' => 1, 'name' => $user['username'], 'nick' => $user['nickname'], @@ -128,15 +130,99 @@ class Contact extends BaseObject 'poll' => System::baseUrl() . '/dfrn_poll/' . $user['nickname'], 'confirm' => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'], 'poco' => System::baseUrl() . '/poco/' . $user['nickname'], - 'name-date' => datetime_convert(), - 'uri-date' => datetime_convert(), - 'avatar-date' => datetime_convert(), + 'name-date' => DateTimeFormat::utcNow(), + 'uri-date' => DateTimeFormat::utcNow(), + 'avatar-date' => DateTimeFormat::utcNow(), 'closeness' => 0 ]); return $return; } + /** + * Updates the self-contact for the provided user id + * + * @param int $uid + * @param boolean $update_avatar Force the avatar update + */ + public static function updateSelfFromUserID($uid, $update_avatar = false) + { + $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar', + 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl']; + $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); + if (!DBM::is_result($self)) { + return; + } + + $fields = ['nickname', 'page-flags', 'account-type']; + $user = dba::selectFirst('user', $fields, ['uid' => $uid]); + if (!DBM::is_result($user)) { + return; + } + + $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region', + 'country-name', 'gender', 'pub_keywords', 'xmpp']; + $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]); + if (!DBM::is_result($profile)) { + return; + } + + $fields = ['name' => $profile['name'], 'nick' => $user['nickname'], + 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), + 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'], + 'gender' => $profile['gender'], 'avatar' => $profile['photo'], + 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']]; + + $avatar = dba::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); + if (DBM::is_result($avatar)) { + if ($update_avatar) { + $fields['avatar-date'] = DateTimeFormat::utcNow(); + } + + // Creating the path to the avatar, beginning with the file suffix + $types = Image::supportedTypes(); + if (isset($types[$avatar['type']])) { + $file_suffix = $types[$avatar['type']]; + } else { + $file_suffix = 'jpg'; + } + + // We are adding a timestamp value so that other systems won't use cached content + $timestamp = strtotime($fields['avatar-date']); + + $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-'; + $suffix = '.' . $file_suffix . '?ts=' . $timestamp; + + $fields['photo'] = $prefix . '4' . $suffix; + $fields['thumb'] = $prefix . '5' . $suffix; + $fields['micro'] = $prefix . '6' . $suffix; + } else { + // We hadn't found a photo entry, so we use the default avatar + $fields['photo'] = System::baseUrl() . '/images/person-175.jpg'; + $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg'; + $fields['micro'] = System::baseUrl() . '/images/person-48.jpg'; + } + + $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY; + $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP; + + $update = false; + + foreach ($fields as $field => $content) { + if ($self[$field] != $content) { + $update = true; + } + } + + if ($update) { + $fields['name-date'] = DateTimeFormat::utcNow(); + dba::update('contact', $fields, ['id' => $self['id']]); + + // Update the public contact as well + dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); + } + } + /** * @brief Marks a contact for removal * @@ -172,20 +258,18 @@ class Contact extends BaseObject */ public static function terminateFriendship(array $user, array $contact) { - if ($contact['network'] === NETWORK_OSTATUS) { + if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) { // create an unfollow slap $item = []; $item['verb'] = NAMESPACE_OSTATUS . "/unfollow"; $item['follow'] = $contact["url"]; $slap = OStatus::salmon($item, $user); - if ((x($contact, 'notify')) && (strlen($contact['notify']))) { + if (!empty($contact['notify'])) { Salmon::slapper($user, $contact['notify'], $slap); } - } elseif ($contact['network'] === NETWORK_DIASPORA) { + } elseif ($contact['network'] == NETWORK_DIASPORA) { Diaspora::sendUnshare($user, $contact); - } elseif ($contact['network'] === NETWORK_DFRN) { - DFRN::deliver($user, $contact, 'placeholder', 1); } } @@ -209,10 +293,10 @@ class Contact extends BaseObject } if ($contact['term-date'] <= NULL_DATE) { - dba::update('contact', ['term-date' => datetime_convert()], ['id' => $contact['id']]); + dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); if ($contact['url'] != '') { - dba::update('contact', ['term-date' => datetime_convert()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]); + dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]); } } else { /* @todo @@ -223,7 +307,7 @@ class Contact extends BaseObject /// @todo Check for contact vitality via probing $expiry = $contact['term-date'] . ' + 32 days '; - if (datetime_convert() > datetime_convert('UTC', 'UTC', $expiry)) { + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) { /* Relationship is really truly dead. archive them rather than * delete, though if the owner tries to unarchive them we'll start * the whole process over again. @@ -515,7 +599,7 @@ class Contact extends BaseObject } $sparkle = false; - if ($contact['network'] === NETWORK_DFRN) { + if (($contact['network'] === NETWORK_DFRN) && !$contact['self']) { $sparkle = true; $profile_link = System::baseUrl() . '/redir/' . $contact['id']; } else { @@ -532,18 +616,21 @@ class Contact extends BaseObject $profile_link = $profile_link . '?url=profile'; } - if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) { + if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) { $pm_url = System::baseUrl() . '/message/new/' . $contact['id']; } - if ($contact['network'] == NETWORK_DFRN) { + if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) { $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id']; } $contact_url = System::baseUrl() . '/contacts/' . $contact['id']; $posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts'; - $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1'; + + if (!$contact['self']) { + $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1'; + } /** * Menu array: @@ -668,11 +755,11 @@ class Contact extends BaseObject /// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following // We first try the nurl (http://server.tld/nick), most common case - $contact = dba::selectFirst('contact', ['id', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]); + $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]); // Then the addr (nick@server.tld) if (!DBM::is_result($contact)) { - $contact = dba::selectFirst('contact', ['id', 'avatar-date'], ['addr' => $url, 'uid' => $uid]); + $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]); } // Then the alias (which could be anything) @@ -687,7 +774,7 @@ class Contact extends BaseObject $contact_id = $contact["id"]; // Update the contact every 7 days - $update_contact = ($contact['avatar-date'] < datetime_convert('', '', 'now -7 days')); + $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days')); // We force the update if the avatar is empty if (!x($contact, 'avatar')) { @@ -727,7 +814,7 @@ class Contact extends BaseObject if (!$contact_id) { dba::insert('contact', [ 'uid' => $uid, - 'created' => datetime_convert(), + 'created' => DateTimeFormat::utcNow(), 'url' => $data["url"], 'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"], @@ -748,9 +835,9 @@ class Contact extends BaseObject 'request' => $data["request"], 'confirm' => $data["confirm"], 'poco' => $data["poco"], - 'name-date' => datetime_convert(), - 'uri-date' => datetime_convert(), - 'avatar-date' => datetime_convert(), + 'name-date' => DateTimeFormat::utcNow(), + 'uri-date' => DateTimeFormat::utcNow(), + 'avatar-date' => DateTimeFormat::utcNow(), 'writable' => 1, 'blocked' => 0, 'readonly' => 0, @@ -822,13 +909,13 @@ class Contact extends BaseObject } if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) { - $updated['uri-date'] = datetime_convert(); + $updated['uri-date'] = DateTimeFormat::utcNow(); } if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) { - $updated['name-date'] = datetime_convert(); + $updated['name-date'] = DateTimeFormat::utcNow(); } - $updated['avatar-date'] = datetime_convert(); + $updated['avatar-date'] = DateTimeFormat::utcNow(); dba::update('contact', $updated, ['id' => $contact_id], $contact); @@ -1025,13 +1112,13 @@ class Contact extends BaseObject if ($photos) { dba::update( 'contact', - ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => datetime_convert()], + ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()], ['id' => $cid] ); // Update the public contact (contact id = 0) if ($uid != 0) { - $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl']]); + $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]); if (DBM::is_result($pcontact)) { self::updateAvatar($avatar, 0, $pcontact['id'], $force); } @@ -1151,6 +1238,11 @@ class Contact extends BaseObject Addon::callHooks('follow', $arr); + if (empty($arr)) { + $result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.'); + return $result; + } + if (x($arr['contact'], 'name')) { $ret = $arr['contact']; } else { @@ -1162,7 +1254,26 @@ class Contact extends BaseObject return result; } - if ($ret['network'] === NETWORK_DFRN) { + // check if we already have a contact + // the poll url is more reliable than the profile url, as we may have + // indirect links or webfinger links + + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' AND NOT `pending` LIMIT 1", + intval($uid), + dbesc($ret['poll']), + dbesc(normalise_link($ret['poll'])), + dbesc($ret['network']) + ); + + if (!DBM::is_result($r)) { + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1", + intval($uid), + dbesc(normalise_link($url)), + dbesc($ret['network']) + ); + } + + if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) { if ($interactive) { if (strlen($a->path)) { $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']); @@ -1174,7 +1285,7 @@ class Contact extends BaseObject // NOTREACHED } - } elseif (Config::get('system', 'dfrn_only')) { + } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != NETWORK_DFRN)) { $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL; $result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL; return $result; @@ -1224,25 +1335,6 @@ class Contact extends BaseObject $writeable = 1; } - // check if we already have a contact - // the poll url is more reliable than the profile url, as we may have - // indirect links or webfinger links - - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' LIMIT 1", - intval($uid), - dbesc($ret['poll']), - dbesc(normalise_link($ret['poll'])), - dbesc($ret['network']) - ); - - if (!DBM::is_result($r)) { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1", - intval($uid), - dbesc(normalise_link($url)), - dbesc($ret['network']) - ); - } - if (DBM::is_result($r)) { // update contact $new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING); @@ -1255,7 +1347,7 @@ class Contact extends BaseObject // create contact record dba::insert('contact', [ 'uid' => $uid, - 'created' => datetime_convert(), + 'created' => DateTimeFormat::utcNow(), 'url' => $ret['url'], 'nurl' => normalise_link($ret['url']), 'addr' => $ret['addr'], @@ -1303,16 +1395,16 @@ class Contact extends BaseObject ); if (DBM::is_result($r)) { - if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) { + if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) { // create a follow slap $item = []; $item['verb'] = ACTIVITY_FOLLOW; $item['follow'] = $contact["url"]; $slap = OStatus::salmon($item, $r[0]); - Salmon::slapper($r[0], $contact['notify'], $slap); - } - - if ($contact['network'] == NETWORK_DIASPORA) { + if (!empty($contact['notify'])) { + Salmon::slapper($r[0], $contact['notify'], $slap); + } + } elseif ($contact['network'] == NETWORK_DIASPORA) { $ret = Diaspora::sendShare($a->user, $contact); logger('share returns: ' . $ret); } @@ -1359,6 +1451,7 @@ class Contact extends BaseObject $url = notags(trim($datarray['author-link'])); $name = notags(trim($datarray['author-name'])); $photo = notags(trim($datarray['author-avatar'])); + $nick = ''; if (is_object($item)) { $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor'); @@ -1370,7 +1463,7 @@ class Contact extends BaseObject } if (is_array($contact)) { - if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING) + if (($contact['rel'] == CONTACT_IS_SHARING) || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) { dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true], ['id' => $contact['id'], 'uid' => $importer['uid']]); @@ -1382,7 +1475,7 @@ class Contact extends BaseObject `blocked`, `readonly`, `pending`, `writable`) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)", intval($importer['uid']), - dbesc(datetime_convert()), + dbesc(DateTimeFormat::utcNow()), dbesc($url), dbesc(normalise_link($url)), dbesc($name), @@ -1392,41 +1485,37 @@ class Contact extends BaseObject intval(CONTACT_IS_FOLLOWER) ); - $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1", - intval($importer['uid']), - dbesc($url) - ); - if (DBM::is_result($r)) { - $contact_record = $r[0]; - Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true); - } + $contact_record = [ + 'id' => dba::lastInsertId(), + 'network' => NETWORK_OSTATUS + ]; + Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true); /// @TODO Encapsulate this into a function/method - $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", - intval($importer['uid']) - ); - if (DBM::is_result($r) && !in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { + $fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language']; + $user = dba::selectFirst('user', $fields, ['uid' => $importer['uid']]); + if (DBM::is_result($user) && !in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { // create notification $hash = random_string(); if (is_array($contact_record)) { dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'], 'blocked' => false, 'knowyou' => false, - 'hash' => $hash, 'datetime' => datetime_convert()]); + 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]); } Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); - if (($r[0]['notify-flags'] & NOTIFY_INTRO) && - in_array($r[0]['page-flags'], [PAGE_NORMAL])) { + if (($user['notify-flags'] & NOTIFY_INTRO) && + in_array($user['page-flags'], [PAGE_NORMAL])) { notification([ 'type' => NOTIFY_INTRO, - 'notify_flags' => $r[0]['notify-flags'], - 'language' => $r[0]['language'], - 'to_name' => $r[0]['username'], - 'to_email' => $r[0]['email'], - 'uid' => $r[0]['uid'], + 'notify_flags' => $user['notify-flags'], + 'language' => $user['language'], + 'to_name' => $user['username'], + 'to_email' => $user['email'], + 'uid' => $user['uid'], 'link' => System::baseUrl() . '/notifications/intro', 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')), 'source_link' => $contact_record['url'], @@ -1436,13 +1525,12 @@ class Contact extends BaseObject ]); } - } elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { + } elseif (DBM::is_result($user) && in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1", intval($importer['uid']), dbesc($url) ); } - } } @@ -1463,4 +1551,81 @@ class Contact extends BaseObject Contact::remove($contact['id']); } } + + /** + * @brief Create a birthday event. + * + * Update the year and the birthday. + */ + public static function updateBirthdays() + { + // This only handles foreign or alien networks where a birthday has been provided. + // In-network birthdays are handled within local_delivery + + $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` "); + if (DBM::is_result($r)) { + foreach ($r as $rr) { + logger('update_contact_birthday: ' . $rr['bd']); + + $nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4); + + /* + * Add new birthday event for this person + * + * $bdtext is just a readable placeholder in case the event is shared + * with others. We will replace it during presentation to our $importer + * to contain a sparkle link and perhaps a photo. + */ + + // Check for duplicates + $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1", + intval($rr['uid']), intval($rr['id']), dbesc(DateTimeFormat::utc($nextbd)), dbesc('birthday')); + + if (DBM::is_result($s)) { + continue; + } + + $bdtext = L10n::t('%s\'s birthday', $rr['name']); + $bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]'); + + q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`) + VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']), + dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utc($nextbd)), + dbesc(DateTimeFormat::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'), + intval(0) + ); + + + // update bdyear + q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", dbesc(substr($nextbd, 0, 4)), + dbesc($nextbd), intval($rr['uid']), intval($rr['id']) + ); + } + } + } + + /** + * Remove the unavailable contact ids from the provided list + * + * @param array $contact_ids Contact id list + */ + public static function pruneUnavailable(array &$contact_ids) + { + if (empty($contact_ids)) { + return; + } + + $str = dbesc(implode(',', $contact_ids)); + + $stmt = dba::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0"); + + $return = []; + while($contact = dba::fetch($stmt)) { + $return[] = $contact['id']; + } + + dba::close($stmt); + + $contact_ids = $return; + } }