clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve probe_detect hook 

- Remove Twitter probe from core
- Allow hook function to better abort the probe_detect process
This commit is contained in:
Hypolite Petovan 2021-11-23 17:46:20 -05:00
parent 4208535c16
commit a47830990a
2 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Addons.md
View File

@ -477,7 +477,7 @@ Hook data:
- **uri** (input): the profile URI. - **uri** (input): the profile URI.
- **network** (input): the target network (can be empty for auto-detection). - **network** (input): the target network (can be empty for auto-detection).
- **uid** (input): the user to return the contact data for (can be empty for public contacts). - **uid** (input): the user to return the contact data for (can be empty for public contacts).
- **result** (output): Set by the hook function to indicate a successful detection. - **result** (output): Leave null if address isn't relevant to the connector, set to contact array if probe is successful, false otherwise.
### support_follow ### support_follow

49
src/Network/Probe.php
View File

@ -682,26 +682,18 @@ class Probe
'uri' => $uri, 'uri' => $uri,
'network' => $network, 'network' => $network,
'uid' => $uid, 'uid' => $uid,
'result' => [], 'result' => null,
]; ];
Hook::callAll('probe_detect', $hookData); Hook::callAll('probe_detect', $hookData);
if ($hookData['result']) { if (isset($hookData['result'])) {
if (!is_array($hookData['result'])) { return is_array($hookData['result']) ? $hookData['result'] : [];
return [];
} else {
return $hookData['result'];
}
} }
$parts = parse_url($uri); $parts = parse_url($uri);
if (!empty($parts['scheme']) && !empty($parts['host'])) { if (empty($parts['scheme']) || !empty($parts['host']) && strstr($uri, '@')) {
if (in_array($parts['host'], ['twitter.com', 'mobile.twitter.com'])) {
return self::twitter($uri);
}
} elseif (strstr($uri, '@')) {
// If the URI starts with "mailto:" then jump directly to the mail detection // If the URI starts with "mailto:" then jump directly to the mail detection
if (strpos($uri, 'mailto:') !== false) { if (strpos($uri, 'mailto:') !== false) {
$uri = str_replace('mailto:', '', $uri); $uri = str_replace('mailto:', '', $uri);
@ -711,12 +703,6 @@ class Probe
if ($network == Protocol::MAIL) { if ($network == Protocol::MAIL) {
return self::mail($uri, $uid); return self::mail($uri, $uid);
} }
if (Strings::endsWith($uri, '@twitter.com')
|| Strings::endsWith($uri, '@mobile.twitter.com')
) {
return self::twitter($uri);
}
} else { } else {
Logger::info('URI was not detectable', ['uri' => $uri]); Logger::info('URI was not detectable', ['uri' => $uri]);
return []; return [];
@ -1742,33 +1728,6 @@ class Probe
return $data; return $data;
} }
/**
* Check for twitter contact
*
* @param string $uri
*
* @return array twitter data
*/
private static function twitter($uri)
{
if (preg_match('=([^@]+)@(?:mobile\.)?twitter\.com$=i', $uri, $matches)) {
$nick = $matches[1];
} elseif (preg_match('=^https?://(?:mobile\.)?twitter\.com/(.+)=i', $uri, $matches)) {
$nick = $matches[1];
} else {
return [];
}
$data = [];
$data['url'] = 'https://twitter.com/' . $nick;
$data['addr'] = $nick . '@twitter.com';
$data['nick'] = $data['name'] = $nick;
$data['network'] = Protocol::TWITTER;
$data['baseurl'] = 'https://twitter.com';
return $data;
}
/** /**
* Checks HTML page for RSS feed link * Checks HTML page for RSS feed link
* *