<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Contact\Avatar;
use Friendica\Contact\Introduction\Exception\IntroductionNotFoundException;
+use Friendica\Content\Conversation As ConversationContent;
use Friendica\Content\Pager;
use Friendica\Content\Text\HTML;
use Friendica\Core\Hook;
use Friendica\Util\Network;
use Friendica\Util\Proxy;
use Friendica\Util\Strings;
+use Friendica\Worker\UpdateContact;
/**
* functions for interacting with a contact
* @param array $condition condition array with the key values
* @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields)
*
- * @return boolean was the update successfull?
+ * @return boolean was the update successful?
* @throws \Exception
* @todo Let's get rid of boolean type of $old_fields
*/
- public static function update(array $fields, array $condition, $old_fields = [])
+ public static function update(array $fields, array $condition, $old_fields = []): bool
{
- $fields = DI::dbaDefinition()->truncateFieldsForTable('contact', $fields);
- $ret = DBA::update('contact', $fields, $condition, $old_fields);
-
// Apply changes to the "user-contact" table on dedicated fields
Contact\User::updateByContactUpdate($fields, $condition);
- return $ret;
+ $fields = DI::dbaDefinition()->truncateFieldsForTable('contact', $fields);
+ return DBA::update('contact', $fields, $condition, $old_fields);
}
/**
// Update the contact in the background if needed
if ($background_update && !self::isLocal($url) && Probe::isProbable($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) {
- Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateContact', $contact['id']);
+ try {
+ UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
+ } catch (\InvalidArgumentException $e) {
+ Logger::notice($e->getMessage(), ['contact' => $contact]);
+ }
}
// Remove the internal fields
{
if (!parse_url($url, PHP_URL_SCHEME)) {
$addr_parts = explode('@', $url);
- return (count($addr_parts) == 2) && ($addr_parts[1] == DI::baseUrl()->getHostname());
+ return (count($addr_parts) == 2) && ($addr_parts[1] == DI::baseUrl()->getHost());
}
return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl());
public static function getPublicAndUserContactID(int $cid, int $uid): array
{
// We have to use the legacy function as long as the post update hasn't finished
- if (DI::config()->get('system', 'post_update_version') < 1427) {
+ if (DI::keyValue()->get('post_update_version') < 1427) {
return self::legacyGetPublicAndUserContactID($cid, $uid);
}
$background_update = DI::config()->get('system', 'update_active_contacts') ? $contact['local-data'] : true;
if ($background_update && !self::isLocal($url) && Probe::isProbable($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) {
- Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateContact', $contact['id']);
+ try {
+ UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
+ } catch (\InvalidArgumentException $e) {
+ Logger::notice($e->getMessage(), ['contact' => $contact]);
+ }
}
if (empty($update) && (!empty($contact['uri-id']) || is_bool($update))) {
}
}
- $o .= DI::conversation()->create($items, 'contacts', $update, false, 'pinned_commented', DI::userSession()->getLocalUserId());
+ $o .= DI::conversation()->create($items, ConversationContent::MODE_CONTACTS, $update, false, 'pinned_commented', DI::userSession()->getLocalUserId());
} else {
$fields = array_merge(Item::DISPLAY_FIELDLIST, ['featured']);
$items = Post::toArray(Post::selectForUser(DI::userSession()->getLocalUserId(), $fields, $condition, $params));
}
}
- $o .= DI::conversation()->create($items, 'contact-posts', $update);
+ $o .= DI::conversation()->create($items, ConversationContent::MODE_CONTACT_POSTS, $update);
}
if (!$update) {
* Unblocks a contact
*
* @param int $cid Contact id to unblock
- * @return bool Whether it was successfull
+ * @return bool Whether it was successful
*/
public static function unblock(int $cid): bool
{
*
* @param array $contact contact array
* @param string $size Size of the avatar picture
- * @param bool $no_update Don't perfom an update if no cached avatar was found
+ * @param bool $no_update Don't perform an update if no cached avatar was found
* @return string photo path
*/
private static function getAvatarPath(array $contact, string $size, bool $no_update = false): string
* Return the photo path for a given contact array
*
* @param array $contact Contact array
- * @param bool $no_update Don't perfom an update if no cached avatar was found
+ * @param bool $no_update Don't perform an update if no cached avatar was found
* @return string photo path
*/
public static function getPhoto(array $contact, bool $no_update = false): string
* Return the photo path (thumb size) for a given contact array
*
* @param array $contact Contact array
- * @param bool $no_update Don't perfom an update if no cached avatar was found
+ * @param bool $no_update Don't perform an update if no cached avatar was found
* @return string photo path
*/
public static function getThumb(array $contact, bool $no_update = false): string
* Return the photo path (micro size) for a given contact array
*
* @param array $contact Contact array
- * @param bool $no_update Don't perfom an update if no cached avatar was found
+ * @param bool $no_update Don't perform an update if no cached avatar was found
* @return string photo path
*/
public static function getMicro(array $contact, bool $no_update = false): string
* Check the given contact array for avatar cache fields
*
* @param array $contact
- * @param bool $no_update Don't perfom an update if no cached avatar was found
+ * @param bool $no_update Don't perform an update if no cached avatar was found
* @return array contact array with avatar cache fields
*/
private static function checkAvatarCacheByArray(array $contact, bool $no_update = false): array
return;
}
+ if (!Network::isValidHttpUrl($avatar)) {
+ Logger::warning('Invalid avatar', ['cid' => $cid, 'avatar' => $avatar]);
+ $avatar = '';
+ }
+
$uid = $contact['uid'];
// Only update the cached photo links of public contacts when they already are cached
if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro']) && !$create_cache) {
if (($contact['avatar'] != $avatar) || empty($contact['blurhash'])) {
$update_fields = ['avatar' => $avatar];
- $fetchResult = HTTPSignature::fetchRaw($avatar, 0, [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::IMAGE]]);
-
- $img_str = $fetchResult->getBody();
- if (!empty($img_str)) {
- $image = new Image($img_str, Images::getMimeTypeByData($img_str));
- if ($image->isValid()) {
- $update_fields['blurhash'] = $image->getBlurHash();
+ if (!Network::isLocalLink($avatar)) {
+ try {
+ $fetchResult = HTTPSignature::fetchRaw($avatar, 0, [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::IMAGE]]);
+
+ $img_str = $fetchResult->getBody();
+ if (!empty($img_str)) {
+ $image = new Image($img_str, Images::getMimeTypeByData($img_str));
+ if ($image->isValid()) {
+ $update_fields['blurhash'] = $image->getBlurHash();
+ } else {
+ return;
+ }
+ }
+ } catch (\Exception $exception) {
+ Logger::notice('Error fetching avatar', ['avatar' => $avatar, 'exception' => $exception]);
+ return;
}
+ } elseif (!empty($contact['blurhash'])) {
+ $update_fields['blurhash'] = null;
+ } else {
+ return;
}
self::update($update_fields, ['id' => $cid]);
}
if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) {
- Avatar::deleteCache($contact);
+ if (Avatar::deleteCache($contact)) {
+ $force = true;
+ }
if ($default_avatar && Proxy::isLocalImage($avatar)) {
$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
$condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB];
+
+ if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT) && Protocol::supportsProbe($contact['network'])) {
+ $condition['network'][] = $contact['network'];
+ }
+
self::update($fields, $condition);
// We mustn't set the update fields for OStatus contacts since they are updated in OnePoll
return true;
}
+ $has_local_data = self::hasLocalData($id, $contact);
+
$uid = $contact['uid'];
unset($contact['uid']);
$updated = DateTimeFormat::utcNow();
- $has_local_data = self::hasLocalData($id, $contact);
-
- if (!Probe::isProbable($ret['network'])) {
+ if (!Probe::isProbable($ret['network']) && !Probe::isProbable($contact['network'])) {
// Periodical checks are only done on federated contacts
$failed_next_update = null;
$success_next_update = null;
}
// check if we already have a contact
- $condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url'])];
+ $condition = ['uid' => $uid, 'nurl' => Strings::normaliseLink($ret['url']), 'deleted' => false];
$contact = DBA::selectFirst('contact', ['id', 'rel', 'url', 'pending', 'hub-verify'], $condition);
$protocol = self::getProtocol($ret['url'], $ret['network']);
if ($probed) {
self::updateFromProbeArray($contact_id, $ret);
} else {
- Worker::add(Worker::PRIORITY_HIGH, 'UpdateContact', $contact_id);
+ try {
+ UpdateContact::add(Worker::PRIORITY_HIGH, $contact['id']);
+ } catch (\InvalidArgumentException $e) {
+ Logger::notice($e->getMessage(), ['contact' => $contact]);
+ }
}
$result['success'] = Protocol::follow($uid, $contact, $protocol);
if ($contact['rel'] == self::SHARING || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
self::remove($contact['id']);
} else {
- self::update(['rel' => self::FOLLOWER], ['id' => $contact['id']]);
+ self::update(['rel' => self::FOLLOWER, 'pending' => false], ['id' => $contact['id']]);
}
Worker::add(Worker::PRIORITY_LOW, 'ContactDiscoveryForUser', $contact['uid']);
/**
* Search contact table by nick or name
*
- * @param string $search Name or nick
- * @param string $mode Search mode (e.g. "community")
- * @param int $uid User ID
- * @param int $limit Maximum amount of returned values
- * @param int $offset Limit offset
+ * @param string $search Name or nick
+ * @param string $mode Search mode (e.g. "community")
+ * @param bool $show_blocked Show users from blocked servers. Default is false
+ * @param int $uid User ID
+ * @param int $limit Maximum amount of returned values
+ * @param int $offset Limit offset
*
* @return array with search results
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function searchByName(string $search, string $mode = '', int $uid = 0, int $limit = 0, int $offset = 0): array
+ public static function searchByName(string $search, string $mode = '', bool $show_blocked = false, int $uid = 0, int $limit = 0, int $offset = 0): array
{
if (empty($search)) {
return [];
$networks[] = Protocol::OSTATUS;
}
- $condition = ['network' => $networks, 'failed' => false, 'deleted' => false, 'uid' => $uid];
+ $condition = [
+ 'network' => $networks,
+ 'server-failed' => false,
+ 'failed' => false,
+ 'deleted' => false,
+ 'unsearchable' => false,
+ 'uid' => $uid
+ ];
+
+ if (!$show_blocked) {
+ $condition['server-blocked'] = true;
+ }
if ($uid == 0) {
$condition['blocked'] = false;
}
$condition = DBA::mergeConditions($condition,
- ["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` WHERE `publish` OR `net-publish`))
- AND (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $search, $search, $search]);
+ ["(`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $search, $search, $search]);
- return self::selectToArray([], $condition, $params);
+ return DBA::selectToArray('account-user-view', [], $condition, $params);
}
/**
Worker::add(Worker::PRIORITY_LOW, 'AddContact', 0, $url);
++$added;
} elseif (!empty($contact['network']) && Probe::isProbable($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) {
- Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateContact', $contact['id']);
- ++$updated;
+ try {
+ UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
+ ++$updated;
+ } catch (\InvalidArgumentException $e) {
+ Logger::notice($e->getMessage(), ['contact' => $contact]);
+ }
} else {
++$unchanged;
}
projects / friendica.git / blobdiff