mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Avoid double probing

Browse source
This commit is contained in:
Michael 2020-08-05 12:36:04 +00:00
parent 1f164f66f4
commit 187dbc09ac
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Model/Contact.php
View file

@ -1158,13 +1158,12 @@ class Contact
* @param integer $uid The user id for the contact (0 = public contact) * @param integer $uid The user id for the contact (0 = public contact)
* @param boolean $update true = always update, false = never update, null = update when not found or outdated * @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 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 * @return integer Contact ID
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function getIdForURL($url, $uid = 0, $update = null, $default = [], $in_loop = false) public static function getIdForURL($url, $uid = 0, $update = null, $default = [])
{ {
Logger::info('Get contact data', ['url' => $url, 'user' => $uid]); Logger::info('Get contact data', ['url' => $url, 'user' => $uid]);
@ -1235,13 +1234,16 @@ class Contact
$data['gsid'] = GServer::getID($data['baseurl']); $data['gsid'] = GServer::getID($data['baseurl']);
} }
if ($uid == 0) { if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url'])) {
$data['last-item'] = Probe::getLastUpdate($data); $contact = self::getByURL($data['alias'], false, ['id']);
Logger::info('Fetched last item', ['url' => $data['url'], 'last-item' => $data['last-item']]); if (!empty($contact['id'])) {
$contact_id = $contact['id'];
}
} }
if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url']) && !$in_loop) { if ($uid == 0) {
$contact_id = self::getIdForURL($data["alias"], $uid, false, $default, true); $data['last-item'] = Probe::getLastUpdate($data);
Logger::info('Fetched last item', ['url' => $url, 'probed_url' => $data['url'], 'last-item' => $data['last-item'], 'callstack' => System::callstack(20)]);
} }
if (!$contact_id) { if (!$contact_id) {