<?php
/**
- * @file src/Model/Contact.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
+
namespace Friendica\Model;
use Friendica\App\BaseURL;
-use Friendica\BaseObject;
+use Friendica\Content\ContactSelector;
use Friendica\Content\Pager;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Notify\Type;
+use Friendica\Network\HTTPException;
use Friendica\Network\Probe;
-use Friendica\Object\Image;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\DFRN;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
use Friendica\Util\Network;
+use Friendica\Util\Proxy;
use Friendica\Util\Strings;
/**
- * @brief functions for interacting with a contact
+ * functions for interacting with a contact
*/
-class Contact extends BaseObject
+class Contact
{
/**
* @deprecated since version 2019.03
}
/**
- * @brief Tests if the given contact is a follower
+ * Fetches a contact by a given url
+ *
+ * @param string $url profile url
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+ * @param array $fields Field list
+ * @param integer $uid User ID of the contact
+ * @return array contact array
+ */
+ public static function getByURL(string $url, $update = null, array $fields = [], int $uid = 0)
+ {
+ if ($update || is_null($update)) {
+ $cid = self::getIdForURL($url, $uid, $update);
+ if (empty($cid)) {
+ return [];
+ }
+
+ $contact = self::getById($cid, $fields);
+ if (empty($contact)) {
+ return [];
+ }
+ return $contact;
+ }
+
+ // Add internal fields
+ $removal = [];
+ if (!empty($fields)) {
+ foreach (['id', 'updated', 'network'] as $internal) {
+ if (!in_array($internal, $fields)) {
+ $fields[] = $internal;
+ $removal[] = $internal;
+ }
+ }
+ }
+
+ // We first try the nurl (http://server.tld/nick), most common case
+ $options = ['order' => ['id']];
+ $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options);
+
+ // Then the addr (nick@server.tld)
+ if (!DBA::isResult($contact)) {
+ $contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
+ }
+
+ // Then the alias (which could be anything)
+ if (!DBA::isResult($contact)) {
+ // The link could be provided as http although we stored it as https
+ $ssl_url = str_replace('http://', 'https://', $url);
+ $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
+ if ((($contact['updated'] < DateTimeFormat::utc('now -7 days')) || empty($contact['avatar'])) &&
+ in_array($contact['network'], Protocol::FEDERATED)) {
+ Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], ($uid == 0 ? 'force' : ''));
+ }
+
+ // Remove the internal fields
+ foreach ($removal as $internal) {
+ unset($contact[$internal]);
+ }
+
+ return $contact;
+ }
+
+ /**
+ * Fetches a contact for a given user by a given url.
+ * In difference to "getByURL" the function will fetch a public contact when no user contact had been found.
+ *
+ * @param string $url profile url
+ * @param integer $uid User ID of the contact
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+ * @param array $fields Field list
+ * @return array contact array
+ */
+ public static function getByURLForUser(string $url, int $uid = 0, $update = false, array $fields = [])
+ {
+ if ($uid != 0) {
+ $contact = self::getByURL($url, $update, $fields, $uid);
+ if (!empty($contact)) {
+ if (!empty($contact['id'])) {
+ $contact['cid'] = $contact['id'];
+ $contact['zid'] = 0;
+ }
+ return $contact;
+ }
+ }
+
+ $contact = self::getByURL($url, $update, $fields);
+ if (!empty($contact['id'])) {
+ $contact['cid'] = 0;
+ $contact['zid'] = $contact['id'];
+ }
+ return $contact;
+ }
+
+ /**
+ * Tests if the given contact is a follower
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
*
* @return boolean is the contact id a follower?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function isFollower($cid, $uid)
}
/**
- * @brief Tests if the given contact url is a follower
+ * Tests if the given contact url is a follower
*
* @param string $url Contact URL
* @param int $uid User ID
*
* @return boolean is the contact id a follower?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function isFollowerByURL($url, $uid)
{
- $cid = self::getIdForURL($url, $uid, true);
+ $cid = self::getIdForURL($url, $uid, false);
if (empty($cid)) {
return false;
}
/**
- * @brief Tests if the given user follow the given contact
+ * Tests if the given user follow the given contact
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
*
* @return boolean is the contact url being followed?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function isSharing($cid, $uid)
}
/**
- * @brief Tests if the given user follow the given contact url
+ * Tests if the given user follow the given contact url
*
* @param string $url Contact URL
* @param int $uid User ID
*
* @return boolean is the contact url being followed?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function isSharingByURL($url, $uid)
{
- $cid = self::getIdForURL($url, $uid, true);
+ $cid = self::getIdForURL($url, $uid, false);
if (empty($cid)) {
return false;
}
/**
- * @brief Get the basepath for a given contact link
+ * Get the basepath for a given contact link
*
* @param string $url The contact link
+ * @param boolean $dont_update Don't update the contact
*
* @return string basepath
- * @return boolean $dont_update Don't update the contact
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function getBasepath($url, $dont_update = false)
{
- $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+ $contact = DBA::selectFirst('contact', ['id', 'baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+ if (!DBA::isResult($contact)) {
+ return '';
+ }
+
if (!empty($contact['baseurl'])) {
return $contact['baseurl'];
} elseif ($dont_update) {
return '';
}
- self::updateFromProbeByURL($url, true);
+ // Update the existing contact
+ self::updateFromProbe($contact['id'], '', true);
- $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
- if (!empty($contact['baseurl'])) {
- return $contact['baseurl'];
+ // And fetch the result
+ $contact = DBA::selectFirst('contact', ['baseurl'], ['id' => $contact['id']]);
+ if (empty($contact['baseurl'])) {
+ Logger::info('No baseurl for contact', ['url' => $url]);
+ return '';
}
- return '';
+ Logger::info('Found baseurl for contact', ['url' => $url, 'baseurl' => $contact['baseurl']]);
+ return $contact['baseurl'];
}
/**
*/
public static function isLocal($url)
{
- return Strings::compareLink(self::getBasepath($url, true), System::baseUrl());
+ return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl());
+ }
+
+ /**
+ * Check if the given contact ID is on the same server
+ *
+ * @param string $url The contact link
+ *
+ * @return boolean Is it the same server?
+ */
+ public static function isLocalById(int $cid)
+ {
+ $contact = DBA::selectFirst('contact', ['url', 'baseurl'], ['id' => $cid]);
+ if (!DBA::isResult($contact)) {
+ return false;
+ }
+
+ if (empty($contact['baseurl'])) {
+ $baseurl = self::getBasepath($contact['url'], true);
+ } else {
+ $baseurl = $contact['baseurl'];
+ }
+
+ return Strings::compareLink($baseurl, DI::baseUrl());
}
/**
* @param integer $uid User ID
*
* @return integer|boolean Public contact id for given user id
- * @throws Exception
+ * @throws \Exception
*/
public static function getPublicIdByUserId($uid)
{
if (!DBA::isResult($self)) {
return false;
}
- return self::getIdForURL($self['url'], 0, true);
+ return self::getIdForURL($self['url'], 0, false);
}
/**
- * @brief Returns the contact id for the user and the public contact id for a given contact id
+ * Returns the contact id for the user and the public contact id for a given contact id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
*
* @return array with public and user's contact id
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function getPublicAndUserContacID($cid, $uid)
}
if ($contact['uid'] != 0) {
- $pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+ $pcid = Contact::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, true);
+ $ucid = Contact::getIdForURL($contact['url'], $uid, false);
}
return ['public' => $pcid, 'user' => $ucid];
}
/**
- * @brief Block contact id for user id
+ * Block contact id for user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Returns "block" state for contact id and user id
+ * Returns "block" state for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Ignore contact id for user id
+ * Ignore contact id for user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Returns "ignore" state for contact id and user id
+ * Returns "ignore" state for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Set "collapsed" for contact id and user id
+ * Set "collapsed" for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Returns "collapsed" state for contact id and user id
+ * Returns "collapsed" state for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
*
* @return boolean is the contact id blocked for the given user?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function isCollapsedByUser($cid, $uid)
}
/**
- * @brief Returns a list of contacts belonging in a group
+ * Returns a list of contacts belonging in a group
*
* @param int $gid
* @return array
return $return;
}
- /**
- * @brief Returns the count of OStatus contacts in a group
- *
- * @param int $gid
- * @return int
- * @throws \Exception
- */
- public static function getOStatusCountByGroupId($gid)
- {
- $return = 0;
- if (intval($gid)) {
- $contacts = DBA::fetchFirst('SELECT COUNT(*) AS `count`
- FROM `contact`
- INNER JOIN `group_member`
- ON `contact`.`id` = `group_member`.`contact-id`
- WHERE `gid` = ?
- AND `contact`.`uid` = ?
- AND `contact`.`network` = ?
- AND `contact`.`notify` != ""',
- $gid,
- local_user(),
- Protocol::OSTATUS
- );
- $return = $contacts['count'];
- }
-
- return $return;
- }
-
/**
* Creates the self-contact for the provided user id
*
* @param int $uid
* @return bool Operation success
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function createSelfFromUserId($uid)
{
'self' => 1,
'name' => $user['username'],
'nick' => $user['nickname'],
- 'photo' => System::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
- 'thumb' => System::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
- 'micro' => System::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg',
+ 'photo' => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
+ 'thumb' => DI::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
+ 'micro' => DI::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg',
'blocked' => 0,
'pending' => 0,
- 'url' => System::baseUrl() . '/profile/' . $user['nickname'],
- 'nurl' => Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']),
- 'addr' => $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3),
- 'request' => System::baseUrl() . '/dfrn_request/' . $user['nickname'],
- 'notify' => System::baseUrl() . '/dfrn_notify/' . $user['nickname'],
- 'poll' => System::baseUrl() . '/dfrn_poll/' . $user['nickname'],
- 'confirm' => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
- 'poco' => System::baseUrl() . '/poco/' . $user['nickname'],
+ 'url' => DI::baseUrl() . '/profile/' . $user['nickname'],
+ 'nurl' => Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']),
+ 'addr' => $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3),
+ 'request' => DI::baseUrl() . '/dfrn_request/' . $user['nickname'],
+ 'notify' => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'],
+ 'poll' => DI::baseUrl() . '/dfrn_poll/' . $user['nickname'],
+ 'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
+ 'poco' => DI::baseUrl() . '/poco/' . $user['nickname'],
'name-date' => DateTimeFormat::utcNow(),
'uri-date' => DateTimeFormat::utcNow(),
'avatar-date' => DateTimeFormat::utcNow(),
*
* @param int $uid
* @param boolean $update_avatar Force the avatar update
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function updateSelfFromUserID($uid, $update_avatar = false)
{
- $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
+ $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar',
'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]);
return;
}
- $fields = ['nickname', 'page-flags', 'account-type', 'hidewall'];
+ $fields = ['nickname', 'page-flags', 'account-type'];
$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
if (!DBA::isResult($user)) {
return;
}
$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
- 'country-name', 'gender', 'pub_keywords', 'xmpp', 'net-publish'];
- $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ 'country-name', 'pub_keywords', 'xmpp', 'net-publish'];
+ $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
if (!DBA::isResult($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'], 'contact-type' => $user['account-type'],
+ 'contact-type' => $user['account-type'],
'xmpp' => $profile['xmpp']];
$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
// 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'] . '-';
+ $prefix = DI::baseUrl() . '/photo/' .$avatar['resource-id'] . '-';
$suffix = '.' . $file_suffix . '?ts=' . $timestamp;
$fields['photo'] = $prefix . '4' . $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-300.jpg';
- $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg';
- $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
+ $fields['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+ $fields['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
+ $fields['micro'] = DI::baseUrl() . '/images/person-48.jpg';
}
- $fields['avatar'] = System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
+ $fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
- $fields['unsearchable'] = $user['hidewall'] || !$profile['net-publish'];
+ $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'] = System::baseUrl() . '/profile/' . $user['nickname'];
+ $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname'];
$fields['nurl'] = Strings::normaliseLink($fields['url']);
- $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
- $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname'];
- $fields['notify'] = System::baseUrl() . '/dfrn_notify/' . $user['nickname'];
- $fields['poll'] = System::baseUrl() . '/dfrn_poll/'. $user['nickname'];
- $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
- $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname'];
+ $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;
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
// Update the profile
- $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
- 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
- DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
+ 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
+ DBA::update('profile', $fields, ['uid' => $uid]);
}
}
/**
- * @brief Marks a contact for removal
+ * Marks a contact for removal
*
* @param int $id contact id
* @return null
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function remove($id)
{
}
/**
- * @brief Sends an unfriend message. Does not remove the contact
+ * Sends an unfriend message. Does not remove the contact
*
* @param array $user User unfriending
* @param array $contact Contact unfriended
* @param boolean $dissolve Remove the contact on the remote side
* @return void
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function terminateFriendship(array $user, array $contact, $dissolve = false)
// create an unfollow slap
$item = [];
$item['verb'] = Activity::O_UNFOLLOW;
+ $item['gravity'] = GRAVITY_ACTIVITY;
$item['follow'] = $contact["url"];
$item['body'] = '';
$item['title'] = '';
$item['guid'] = '';
- $item['tag'] = '';
+ $item['uri-id'] = 0;
$item['attach'] = '';
$slap = OStatus::salmon($item, $user);
}
/**
- * @brief Marks a contact for archival after a communication issue delay
+ * Marks a contact for archival after a communication issue delay
*
* Contact has refused to recognise us as a friend. We will start a countdown.
* If they still don't recognise us in 32 days, the relationship is over,
*
* @param array $contact contact to mark for archival
* @return null
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function markForArchival(array $contact)
{
return;
}
} elseif (!isset($contact['url'])) {
- Logger::log('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), Logger::DEBUG);
+ Logger::info('Empty contact', ['contact' => $contact, 'callstack' => System::callstack(20)]);
}
- Logger::log('Contact '.$contact['id'].' is marked for archival', Logger::DEBUG);
+ Logger::info('Contact is marked for archival', ['id' => $contact['id']]);
// Contact already archived or "self" contact? => nothing to do
if ($contact['archive'] || $contact['self']) {
*/
/// @todo Check for contact vitality via probing
- $archival_days = Config::get('system', 'archival_days', 32);
+ $archival_days = DI::config()->get('system', 'archival_days', 32);
$expiry = $contact['term-date'] . ' + ' . $archival_days . ' days ';
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
}
/**
- * @brief Cancels the archival countdown
+ * Cancels the archival countdown
*
* @see Contact::markForArchival()
*
{
// Always unarchive the relay contact entry
if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) {
- $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+ $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);
}
return;
}
- Logger::log('Contact '.$contact['id'].' is marked as vital again', Logger::DEBUG);
+ Logger::info('Contact is marked as vital again', ['id' => $contact['id']]);
if (!isset($contact['url']) && !empty($contact['id'])) {
$fields = ['id', 'url', 'batch'];
}
// It's a miracle. Our dead contact has inexplicably come back to life.
- $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+ $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
DBA::update('contact', $fields, ['id' => $contact['id']]);
DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
GContact::updateFromPublicContactURL($contact['url']);
}
/**
- * @brief Get contact data for a given profile link
- *
- * The function looks at several places (contact table and gcontact table) for the contact
- * It caches its result for the same script execution to prevent duplicate calls
- *
- * @param string $url The profile link
- * @param int $uid User id
- * @param array $default If not data was found take this data as default value
- *
- * @return array Contact data
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
- public static function getDetailsByURL($url, $uid = -1, array $default = [])
- {
- static $cache = [];
-
- if ($url == '') {
- return $default;
- }
-
- if ($uid == -1) {
- $uid = local_user();
- }
-
- if (isset($cache[$url][$uid])) {
- return $cache[$url][$uid];
- }
-
- $ssl_url = str_replace('http://', 'https://', $url);
-
- $nurl = Strings::normaliseLink($url);
-
- // Fetch contact data from the contact table for the given user
- $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
- FROM `contact` WHERE `nurl` = ? AND `uid` = ?", $nurl, $uid);
- $r = DBA::toArray($s);
-
- // Fetch contact data from the contact table for the given user, checking with the alias
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
- FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", $nurl, $url, $ssl_url, $uid);
- $r = DBA::toArray($s);
- }
-
- // Fetch the data from the contact table with "uid=0" (which is filled automatically)
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
- FROM `contact` WHERE `nurl` = ? AND `uid` = 0", $nurl);
- $r = DBA::toArray($s);
- }
-
- // Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
- FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", $nurl, $url, $ssl_url);
- $r = DBA::toArray($s);
- }
-
- // Fetch the data from the gcontact table
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`
- FROM `gcontact` WHERE `nurl` = ?", $nurl);
- $r = DBA::toArray($s);
- }
-
- if (DBA::isResult($r)) {
- // If there is more than one entry we filter out the connector networks
- if (count($r) > 1) {
- foreach ($r as $id => $result) {
- if (!in_array($result["network"], Protocol::NATIVE_SUPPORT)) {
- unset($r[$id]);
- }
- }
- }
-
- $profile = array_shift($r);
-
- // "bd" always contains the upcoming birthday of a contact.
- // "birthday" might contain the birthday including the year of birth.
- if ($profile["birthday"] > DBA::NULL_DATE) {
- $bd_timestamp = strtotime($profile["birthday"]);
- $month = date("m", $bd_timestamp);
- $day = date("d", $bd_timestamp);
-
- $current_timestamp = time();
- $current_year = date("Y", $current_timestamp);
- $current_month = date("m", $current_timestamp);
- $current_day = date("d", $current_timestamp);
-
- $profile["bd"] = $current_year . "-" . $month . "-" . $day;
- $current = $current_year . "-" . $current_month . "-" . $current_day;
-
- if ($profile["bd"] < $current) {
- $profile["bd"] = ( ++$current_year) . "-" . $month . "-" . $day;
- }
- } else {
- $profile["bd"] = DBA::NULL_DATE;
- }
- } else {
- $profile = $default;
- }
-
- if (empty($profile["photo"]) && isset($default["photo"])) {
- $profile["photo"] = $default["photo"];
- }
-
- if (empty($profile["name"]) && isset($default["name"])) {
- $profile["name"] = $default["name"];
- }
-
- if (empty($profile["network"]) && isset($default["network"])) {
- $profile["network"] = $default["network"];
- }
-
- if (empty($profile["thumb"]) && isset($profile["photo"])) {
- $profile["thumb"] = $profile["photo"];
- }
-
- if (empty($profile["micro"]) && isset($profile["thumb"])) {
- $profile["micro"] = $profile["thumb"];
- }
-
- if ((empty($profile["addr"]) || empty($profile["name"])) && !empty($profile["gid"])
- && in_array($profile["network"], Protocol::FEDERATED)
- ) {
- Worker::add(PRIORITY_LOW, "UpdateGContact", $url);
- }
-
- // Show contact details of Diaspora contacts only if connected
- if (empty($profile["cid"]) && ($profile["network"] ?? "") == Protocol::DIASPORA) {
- $profile["location"] = "";
- $profile["about"] = "";
- $profile["gender"] = "";
- $profile["birthday"] = DBA::NULL_DATE;
- }
-
- $cache[$url][$uid] = $profile;
-
- return $profile;
- }
-
- /**
- * @brief Get contact data for a given address
- *
- * The function looks at several places (contact table and gcontact table) for the contact
- *
- * @param string $addr The profile link
- * @param int $uid User id
- *
- * @return array Contact data
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- public static function getDetailsByAddr($addr, $uid = -1)
- {
- if ($addr == '') {
- return [];
- }
-
- if ($uid == -1) {
- $uid = local_user();
- }
-
- // Fetch contact data from the contact table for the given user
- $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
- FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`",
- DBA::escape($addr),
- intval($uid)
- );
- // Fetch the data from the contact table with "uid=0" (which is filled automatically)
- if (!DBA::isResult($r)) {
- $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
- FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`",
- DBA::escape($addr)
- );
- }
-
- // Fetch the data from the gcontact table
- if (!DBA::isResult($r)) {
- $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`
- FROM `gcontact` WHERE `addr` = '%s'",
- DBA::escape($addr)
- );
- }
-
- if (!DBA::isResult($r)) {
- $data = Probe::uri($addr);
-
- $profile = self::getDetailsByURL($data['url'], $uid);
- } else {
- $profile = $r[0];
- }
-
- return $profile;
- }
-
- /**
- * @brief Returns the data array for the photo menu of a given contact
+ * Returns the data array for the photo menu of a given contact
*
* @param array $contact contact
* @param int $uid optional, default 0
* @return array
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function photoMenu(array $contact, $uid = 0)
if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
if ($uid == 0) {
$profile_link = self::magicLink($contact['url']);
- $menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
+ $menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
return $menu;
}
$sparkle = false;
if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
$sparkle = true;
- $profile_link = System::baseUrl() . '/redir/' . $contact['id'];
+ $profile_link = DI::baseUrl() . '/redir/' . $contact['id'];
} else {
$profile_link = $contact['url'];
}
}
if ($sparkle) {
- $status_link = $profile_link . '?tab=status';
+ $status_link = $profile_link . '/status';
$photos_link = str_replace('/profile/', '/photos/', $profile_link);
- $profile_link = $profile_link . '?tab=profile';
+ $profile_link = $profile_link . '/profile';
}
if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {
- $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
+ $pm_url = DI::baseUrl() . '/message/new/' . $contact['id'];
}
if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
- $poke_link = System::baseUrl() . '/poke/?c=' . $contact['id'];
+ $poke_link = 'contact/' . $contact['id'] . '/poke';
}
- $contact_url = System::baseUrl() . '/contact/' . $contact['id'];
+ $contact_url = DI::baseUrl() . '/contact/' . $contact['id'];
- $posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
+ $posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
if (!$contact['self']) {
- $contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
+ $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
}
$follow_link = '';
}
}
+ if (!empty($follow_link) || !empty($unfollow_link)) {
+ $contact_drop_link = '';
+ }
+
/**
* Menu array:
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
*/
if (empty($contact['uid'])) {
$menu = [
- 'profile' => [L10n::t('View Profile') , $profile_link , true],
- 'network' => [L10n::t('Network Posts') , $posts_link , false],
- 'edit' => [L10n::t('View Contact') , $contact_url , false],
- 'follow' => [L10n::t('Connect/Follow'), $follow_link , true],
- 'unfollow'=> [L10n::t('UnFollow') , $unfollow_link, true],
+ 'profile' => [DI::l10n()->t('View Profile') , $profile_link , true],
+ 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false],
+ 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false],
+ 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true],
+ 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link, true],
];
} else {
$menu = [
- 'status' => [L10n::t('View Status') , $status_link , true],
- 'profile' => [L10n::t('View Profile') , $profile_link , true],
- 'photos' => [L10n::t('View Photos') , $photos_link , true],
- 'network' => [L10n::t('Network Posts') , $posts_link , false],
- 'edit' => [L10n::t('View Contact') , $contact_url , false],
- 'drop' => [L10n::t('Drop Contact') , $contact_drop_link, false],
- 'pm' => [L10n::t('Send PM') , $pm_url , false],
- 'poke' => [L10n::t('Poke') , $poke_link , false],
- 'follow' => [L10n::t('Connect/Follow'), $follow_link , true],
- 'unfollow'=> [L10n::t('UnFollow') , $unfollow_link , true],
+ 'status' => [DI::l10n()->t('View Status') , $status_link , true],
+ 'profile' => [DI::l10n()->t('View Profile') , $profile_link , true],
+ 'photos' => [DI::l10n()->t('View Photos') , $photos_link , true],
+ 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false],
+ 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false],
+ 'drop' => [DI::l10n()->t('Drop Contact') , $contact_drop_link, false],
+ 'pm' => [DI::l10n()->t('Send PM') , $pm_url , false],
+ 'poke' => [DI::l10n()->t('Poke') , $poke_link , false],
+ 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true],
+ 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link , true],
];
if (!empty($contact['pending'])) {
$intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]);
if (DBA::isResult($intro)) {
- $menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true];
+ $menu['follow'] = [DI::l10n()->t('Approve'), 'notifications/intros/' . $intro['id'], true];
}
}
}
}
/**
- * @brief Returns ungrouped contact count or list for user
+ * Returns ungrouped contact count or list for user
*
* Returns either the total number of ungrouped contacts for the given user
* id or a paginated list of ungrouped contacts.
}
/**
- * @brief Fetch the contact id for a given URL and user
+ * Fetch the contact id for a given URL and user
*
* First lookup in the contact table to find a record matching either `url`, `nurl`,
* `addr` or `alias`.
*
* @param string $url Contact URL
* @param integer $uid The user id for the contact (0 = public contact)
- * @param boolean $no_update Don't update the contact
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
* @param array $default Default value for creating the contact when every else fails
* @param boolean $in_loop Internally used variable to prevent an endless loop
*
* @return integer Contact ID
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
+ public static function getIdForURL($url, $uid = 0, $update = null, $default = [], $in_loop = false)
{
- Logger::log("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), Logger::DEBUG);
+ Logger::info('Get contact data', ['url' => $url, 'user' => $uid]);
$contact_id = 0;
return 0;
}
- /// @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
- $fields = ['id', 'avatar', 'updated', 'network'];
- $options = ['order' => ['id']];
- $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options);
-
- // Then the addr (nick@server.tld)
- if (!DBA::isResult($contact)) {
- $contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
- }
-
- // Then the alias (which could be anything)
- if (!DBA::isResult($contact)) {
- // The link could be provided as http although we stored it as https
- $ssl_url = str_replace('http://', 'https://', $url);
- $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid];
- $contact = DBA::selectFirst('contact', $fields, $condition, $options);
- }
+ $contact = self::getByURL($url, false, ['id', 'avatar', 'updated', 'network'], $uid);
- if (DBA::isResult($contact)) {
+ if (!empty($contact)) {
$contact_id = $contact["id"];
- $update_contact = false;
-
- // Update the contact every 7 days (Don't update mail or feed contacts)
- if (in_array($contact['network'], Protocol::FEDERATED)) {
- $update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days'));
- // We force the update if the avatar is empty
- if (empty($contact['avatar'])) {
- $update_contact = true;
- }
- } elseif (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
+ if (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
// Update public mail accounts via their user's accounts
$fields = ['network', 'addr', 'name', 'nick', 'avatar', 'photo', 'thumb', 'micro'];
$mailcontact = DBA::selectFirst('contact', $fields, ["`addr` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]);
}
}
- // Update the contact in the background if needed but it is called by the frontend
- if ($update_contact && $no_update && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
- Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
- }
-
- if (!$update_contact || $no_update) {
+ if (empty($update)) {
return $contact_id;
}
} elseif ($uid != 0) {
return 0;
}
- if ($no_update && empty($default)) {
+ if (!$update && empty($default)) {
// When we don't want to update, we look if we know this contact in any way
$data = self::getProbeDataFromDatabase($url, $contact_id);
$background_update = true;
- } elseif ($no_update && !empty($default['network'])) {
+ } elseif (!$update && !empty($default['network'])) {
// If there are default values, take these
$data = $default;
$background_update = false;
$background_update = false;
}
- if (empty($data)) {
+ if ((empty($data) && is_null($update)) || $update) {
$data = Probe::uri($url, "", $uid);
- // Ensure that there is a gserver entry
- if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
- GServer::check($data['baseurl']);
- }
}
// Take the default values when probing failed
return 0;
}
- if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
- $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
+ if (!empty($data['baseurl'])) {
+ $data['baseurl'] = GServer::cleanURL($data['baseurl']);
+ }
+
+ if (!empty($data['baseurl']) && empty($data['gsid'])) {
+ $data['gsid'] = GServer::getID($data['baseurl']);
+ }
+
+ if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url']) && !$in_loop) {
+ $contact_id = self::getIdForURL($data["alias"], $uid, false, $default, true);
}
if (!$contact_id) {
'poll' => $data['poll'] ?? '',
'name' => $data['name'] ?? '',
'nick' => $data['nick'] ?? '',
- 'photo' => $data['photo'] ?? '',
'keywords' => $data['keywords'] ?? '',
'location' => $data['location'] ?? '',
'about' => $data['about'] ?? '',
'confirm' => $data['confirm'] ?? '',
'poco' => $data['poco'] ?? '',
'baseurl' => $data['baseurl'] ?? '',
+ 'gsid' => $data['gsid'] ?? null,
'name-date' => DateTimeFormat::utcNow(),
'uri-date' => DateTimeFormat::utcNow(),
'avatar-date' => DateTimeFormat::utcNow(),
}
if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
- self::updateAvatar($data['photo'], $uid, $contact_id);
+ self::updateAvatar($contact_id, $data['photo']);
}
if (in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
} else {
// Else do a direct update
self::updateFromProbe($contact_id, '', false);
-
- // Update the gcontact entry
- if ($uid == 0) {
- GContact::updateFromPublicContactID($contact_id);
- }
}
} else {
- $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl'];
+ $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid'];
$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
// This condition should always be true
$updated = [
'url' => $data['url'],
'nurl' => Strings::normaliseLink($data['url']),
- 'updated' => DateTimeFormat::utcNow()
+ 'updated' => DateTimeFormat::utcNow(),
+ 'failed' => false
];
- $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl'];
+ $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl', 'gsid'];
foreach ($fields as $field) {
$updated[$field] = ($data[$field] ?? '') ?: $contact[$field];
}
/**
- * @brief Checks if the contact is archived
+ * Checks if the contact is archived
*
* @param int $cid contact id
*
* @return boolean Is the contact archived?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function isArchived(int $cid)
{
}
/**
- * @brief Checks if the contact is blocked
+ * Checks if the contact is blocked
*
* @param int $cid contact id
*
* @return boolean Is the contact blocked?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
*/
public static function isBlocked($cid)
{
}
/**
- * @brief Checks if the contact is hidden
+ * Checks if the contact is hidden
*
* @param int $cid contact id
*
}
/**
- * @brief Returns posts from a given contact url
+ * Returns posts from a given contact url
*
* @param string $contact_url Contact URL
- *
* @param bool $thread_mode
* @param int $update
* @return string posts in HTML
*/
public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
{
- $a = self::getApp();
+ return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update);
+ }
- $cid = self::getIdForURL($contact_url);
+ /**
+ * Returns posts from a given contact id
+ *
+ * @param integer $cid
+ * @param bool $thread_mode
+ * @param integer $update
+ * @return string posts in HTML
+ * @throws \Exception
+ */
+ public static function getPostsFromId($cid, $thread_mode = false, $update = 0)
+ {
+ $a = DI::app();
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
if (!DBA::isResult($contact)) {
$cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
}
- $pager = new Pager($a->query_string);
+ if (DI::mode()->isMobile()) {
+ $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+ DI::config()->get('system', 'itemspage_network_mobile'));
+ } else {
+ $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+ DI::config()->get('system', 'itemspage_network'));
+ }
+
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
$params = ['order' => ['received' => true],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
$items = Item::inArray($r);
- $o = conversation($a, $items, $pager, '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, $pager, 'contact-posts', false);
+ $o = conversation($a, $items, 'contact-posts', false);
}
if (!$update) {
}
/**
- * @brief Returns the account type name
+ * Returns the account type name
*
* The function can be called with either the user or the contact array
*
switch ($type) {
case self::TYPE_ORGANISATION:
- $account_type = L10n::t("Organisation");
+ $account_type = DI::l10n()->t("Organisation");
break;
case self::TYPE_NEWS:
- $account_type = L10n::t('News');
+ $account_type = DI::l10n()->t('News');
break;
case self::TYPE_COMMUNITY:
- $account_type = L10n::t("Forum");
+ $account_type = DI::l10n()->t("Forum");
break;
default:
}
/**
- * @brief Blocks a contact
+ * Blocks a contact
*
* @param int $cid
* @return bool
}
/**
- * @brief Unblocks a contact
+ * Unblocks a contact
*
* @param int $cid
* @return bool
}
/**
- * @brief Updates the avatar links in a contact only if needed
+ * Ensure that cached avatar exist
+ *
+ * @param integer $cid
+ */
+ public static function checkAvatarCache(int $cid)
+ {
+ $contact = DBA::selectFirst('contact', ['url', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
+ if (!DBA::isResult($contact)) {
+ return;
+ }
+
+ if (empty($contact['avatar']) || (!empty($contact['photo']) && !empty($contact['thumb']) && !empty($contact['micro']))) {
+ return;
+ }
+
+ Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
+
+ self::updateAvatar($cid, $contact['avatar'], true);
+ }
+
+ /**
+ * 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
+ * @return string photo path
+ */
+ private static function getAvatarPath(array $contact, string $field, string $default, string $size, string $avatar)
+ {
+ if (!empty($contact)) {
+ $contact = self::checkAvatarCacheByArray($contact);
+ if (!empty($contact[$field])) {
+ $avatar = $contact[$field];
+ }
+ }
+
+ if (empty($avatar)) {
+ return $default;
+ }
+
+ if (Proxy::isLocalImage($avatar)) {
+ return $avatar;
+ } else {
+ return Proxy::proxifyUrl($avatar, false, $size);
+ }
+ }
+
+ /**
+ * 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
+ * @return string photo path
+ */
+ public static function getPhoto(array $contact, string $avatar = '')
+ {
+ return self::getAvatarPath($contact, 'photo', DI::baseUrl() . '/images/person-300.jpg', Proxy::SIZE_SMALL, $avatar);
+ }
+
+ /**
+ * 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
+ * @return string photo path
+ */
+ public static function getThumb(array $contact, string $avatar = '')
+ {
+ return self::getAvatarPath($contact, 'thumb', DI::baseUrl() . '/images/person-80.jpg', Proxy::SIZE_THUMB, $avatar);
+ }
+
+ /**
+ * 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
+ * @return string photo path
+ */
+ public static function getMicro(array $contact, string $avatar = '')
+ {
+ return self::getAvatarPath($contact, 'micro', DI::baseUrl() . '/images/person-48.jpg', Proxy::SIZE_MICRO, $avatar);
+ }
+
+ /**
+ * Check the given contact array for avatar cache fields
+ *
+ * @param array $contact
+ * @return array contact array with avatar cache fields
+ */
+ private static function checkAvatarCacheByArray(array $contact)
+ {
+ $update = false;
+ $contact_fields = [];
+ $fields = ['photo', 'thumb', 'micro'];
+ foreach ($fields as $field) {
+ if (isset($contact[$field])) {
+ $contact_fields[] = $field;
+ }
+ if (isset($contact[$field]) && empty($contact[$field])) {
+ $update = true;
+ }
+ }
+
+ if (!$update) {
+ return $contact;
+ }
+
+ if (!empty($contact['id']) && !empty($contact['avatar'])) {
+ self::updateAvatar($contact['id'], $contact['avatar'], true);
+
+ $new_contact = self::getById($contact['id'], $contact_fields);
+ if (DBA::isResult($new_contact)) {
+ // We only update the cache fields
+ $contact = array_merge($contact, $new_contact);
+ }
+ }
+
+ /// add the default avatars if the fields aren't filled
+ if (isset($contact['photo']) && empty($contact['photo'])) {
+ $contact['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+ }
+ if (isset($contact['thumb']) && empty($contact['thumb'])) {
+ $contact['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
+ }
+ if (isset($contact['micro']) && empty($contact['micro'])) {
+ $contact['micro'] = DI::baseUrl() . '/images/person-48.jpg';
+ }
+
+ return $contact;
+ }
+
+ /**
+ * Updates the avatar links in a contact only if needed
*
- * @param string $avatar Link to avatar picture
- * @param int $uid User id of contact owner
* @param int $cid Contact id
+ * @param string $avatar Link to avatar picture
* @param bool $force force picture update
*
- * @return array Returns array of the different avatar sizes
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @return void
+ * @throws HTTPException\InternalServerErrorException
+ * @throws HTTPException\NotFoundException
* @throws \ImagickException
*/
- public static function updateAvatar($avatar, $uid, $cid, $force = false)
+ public static function updateAvatar(int $cid, string $avatar, bool $force = false)
{
- $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
+ $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
if (!DBA::isResult($contact)) {
- return false;
- } else {
- $data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
+ return;
}
- if (($contact["avatar"] != $avatar) || $force) {
- $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
+ $uid = $contact['uid'];
- if ($photos) {
- $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
- DBA::update('contact', $fields, ['id' => $cid]);
+ // 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 ($contact['avatar'] != $avatar) {
+ DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
+ Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
+ }
+ return;
+ }
- // Update the public contact (contact id = 0)
- if ($uid != 0) {
- $pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
- if (DBA::isResult($pcontact)) {
- DBA::update('contact', $fields, ['id' => $pcontact['id']]);
- }
- }
+ $data = [
+ $contact['photo'] ?? '',
+ $contact['thumb'] ?? '',
+ $contact['micro'] ?? '',
+ ];
- return $photos;
+ $update = ($contact['avatar'] != $avatar) || $force;
+
+ 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;
+ }
}
}
- return $data;
+ 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]);
+ }
+ }
}
- /**
- * @brief Helper function for "updateFromProbe". Updates personal and public contact
+ /**
+ * Helper function for "updateFromProbe". Updates personal and public contact
*
* @param integer $id contact id
* @param integer $uid user id
DBA::update('contact', $fields, $condition);
}
- /**
- * @brief Remove duplicated contacts
+ /**
+ * Remove duplicated contacts
*
* @param string $nurl Normalised contact url
* @param integer $uid User id
Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
}
+ DBA::close($duplicates);
Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
return true;
}
* @param string $network Optional network we are probing for
* @param boolean $force Optional forcing of network probing (otherwise we use the cached data)
* @return boolean
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function updateFromProbe($id, $network = '', $force = false)
+ public static function updateFromProbe(int $id, string $network = '', bool $force = false)
{
/*
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
// These fields aren't updated by this routine:
// 'xmpp', 'sensitive'
- $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'gender',
+ $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
- 'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type', 'pubkey'];
+ 'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey'];
$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
if (!DBA::isResult($contact)) {
return false;
// 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'], ['last-update' => $updated, 'success_update' => $updated]);
+ self::updateContact($id, $uid, $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 ($force && ($uid == 0)) {
- self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'failure_update' => $updated]);
+ self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
}
return false;
}
+ if (ContactRelation::isDiscoverable($ret['url'])) {
+ Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
+ }
+
if (isset($ret['hide']) && is_bool($ret['hide'])) {
$ret['unsearchable'] = $ret['hide'];
}
$new_pubkey = $ret['pubkey'];
+ // Update the gcontact entry
+ if ($uid == 0) {
+ GContact::updateFromPublicContactID($id);
+ }
+
$update = false;
// make sure to not overwrite existing values with blank entries except some technical fields
}
if (!empty($ret['photo']) && ($ret['network'] != Protocol::FEED)) {
- self::updateAvatar($ret['photo'], $uid, $id, $update || $force);
+ self::updateAvatar($id, $ret['photo'], $update || $force);
}
if (!$update) {
if ($force) {
- self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
+ self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+ }
+
+ // Update the public contact
+ if ($uid != 0) {
+ self::updateFromProbeByURL($ret['url']);
}
+
return true;
}
if ($force && ($uid == 0)) {
$ret['last-update'] = $updated;
$ret['success_update'] = $updated;
+ $ret['failed'] = false;
}
unset($ret['photo']);
/**
* Takes a $uid and a url/handle and adds a new contact
+ *
* Currently if the contact is DFRN, interactive needs to be true, to redirect to the
* dfrn_request page.
*
* $return['success'] boolean true if successful
* $return['message'] error text if success is false.
*
- * @brief Takes a $uid and a url/handle and adds a new contact
- * @param int $uid
- * @param string $url
+ * Takes a $uid and a url/handle and adds a new contact
+ *
+ * @param array $user The user the contact should be created for
+ * @param string $url The profile URL of the contact
* @param bool $interactive
* @param string $network
* @return array
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
+ * @throws HTTPException\NotFoundException
* @throws \ImagickException
*/
- public static function createFromProbe($uid, $url, $interactive = false, $network = '')
+ public static function createFromProbe(array $user, $url, $interactive = false, $network = '')
{
$result = ['cid' => -1, 'success' => false, 'message' => ''];
- $a = \get_app();
-
// remove ajax junk, e.g. Twitter
$url = str_replace('/#!/', '/', $url);
if (!Network::isUrlAllowed($url)) {
- $result['message'] = L10n::t('Disallowed profile URL.');
+ $result['message'] = DI::l10n()->t('Disallowed profile URL.');
return $result;
}
if (Network::isUrlBlocked($url)) {
- $result['message'] = L10n::t('Blocked domain');
+ $result['message'] = DI::l10n()->t('Blocked domain');
return $result;
}
if (!$url) {
- $result['message'] = L10n::t('Connect URL missing.');
+ $result['message'] = DI::l10n()->t('Connect URL missing.');
return $result;
}
Hook::callAll('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.');
+ $result['message'] = DI::l10n()->t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');
return $result;
}
if (!empty($arr['contact']['name'])) {
$ret = $arr['contact'];
} else {
- $ret = Probe::uri($url, $network, $uid, false);
+ $ret = Probe::uri($url, $network, $user['uid'], false);
}
if (($network != '') && ($ret['network'] != $network)) {
// the poll url is more reliable than the profile url, as we may have
// indirect links or webfinger links
- $condition = ['uid' => $uid, 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
+ $condition = ['uid' => $user['uid'], 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
if (!DBA::isResult($contact)) {
- $condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($url), 'network' => $ret['network'], 'pending' => false];
+ $condition = ['uid' => $user['uid'], 'nurl' => Strings::normaliseLink($ret['url']), 'network' => $ret['network'], 'pending' => false];
$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
}
- $protocol = self::getProtocol($url, $ret['network']);
+ $protocol = self::getProtocol($ret['url'], $ret['network']);
if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
if ($interactive) {
- if (strlen($a->getURLPath())) {
- $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
+ if (strlen(DI::baseUrl()->getUrlPath())) {
+ $myaddr = bin2hex(DI::baseUrl() . '/profile/' . $user['nickname']);
} else {
- $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName());
+ $myaddr = bin2hex($user['nickname'] . '@' . DI::baseUrl()->getHostname());
}
- $a->internalRedirect($ret['request'] . "&addr=$myaddr");
+ DI::baseUrl()->redirect($ret['request'] . "&addr=$myaddr");
// NOTREACHED
}
- } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::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;
+ } elseif (DI::config()->get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
+ $result['message'] = DI::l10n()->t('This site is not configured to allow communications with other networks.') . EOL;
+ $result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
return $result;
}
// do we have enough information?
if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
- $result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
+ $result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . EOL;
if (empty($ret['poll'])) {
- $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
+ $result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
}
if (empty($ret['name'])) {
- $result['message'] .= L10n::t('An author or name was not found.') . EOL;
+ $result['message'] .= DI::l10n()->t('An author or name was not found.') . EOL;
}
if (empty($ret['url'])) {
- $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
+ $result['message'] .= DI::l10n()->t('No browser URL could be matched to this address.') . EOL;
}
- if (strpos($url, '@') !== false) {
- $result['message'] .= L10n::t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
- $result['message'] .= L10n::t('Use mailto: in front of address to force email check.') . EOL;
+ if (strpos($ret['url'], '@') !== false) {
+ $result['message'] .= DI::l10n()->t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
+ $result['message'] .= DI::l10n()->t('Use mailto: in front of address to force email check.') . EOL;
}
return $result;
}
- if ($protocol === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
- $result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
+ if ($protocol === Protocol::OSTATUS && DI::config()->get('system', 'ostatus_disabled')) {
+ $result['message'] .= DI::l10n()->t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
$ret['notify'] = '';
}
if (!$ret['notify']) {
- $result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
+ $result['message'] .= DI::l10n()->t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
}
$writeable = ((($protocol === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
$pending = false;
if ($protocol == Protocol::ACTIVITYPUB) {
- $apcontact = APContact::getByURL($url, false);
+ $apcontact = APContact::getByURL($ret['url'], false);
if (isset($apcontact['manually-approve'])) {
$pending = (bool)$apcontact['manually-approve'];
}
// create contact record
self::insert([
- 'uid' => $uid,
+ 'uid' => $user['uid'],
'created' => DateTimeFormat::utcNow(),
'url' => $ret['url'],
'nurl' => Strings::normaliseLink($ret['url']),
'nick' => $ret['nick'],
'network' => $ret['network'],
'baseurl' => $ret['baseurl'],
+ 'gsid' => $ret['gsid'] ?? null,
'protocol' => $protocol,
'pubkey' => $ret['pubkey'],
'rel' => $new_relation,
]);
}
- $contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
+ $contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $user['uid']]);
if (!DBA::isResult($contact)) {
- $result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
+ $result['message'] .= DI::l10n()->t('Unable to retrieve contact information.') . EOL;
return $result;
}
$contact_id = $contact['id'];
$result['cid'] = $contact_id;
- Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
+ Group::addMember(User::getDefaultGroup($user['uid'], $contact["network"]), $contact_id);
// Update the avatar
- self::updateAvatar($ret['photo'], $uid, $contact_id);
+ 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");
- $owner = User::getOwnerDataById($uid);
+ $owner = User::getOwnerDataById($user['uid']);
if (DBA::isResult($owner)) {
if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
// create a follow slap
$item = [];
$item['verb'] = Activity::FOLLOW;
+ $item['gravity'] = GRAVITY_ACTIVITY;
$item['follow'] = $contact["url"];
$item['body'] = '';
$item['title'] = '';
$item['guid'] = '';
- $item['tag'] = '';
+ $item['uri-id'] = 0;
$item['attach'] = '';
$slap = OStatus::salmon($item, $owner);
Salmon::slapper($owner, $contact['notify'], $slap);
}
} elseif ($protocol == Protocol::DIASPORA) {
- $ret = Diaspora::sendShare($a->user, $contact);
+ $ret = Diaspora::sendShare($owner, $contact);
Logger::log('share returns: ' . $ret);
} elseif ($protocol == Protocol::ACTIVITYPUB) {
$activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
return false;
}
- $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id);
+ $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $user['uid'], $activity_id);
Logger::log('Follow returns: ' . $ret);
}
}
}
/**
- * @brief Updated contact's SSL policy
+ * Updated contact's SSL policy
*
* @param array $contact Contact array
* @param string $new_policy New policy, valid: self,full
* @param bool $sharing True: Contact is now sharing with Owner; False: Contact is now following Owner (default)
* @param string $note Introduction additional message
* @return bool|null True: follow request is accepted; False: relationship is rejected; Null: relationship is pending
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function addRelationship(array $importer, array $contact, array $datarray, $sharing = false, $note = '')
'nurl' => Strings::normaliseLink($url),
'name' => $name,
'nick' => $nick,
- 'photo' => $photo,
'network' => $network,
'rel' => self::FOLLOWER,
'blocked' => 0,
// Ensure to always have the correct network type, independent from the connection request method
self::updateFromProbe($contact_id, '', true);
- Contact::updateAvatar($photo, $importer["uid"], $contact_id, true);
+ self::updateAvatar($contact_id, $photo, true);
$contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
- if (($user['notify-flags'] & NOTIFY_INTRO) &&
+ if (($user['notify-flags'] & Type::INTRO) &&
in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
notification([
- 'type' => NOTIFY_INTRO,
+ 'type' => Type::INTRO,
'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]')),
+ '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),
]);
}
} elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
+ if (($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) && ($network != Protocol::DIASPORA)) {
+ self::createFromProbe($importer, $url, false, $network);
+ }
+
$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
- DBA::update('contact', ['pending' => false], $condition);
+ $fields = ['pending' => false];
+ if ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) {
+ $fields['rel'] = Contact::FRIEND;
+ }
+
+ DBA::update('contact', $fields, $condition);
return true;
}
}
/**
- * @brief Create a birthday event.
+ * Create a birthday event.
*
* Update the year and the birthday.
*/
);
}
}
+ DBA::close($contacts);
}
/**
* Remove the unavailable contact ids from the provided list
*
* @param array $contact_ids Contact id list
+ * @return array
* @throws \Exception
*/
- public static function pruneUnavailable(array &$contact_ids)
+ public static function pruneUnavailable(array $contact_ids)
{
if (empty($contact_ids)) {
- return;
- }
-
- $str = DBA::escape(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'];
+ return [];
}
- DBA::close($stmt);
+ $contacts = Contact::selectToArray(['id'], [
+ 'id' => $contact_ids,
+ 'blocked' => false,
+ 'pending' => false,
+ 'archive' => false,
+ ]);
- $contact_ids = $return;
+ return array_column($contacts, 'id');
}
/**
- * @brief Returns a magic link to authenticate remote visitors
+ * Returns a magic link to authenticate remote visitors
*
* @todo check if the return is either a fully qualified URL or a relative path to Friendica basedir
*
* @param string $url An url that we will be redirected to after the authentication
*
* @return string with "redir" link
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function magicLink($contact_url, $url = '')
}
/**
- * @brief Returns a magic link to authenticate remote visitors
+ * Returns a magic link to authenticate remote visitors
*
* @param integer $cid The contact id of the target contact profile
* @param string $url An url that we will be redirected to after the authentication
*
* @return string with "redir" link
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function magicLinkbyId($cid, $url = '')
}
/**
- * @brief Returns a magic link to authenticate remote visitors
+ * Returns a magic link to authenticate remote visitors
*
* @param array $contact The contact array with "uid", "network" and "url"
* @param string $url An url that we will be redirected to after the authentication
*
* @return string with "redir" link
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function magicLinkByContact($contact, $url = '')
return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self;
}
+
+ /**
+ * Search contact table by nick or name
+ *
+ * @param string $search Name or nick
+ * @param string $mode Search mode (e.g. "community")
+ *
+ * @return array with search results
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ */
+ public static function searchByName($search, $mode = '')
+ {
+ if (empty($search)) {
+ return [];
+ }
+
+ // check supported networks
+ if (DI::config()->get('system', 'diaspora_enabled')) {
+ $diaspora = Protocol::DIASPORA;
+ } else {
+ $diaspora = Protocol::DFRN;
+ }
+
+ if (!DI::config()->get('system', 'ostatus_disabled')) {
+ $ostatus = Protocol::OSTATUS;
+ } else {
+ $ostatus = Protocol::DFRN;
+ }
+
+ // check if we search only communities or every contact
+ if ($mode === 'community') {
+ $extra_sql = sprintf(' AND `contact-type` = %d', Contact::TYPE_COMMUNITY);
+ } else {
+ $extra_sql = '';
+ }
+
+ $search .= '%';
+
+ $results = DBA::p("SELECT * FROM `contact`
+ WHERE NOT `unsearchable` AND `network` IN (?, ?, ?, ?) AND
+ 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
+ );
+
+ $contacts = DBA::toArray($results);
+ return $contacts;
+ }
+
+ /**
+ * @param int $uid user
+ * @param int $start optional, default 0
+ * @param int $limit optional, default 80
+ * @return array
+ */
+ static public function getSuggestions(int $uid, int $start = 0, int $limit = 80)
+ {
+ $cid = self::getPublicIdByUserId($uid);
+ $totallimit = $start + $limit;
+ $contacts = [];
+
+ Logger::info('Collecting suggestions', ['uid' => $uid, 'cid' => $cid, 'start' => $start, 'limit' => $limit]);
+
+ $diaspora = DI::config()->get('system', 'diaspora_enabled') ? Protocol::DIASPORA : Protocol::ACTIVITYPUB;
+ $ostatus = !DI::config()->get('system', 'ostatus_disabled') ? Protocol::OSTATUS : Protocol::ACTIVITYPUB;
+
+ // The query returns contacts where contacts interacted with who the given user follows.
+ // Contacts who already are in the user's contact table are ignored.
+ $results = DBA::select('contact', [],
+ ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` IN
+ (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ?)
+ AND NOT `cid` IN (SELECT `id` FROM `contact` WHERE `uid` = ? AND `nurl` IN
+ (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))))
+ AND NOT `hidden` AND `network` IN (?, ?, ?, ?)",
+ $cid, 0, $uid, Contact::FRIEND, Contact::SHARING,
+ Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus],
+ ['order' => ['last-item' => true], 'limit' => $totallimit]
+ );
+
+ while ($contact = DBA::fetch($results)) {
+ $contacts[$contact['id']] = $contact;
+ }
+ DBA::close($results);
+
+ Logger::info('Contacts of contacts who are followed by the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+
+ if (count($contacts) >= $totallimit) {
+ return array_slice($contacts, $start, $limit);
+ }
+
+ // The query returns contacts where contacts interacted with who also interacted with the given user.
+ // Contacts who already are in the user's contact table are ignored.
+ $results = DBA::select('contact', [],
+ ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` IN
+ (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ?)
+ AND NOT `cid` IN (SELECT `id` FROM `contact` WHERE `uid` = ? AND `nurl` IN
+ (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))))
+ AND NOT `hidden` AND `network` IN (?, ?, ?, ?)",
+ $cid, 0, $uid, Contact::FRIEND, Contact::SHARING,
+ Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus],
+ ['order' => ['last-item' => true], 'limit' => $totallimit]
+ );
+
+ while ($contact = DBA::fetch($results)) {
+ $contacts[$contact['id']] = $contact;
+ }
+ DBA::close($results);
+
+ Logger::info('Contacts of contacts who are following the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+
+ if (count($contacts) >= $totallimit) {
+ return array_slice($contacts, $start, $limit);
+ }
+
+ // The query returns contacts that follow the given user but aren't followed by that user.
+ $results = DBA::select('contact', [],
+ ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` = ?)
+ AND NOT `hidden` AND `uid` = ? AND `network` IN (?, ?, ?, ?)",
+ $uid, Contact::FOLLOWER, 0,
+ Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus],
+ ['order' => ['last-item' => true], 'limit' => $totallimit]
+ );
+
+ while ($contact = DBA::fetch($results)) {
+ $contacts[$contact['id']] = $contact;
+ }
+ DBA::close($results);
+
+ Logger::info('Followers that are not followed by the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+
+ if (count($contacts) >= $totallimit) {
+ return array_slice($contacts, $start, $limit);
+ }
+
+ // The query returns any contact that isn't followed by that user.
+ $results = DBA::select('contact', [],
+ ["NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))
+ AND NOT `hidden` AND `uid` = ? AND `network` IN (?, ?, ?, ?)",
+ $uid, Contact::FRIEND, Contact::SHARING, 0,
+ Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus],
+ ['order' => ['last-item' => true], 'limit' => $totallimit]
+ );
+
+ while ($contact = DBA::fetch($results)) {
+ $contacts[$contact['id']] = $contact;
+ }
+ DBA::close($results);
+
+ Logger::info('Any contact', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+
+ return array_slice($contacts, $start, $limit);
+ }
}
projects / friendica.git / blobdiff