Remove obsolete network guessing function
This commit is contained in:
parent
a2f1bf6a83
commit
33f080d118
|
@ -144,7 +144,7 @@ function display_fetchauthor($item)
|
||||||
}
|
}
|
||||||
|
|
||||||
$profiledata['nickname'] = $profiledata['name'];
|
$profiledata['nickname'] = $profiledata['name'];
|
||||||
$profiledata['network'] = Protocol::matchByProfileUrl($profiledata['url']);
|
$profiledata['network'] = Protocol::PHANTOM;
|
||||||
|
|
||||||
$profiledata['address'] = '';
|
$profiledata['address'] = '';
|
||||||
$profiledata['about'] = '';
|
$profiledata['about'] = '';
|
||||||
|
|
|
@ -1052,7 +1052,7 @@ class BBCode
|
||||||
|
|
||||||
$author_contact = Contact::getByURL($attributes['profile'], false, ['id', 'url', 'addr', 'name', 'micro']);
|
$author_contact = Contact::getByURL($attributes['profile'], false, ['id', 'url', 'addr', 'name', 'micro']);
|
||||||
$author_contact['url'] = ($author_contact['url'] ?? $attributes['profile']);
|
$author_contact['url'] = ($author_contact['url'] ?? $attributes['profile']);
|
||||||
$author_contact['addr'] = ($author_contact['addr'] ?? '') ?: Protocol::getAddrFromProfileUrl($attributes['profile']);
|
$author_contact['addr'] = ($author_contact['addr'] ?? '');
|
||||||
|
|
||||||
$attributes['author'] = ($author_contact['name'] ?? '') ?: $attributes['author'];
|
$attributes['author'] = ($author_contact['name'] ?? '') ?: $attributes['author'];
|
||||||
$attributes['avatar'] = ($author_contact['micro'] ?? '') ?: $attributes['avatar'];
|
$attributes['avatar'] = ($author_contact['micro'] ?? '') ?: $attributes['avatar'];
|
||||||
|
@ -1129,7 +1129,7 @@ class BBCode
|
||||||
private static function convertShareCallback(array $attributes, array $author_contact, $content, $is_quote_share, $simplehtml)
|
private static function convertShareCallback(array $attributes, array $author_contact, $content, $is_quote_share, $simplehtml)
|
||||||
{
|
{
|
||||||
DI::profiler()->startRecording('rendering');
|
DI::profiler()->startRecording('rendering');
|
||||||
$mention = Protocol::formatMention($attributes['profile'], $attributes['author']);
|
$mention = $attributes['author'] . ' (' . ($author_contact['addr'] ?? '') . ')';
|
||||||
|
|
||||||
switch ($simplehtml) {
|
switch ($simplehtml) {
|
||||||
case self::API:
|
case self::API:
|
||||||
|
|
|
@ -117,99 +117,6 @@ class Protocol
|
||||||
return $hook_data['result'] === true;
|
return $hook_data['result'] === true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the address string for the provided profile URL
|
|
||||||
*
|
|
||||||
* @param string $profile_url
|
|
||||||
* @return string
|
|
||||||
* @throws \Exception
|
|
||||||
*/
|
|
||||||
public static function getAddrFromProfileUrl($profile_url)
|
|
||||||
{
|
|
||||||
$network = self::matchByProfileUrl($profile_url, $matches);
|
|
||||||
|
|
||||||
if ($network === self::PHANTOM) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
$addr = $matches[2] . '@' . $matches[1];
|
|
||||||
|
|
||||||
return $addr;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Guesses the network from a profile URL
|
|
||||||
*
|
|
||||||
* @param string $profile_url
|
|
||||||
* @param array $matches preg_match return array: [0] => Full match [1] => hostname [2] => username
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public static function matchByProfileUrl($profile_url, &$matches = [])
|
|
||||||
{
|
|
||||||
if (preg_match('=https?://(twitter\.com)/(.*)=ism', $profile_url, $matches)) {
|
|
||||||
return self::TWITTER;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (preg_match('=https?://(alpha\.app\.net)/(.*)=ism', $profile_url, $matches)) {
|
|
||||||
return self::APPNET;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (preg_match('=https?://(plus\.google\.com)/(.*)=ism', $profile_url, $matches)) {
|
|
||||||
return self::GPLUS;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (preg_match('=https?://(.*)/profile/(.*)=ism', $profile_url, $matches)) {
|
|
||||||
return self::DFRN;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (preg_match('=https?://(.*)/u/(.*)=ism', $profile_url, $matches)) {
|
|
||||||
return self::DIASPORA;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (preg_match('=https?://(.*)/channel/(.*)=ism', $profile_url, $matches)) {
|
|
||||||
// RedMatrix/Hubzilla is identified as Diaspora - friendica can't connect directly to it
|
|
||||||
return self::DIASPORA;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (preg_match('=https?://(.*)/user/(.*)=ism', $profile_url, $matches)) {
|
|
||||||
$statusnet_host = $matches[1];
|
|
||||||
$statusnet_user = $matches[2];
|
|
||||||
$UserData = DI::httpClient()->fetch('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);
|
|
||||||
$user = json_decode($UserData);
|
|
||||||
if ($user) {
|
|
||||||
$matches[2] = $user->screen_name;
|
|
||||||
return self::STATUSNET;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mastodon, Pleroma
|
|
||||||
if (preg_match('=https?://(.+?)/users/(.+)=ism', $profile_url, $matches)
|
|
||||||
|| preg_match('=https?://(.+?)/@(.+)=ism', $profile_url, $matches)
|
|
||||||
) {
|
|
||||||
return self::ACTIVITYPUB;
|
|
||||||
}
|
|
||||||
|
|
||||||
// pumpio (http://host.name/user)
|
|
||||||
if (preg_match('=https?://([\.\w]+)/([\.\w]+)$=ism', $profile_url, $matches)) {
|
|
||||||
return self::PUMPIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
return self::PHANTOM;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a formatted mention from a profile URL and a display name
|
|
||||||
*
|
|
||||||
* @param string $profile_url
|
|
||||||
* @param string $display_name
|
|
||||||
* @return string
|
|
||||||
* @throws \Exception
|
|
||||||
*/
|
|
||||||
public static function formatMention($profile_url, $display_name)
|
|
||||||
{
|
|
||||||
return $display_name . ' (' . self::getAddrFromProfileUrl($profile_url) . ')';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send a follow message to a remote server.
|
* Send a follow message to a remote server.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue