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

[twitter] Improve probe_detect hook function 

- Prevent tweet URLs to be considered as contact URLs
This commit is contained in:
Hypolite Petovan 2021-11-23 17:51:12 -05:00
parent a309d2bf1b
commit 2f2b75ba50
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
twitter/twitter.php
View File

@ -482,7 +482,7 @@ function twitter_post_local(App $a, array &$b)
function twitter_probe_detect(App $a, array &$hookData) function twitter_probe_detect(App $a, array &$hookData)
{ {
// Don't overwrite an existing result // Don't overwrite an existing result
if ($hookData['result']) { if (isset($hookData['result'])) {
return; return;
} }
@ -494,6 +494,13 @@ function twitter_probe_detect(App $a, array &$hookData)
if (preg_match('=([^@]+)@(?:mobile\.)?twitter\.com$=i', $hookData['uri'], $matches)) { if (preg_match('=([^@]+)@(?:mobile\.)?twitter\.com$=i', $hookData['uri'], $matches)) {
$nick = $matches[1]; $nick = $matches[1];
} elseif (preg_match('=^https?://(?:mobile\.)?twitter\.com/(.+)=i', $hookData['uri'], $matches)) { } elseif (preg_match('=^https?://(?:mobile\.)?twitter\.com/(.+)=i', $hookData['uri'], $matches)) {
if (strpos($matches[1], '/') !== false) {
// Status case: https://twitter.com/<nick>/status/<status id>
// Not a contact
$hookData['result'] = false;
return;
}
$nick = $matches[1]; $nick = $matches[1];
} else { } else {
return; return;