parent
39675fe683
commit
88870d18be
|
@ -2312,6 +2312,8 @@ class Contact
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Updates contact record by provided id and optional network
|
||||||
|
*
|
||||||
* @param integer $id contact id
|
* @param integer $id contact id
|
||||||
* @param string $network Optional network we are probing for
|
* @param string $network Optional network we are probing for
|
||||||
* @return boolean
|
* @return boolean
|
||||||
|
@ -2335,13 +2337,15 @@ class Contact
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Updates contact record by provided id and probed data
|
||||||
|
*
|
||||||
* @param integer $id contact id
|
* @param integer $id contact id
|
||||||
* @param array $ret Probed data
|
* @param array $ret Probed data
|
||||||
* @return boolean
|
* @return boolean
|
||||||
* @throws HTTPException\InternalServerErrorException
|
* @throws HTTPException\InternalServerErrorException
|
||||||
* @throws \ImagickException
|
* @throws \ImagickException
|
||||||
*/
|
*/
|
||||||
private static function updateFromProbeArray(int $id, array $ret)
|
private static function updateFromProbeArray(int $id, array $ret): bool
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
|
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
|
||||||
|
@ -2552,6 +2556,8 @@ class Contact
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Updates contact record by provided URL
|
||||||
|
*
|
||||||
* @param integer $url contact url
|
* @param integer $url contact url
|
||||||
* @return integer Contact id
|
* @return integer Contact id
|
||||||
* @throws HTTPException\InternalServerErrorException
|
* @throws HTTPException\InternalServerErrorException
|
||||||
|
|
|
@ -103,17 +103,27 @@ class FContact
|
||||||
$posts = Post::countPosts(['author-id' => $contact['id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]);
|
$posts = Post::countPosts(['author-id' => $contact['id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$fields = ['name' => $arr["name"], 'photo' => $arr["photo"],
|
$fields = [
|
||||||
'request' => $arr["request"], 'nick' => $arr["nick"],
|
'name' => $arr['name'],
|
||||||
'addr' => strtolower($arr["addr"]), 'guid' => $arr["guid"],
|
'photo' => $arr['photo'],
|
||||||
'batch' => $arr["batch"], 'notify' => $arr["notify"],
|
'request' => $arr['request'],
|
||||||
'poll' => $arr["poll"], 'confirm' => $arr["confirm"],
|
'nick' => $arr['nick'],
|
||||||
'alias' => $arr["alias"], 'pubkey' => $arr["pubkey"],
|
'addr' => strtolower($arr['addr']),
|
||||||
'uri-id' => $uriid, 'interacting_count' => $interacting ?? 0,
|
'guid' => $arr['guid'],
|
||||||
'interacted_count' => $interacted ?? 0, 'post_count' => $posts ?? 0,
|
'batch' => $arr['batch'],
|
||||||
'updated' => DateTimeFormat::utcNow()];
|
'notify' => $arr['notify'],
|
||||||
|
'poll' => $arr['poll'],
|
||||||
|
'confirm' => $arr['confirm'],
|
||||||
|
'alias' => $arr['alias'],
|
||||||
|
'pubkey' => $arr['pubkey'],
|
||||||
|
'uri-id' => $uriid,
|
||||||
|
'interacting_count' => $interacting ?? 0,
|
||||||
|
'interacted_count' => $interacted ?? 0,
|
||||||
|
'post_count' => $posts ?? 0,
|
||||||
|
'updated' => DateTimeFormat::utcNow(),
|
||||||
|
];
|
||||||
|
|
||||||
$condition = ['url' => $arr["url"], 'network' => $arr["network"]];
|
$condition = ['url' => $arr['url'], 'network' => $arr['network']];
|
||||||
|
|
||||||
DBA::update('fcontact', $fields, $condition, true);
|
DBA::update('fcontact', $fields, $condition, true);
|
||||||
}
|
}
|
||||||
|
@ -123,7 +133,6 @@ class FContact
|
||||||
* fcontact guid
|
* fcontact guid
|
||||||
*
|
*
|
||||||
* @param string $fcontact_guid Hexadecimal string guid
|
* @param string $fcontact_guid Hexadecimal string guid
|
||||||
*
|
|
||||||
* @return string|null the contact url or null
|
* @return string|null the contact url or null
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -475,7 +475,10 @@ class Profile extends BaseModule
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Updates contact from probing
|
||||||
|
*
|
||||||
* @param int $contact_id Id of the contact with uid != 0
|
* @param int $contact_id Id of the contact with uid != 0
|
||||||
|
* @return void
|
||||||
* @throws HTTPException\InternalServerErrorException
|
* @throws HTTPException\InternalServerErrorException
|
||||||
* @throws \ImagickException
|
* @throws \ImagickException
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1547,6 +1547,7 @@ class Processor
|
||||||
* Switches a contact to AP if needed
|
* Switches a contact to AP if needed
|
||||||
*
|
*
|
||||||
* @param integer $cid Contact ID
|
* @param integer $cid Contact ID
|
||||||
|
* @return void
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
private static function switchContact(int $cid)
|
private static function switchContact(int $cid)
|
||||||
|
|
|
@ -1087,6 +1087,7 @@ class Receiver
|
||||||
* @param integer $cid Contact ID
|
* @param integer $cid Contact ID
|
||||||
* @param integer $uid User ID
|
* @param integer $uid User ID
|
||||||
* @param string $url Profile URL
|
* @param string $url Profile URL
|
||||||
|
* @return void
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
* @throws \ImagickException
|
* @throws \ImagickException
|
||||||
*/
|
*/
|
||||||
|
@ -1113,6 +1114,7 @@ class Receiver
|
||||||
*
|
*
|
||||||
* @param $receivers
|
* @param $receivers
|
||||||
* @param $actor
|
* @param $actor
|
||||||
|
* @return void
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
* @throws \ImagickException
|
* @throws \ImagickException
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -41,11 +41,11 @@ use Friendica\Util\Strings;
|
||||||
|
|
||||||
class OnePoll
|
class OnePoll
|
||||||
{
|
{
|
||||||
public static function execute($contact_id = 0, $command = '')
|
public static function execute(int $contact_id = 0, string $command = '')
|
||||||
{
|
{
|
||||||
Logger::notice('Start polling/probing contact', ['id' => $contact_id]);
|
Logger::notice('Start polling/probing contact', ['id' => $contact_id]);
|
||||||
|
|
||||||
$force = ($command == "force");
|
$force = ($command == 'force');
|
||||||
|
|
||||||
if (empty($contact_id)) {
|
if (empty($contact_id)) {
|
||||||
Logger::notice('no contact provided');
|
Logger::notice('no contact provided');
|
||||||
|
@ -118,6 +118,7 @@ class OnePoll
|
||||||
*
|
*
|
||||||
* @param array $contact The personal contact entry
|
* @param array $contact The personal contact entry
|
||||||
* @param array $fields The fields that are updated
|
* @param array $fields The fields that are updated
|
||||||
|
* @return void
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
private static function updateContact(array $contact, array $fields)
|
private static function updateContact(array $contact, array $fields)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user