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

Fix contact issues with fake reshares from Twitter

Browse source
This commit is contained in:
Michael 2019-07-23 04:26:20 +00:00
parent 1d8b809227
commit 2a213c215e
3 changed files with 45 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/Network/Probe.php
View file

@ -471,7 +471,7 @@ class Probe
}
if ($host == 'twitter.com') {
return ["network" => Protocol::TWITTER];
return self::twitter($uri);
}
$lrdd = self::hostMeta($host);
@ -512,7 +512,7 @@ class Probe
$nick = substr($uri, 0, strpos($uri, '@'));
if (strpos($uri, '@twitter.com')) {
return ["network" => Protocol::TWITTER];
return self::twitter($uri);
}
$lrdd = self::hostMeta($host);
@ -1411,6 +1411,37 @@ class Probe
return $data;
}
/**
* @brief Check for twitter contact
*
* @param string $uri
*
* @return array twitter data
*/
private static function twitter($uri)
{
if (preg_match('=(.*)@twitter.com=i', $uri, $matches)) {
$nick = $matches[1];
} elseif (preg_match('=https?://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';
$curlResult = Network::curl($data['url'], false);
if ($curlResult->isSuccess()) {
return $data;
}
return [];
}
/**
* @brief Check page for feed link
*