Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 19:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Always use direct DFRN transport on local contacts

Browse source
This commit is contained in:
Michael 2019-09-21 12:39:07 +00:00
parent 7e600df9a6
commit c364a77d63
3 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Model/Contact.php
View file

@ -290,6 +290,19 @@ class Contact extends BaseObject
return '';
}
/**
* Check if the given contact url is on the same machine
*
* @param string $url The contact link
*
* @return boolean Is it the same machine?
*/
public static function isLocal($url)
{
return Strings::compareLink(self::getBasepath($url), System::baseUrl());
}
/**
* Returns the public contact id of the given user id
*
@ -2486,6 +2499,9 @@ class Contact extends BaseObject
['id' => $contact['id'], 'uid' => $importer['uid']]);
}
// Ensure to always have the correct network type, independent from the connection request method
self::updateFromProbe($contact['id'], '', true);
return true;
} else {
// send email notification to owner?
@ -2511,15 +2527,14 @@ class Contact extends BaseObject
'writable' => 1,
]);
$contact_record = [
'id' => DBA::lastInsertId(),
'network' => $network,
'name' => $name,
'url' => $url,
'photo' => $photo
];
$contact_id = DBA::lastInsertId();
Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
// 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);
$contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
/// @TODO Encapsulate this into a function/method
$fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language'];